bug fix for dates

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

diff --git a/source/mircoders/producer/IndexingProducerNode.java b/source/mircoders/producer/IndexingProducerNode.java
index 685a2c1..3641ec5 100755 (executable)
--- a/source/mircoders/producer/IndexingProducerNode.java
+++ b/source/mircoders/producer/IndexingProducerNode.java
@@ -29,44 +29,39 @@
  */
 package mircoders.producer;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Map;
-
 import mir.entity.Entity;
 import mir.entity.adapter.EntityAdapter;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
+import mir.producer.AbstractProducerNode;
 import mir.producer.ProducerFailure;
-import mir.producer.ProducerNode;
+import mir.util.FileRoutines;
 import mir.util.ParameterExpander;
 import mircoders.entity.EntityContent;
-import mircoders.search.AudioSearchTerm;
-import mircoders.search.ContentSearchTerm;
-import mircoders.search.ImagesSearchTerm;
-import mircoders.search.IndexUtil;
-import mircoders.search.KeywordSearchTerm;
-import mircoders.search.TextSearchTerm;
-import mircoders.search.TopicSearchTerm;
-import mircoders.search.UnIndexedSearchTerm;
-import mircoders.search.VideoSearchTerm;
-
+import mircoders.search.*;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.FSDirectory;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Map;
+
 
-public class IndexingProducerNode implements ProducerNode {
+public class IndexingProducerNode extends AbstractProducerNode {
   private String contentKey;
   private String indexPath;
+  private File indexBasePath;
 
-  public IndexingProducerNode(String aContentKey, String pathToIndex) {
+  public IndexingProducerNode(File anIndexBasePath, String aContentKey, String pathToIndex) {
     contentKey = aContentKey;
     indexPath = pathToIndex;
+    indexBasePath = anIndexBasePath;
   }
 
   public void produce(Map aValueMap, String aVerb, LoggerWrapper aLogger)
@@ -74,14 +69,14 @@ public class IndexingProducerNode implements ProducerNode {
     IndexWriter indexWriter = null;
     Object data;
     Entity entity;
-    String index = null;
     long startTime;
     long endTime;
+    File indexFile = null;
 
     startTime = System.currentTimeMillis();
 
     try {
-      index = ParameterExpander.expandExpression(aValueMap, indexPath);
+      indexFile = FileRoutines.getAbsoluteOrRelativeFile(indexBasePath, ParameterExpander.expandExpression(aValueMap, indexPath));
       data = ParameterExpander.findValueForKey(aValueMap, contentKey);
 
       if (!(data instanceof EntityAdapter)) {
@@ -98,22 +93,19 @@ public class IndexingProducerNode implements ProducerNode {
           entity.getClass().getName() + " adapter", null);
       }
 
-      aLogger.info("Indexing " + (String) entity.getFieldValue("id") + " into " +
-        index);
+      aLogger.debug("Indexing " + entity.getFieldValue("id") + " into " +  indexFile.getAbsolutePath());
 
       // create an index here if one did not already exist
-      if (!(IndexReader.indexExists(index))) {
-        aLogger.error("Didn't find existing index, so I'm making one in " +
-          index);
+      if (!(IndexReader.indexExists(indexFile))) {
+        aLogger.warn("Didn't find existing index, so I'm making one in " + indexFile.getAbsolutePath());
 
-        IndexWriter indexCreator =
-          new IndexWriter(index, new StandardAnalyzer(), true);
+        IndexWriter indexCreator = new IndexWriter(indexFile, new StandardAnalyzer(), true);
         indexCreator.close();
       }
 
-      IndexUtil.unindexEntity((EntityContent) entity, index);
+      IndexUtil.unindexEntity((EntityContent) entity, indexFile);
 
-      indexWriter = new IndexWriter(index, new StandardAnalyzer(), false);
+      indexWriter = new IndexWriter(indexFile, new StandardAnalyzer(), false);
 
       Document theDoc = new Document();
 
@@ -136,21 +128,20 @@ public class IndexingProducerNode implements ProducerNode {
 
       if (textValue!=null) {
         try {
-          year = Integer.parseInt(textValue.substring(0,4));
-          month = Integer.parseInt(textValue.substring(5,7));
-          day = Integer.parseInt(textValue.substring(8,10));
-         hours = Integer.parseInt(textValue.substring(11,13));
-          minutes = Integer.parseInt(textValue.substring(14,16));
+          year = Integer.parseInt(textValue.substring(0, 4));
+          month = Integer.parseInt(textValue.substring(5, 7));
+          day = Integer.parseInt(textValue.substring(8, 10));
+          hours = Integer.parseInt(textValue.substring(11, 13));
+          minutes = Integer.parseInt(textValue.substring(14, 16));
 
-          calendar.set(year, month-1, day, hours, minutes);
+          calendar.set(year, month - 1, day, hours, minutes);
           date = calendar.getTime();
-         SimpleDateFormat formatter = new SimpleDateFormat ("yyyy.MM.dd hh:mm");
-         formattedDate=formatter.format(date);
+          SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd hh:mm");
+          formattedDate = formatter.format(date);
+        }
+        catch (Throwable t) {
+          aLogger.warn("Error while generating content date to index", t);
         }
-       catch (Throwable t){
-         aLogger.error("Error while generating content date to index: " + t.getMessage());
-         t.printStackTrace(aLogger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-       }
       }
       (new KeywordSearchTerm("webdb_create_formatted", "search_date",
         "webdb_create_formatted", "webdb_create_formatted",
@@ -158,7 +149,7 @@ public class IndexingProducerNode implements ProducerNode {
 
 
       (new UnIndexedSearchTerm("", "", "", "where", "where")).indexValue(theDoc,
-        StringUtil.webdbDate2path(entity.getFieldValue("date")) +
+        "/"+ year +"/" + month + 
         entity.getFieldValue("id") + ".shtml");
 
       (new TextSearchTerm("creator", "search_creator", "creator", "creator",
@@ -198,31 +189,34 @@ public class IndexingProducerNode implements ProducerNode {
       indexWriter.addDocument(theDoc);
     }
     catch (Throwable t) {
-      aLogger.error("Error while indexing content: " + t.getMessage());
-      t.printStackTrace(aLogger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+      aLogger.error("Error while indexing content: " + t.getMessage(), t);
     }
     finally {
       if (indexWriter != null) {
         try {
           indexWriter.close();
-        } catch (Throwable t) {
-          aLogger.warn("Error while closing indexWriter: " + t.getMessage());
+        }
+        catch (Throwable t) {
+          aLogger.warn("Error while closing indexWriter", t);
         }
       }
 
-      try {
-        FSDirectory theIndexDir = FSDirectory.getDirectory(index, false);
+      if (indexFile!=null) {
+        try {
+          FSDirectory theIndexDir = FSDirectory.getDirectory(indexFile, false);
 
-        if (IndexReader.isLocked(theIndexDir)) {
-          IndexReader.unlock(theIndexDir);
+          if (IndexReader.isLocked(theIndexDir)) {
+            IndexReader.unlock(theIndexDir);
+          }
+        }
+        catch (Throwable t) {
+          aLogger.warn("Error while unlocking index", t);
         }
-      } catch (Throwable t) {
-        aLogger.warn("Error while unlocking index: " + t.getMessage());
       }
     }
 
     endTime = System.currentTimeMillis();
 
-    aLogger.info("  IndexTime: " + (endTime - startTime) + " ms<br>");
+    aLogger.debug("  IndexTime: " + (endTime - startTime) + " ms<br>");
   }
 }