bufix media

[mir.git] / source / mircoders / producer / UnIndexingProducerNode.java

diff --git a/source/mircoders/producer/UnIndexingProducerNode.java b/source/mircoders/producer/UnIndexingProducerNode.java
index 60b21b2..5a5a242 100755 (executable)
--- a/source/mircoders/producer/UnIndexingProducerNode.java
+++ b/source/mircoders/producer/UnIndexingProducerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,42 +18,27 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.producer;
 
-import java.util.*;
-import java.io.*;
-
-
-import org.apache.lucene.index.*;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.store.FSDirectory;
-
-import freemarker.template.*;
+import java.util.Map;
 
-
-import mir.util.*;
-import mir.log.*;
-import mir.producer.*;
-//import mir.generator.*;
-import mircoders.global.*;
-import mircoders.localizer.*;
-import mir.entity.*;
-import mir.entity.adapter.*;
-import mircoders.entity.*;
-import mircoders.storage.*;
-import mircoders.search.*;
+import mir.entity.Entity;
+import mir.entity.adapter.EntityAdapter;
+import mir.log.LoggerWrapper;
+import mir.producer.ProducerFailure;
+import mir.producer.ProducerNode;
+import mir.util.ParameterExpander;
+import mircoders.entity.EntityContent;
+import mircoders.search.IndexUtil;
 
 
 public class UnIndexingProducerNode implements ProducerNode {
@@ -67,9 +52,9 @@ public class UnIndexingProducerNode implements ProducerNode {
   }
 
   public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger) throws ProducerFailure {
-    IndexReader indexReader = null;
     Object data;
     Entity entity;
+    String index=null;
 
     long startTime;
     long endTime;
@@ -77,6 +62,7 @@ public class UnIndexingProducerNode implements ProducerNode {
     startTime = System.currentTimeMillis();
 
     try {
+      index = ParameterExpander.expandExpression(aValueMap, indexPath);
       data = ParameterExpander.findValueForKey( aValueMap, contentKey );
 
       if (! (data instanceof EntityAdapter)) {
@@ -87,41 +73,15 @@ public class UnIndexingProducerNode implements ProducerNode {
       if (! (entity instanceof EntityContent)) {
         throw new ProducerFailure("UnIndexingProducerNode: value of '"+contentKey+"' is not a content EntityAdapter, but a " + entity.getClass().getName() + " adapter", null);
       }
-      aLogger.info("UnIndexing " + (String) entity.getValue("id") + " out of " + indexPath);
+      aLogger.info("UnIndexing " + (String) entity.getValue("id") + " out of " + index);
+
+      IndexUtil.unindexEntity((EntityContent) entity,index);
 
-      indexReader = IndexReader.open(indexPath);
-      indexReader.delete(new Term("id",entity.getValue("id")));
-      indexReader.close();
-      
     }
     catch (Throwable t) {
       aLogger.error("Error while unindexing content: " + t.getMessage());
-      t.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(aLogger, LoggerWrapper.DEBUG_MESSAGE)));
+      t.printStackTrace(aLogger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
     }
-    finally {
-      if (indexReader != null){
-        try{
-          indexReader.close();
-        }
-        catch (Throwable t) {
-          aLogger.warn("Error while closing indexReader: " + t.getMessage());
-        }
-
-      }
-
-      try{
-        FSDirectory theIndexDir=FSDirectory.getDirectory(indexPath,false);
-        if (indexReader.isLocked(theIndexDir)){
-          indexReader.unlock(theIndexDir);
-        }
-      }
-      catch (Throwable t) {
-        aLogger.warn("Error while unlocking index: " + t.getMessage());
-      }
-    }
-
-
-
 
     endTime = System.currentTimeMillis();