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 db12ed7..3641ec5 100755 (executable)
--- a/source/mircoders/producer/IndexingProducerNode.java
+++ b/source/mircoders/producer/IndexingProducerNode.java
@@ -29,40 +29,31 @@
  */
 package mircoders.producer;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Map;
-import java.io.File;
-
 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 mir.util.FileFunctions;
 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;
@@ -85,7 +76,7 @@ public class IndexingProducerNode implements ProducerNode {
     startTime = System.currentTimeMillis();
 
     try {
-      indexFile = FileFunctions.getAbsoluteOrRelativeFile(indexBasePath, ParameterExpander.expandExpression(aValueMap, indexPath));
+      indexFile = FileRoutines.getAbsoluteOrRelativeFile(indexBasePath, ParameterExpander.expandExpression(aValueMap, indexPath));
       data = ParameterExpander.findValueForKey(aValueMap, contentKey);
 
       if (!(data instanceof EntityAdapter)) {
@@ -102,11 +93,11 @@ public class IndexingProducerNode implements ProducerNode {
           entity.getClass().getName() + " adapter", null);
       }
 
-      aLogger.info("Indexing " + entity.getFieldValue("id") + " into " +  indexFile.getAbsolutePath());
+      aLogger.debug("Indexing " + entity.getFieldValue("id") + " into " +  indexFile.getAbsolutePath());
 
       // create an index here if one did not already exist
       if (!(IndexReader.indexExists(indexFile))) {
-        aLogger.error("Didn't find existing index, so I'm making one in " + indexFile.getAbsolutePath());
+        aLogger.warn("Didn't find existing index, so I'm making one in " + indexFile.getAbsolutePath());
 
         IndexWriter indexCreator = new IndexWriter(indexFile, new StandardAnalyzer(), true);
         indexCreator.close();
@@ -149,8 +140,7 @@ public class IndexingProducerNode implements ProducerNode {
           formattedDate = formatter.format(date);
         }
         catch (Throwable t) {
-          aLogger.error("Error while generating content date to index: " + t.getMessage());
-          t.printStackTrace(aLogger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+          aLogger.warn("Error while generating content date to index", t);
         }
       }
       (new KeywordSearchTerm("webdb_create_formatted", "search_date",
@@ -159,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",
@@ -199,8 +189,7 @@ 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) {
@@ -208,7 +197,7 @@ public class IndexingProducerNode implements ProducerNode {
           indexWriter.close();
         }
         catch (Throwable t) {
-          aLogger.warn("Error while closing indexWriter: " + t.getMessage());
+          aLogger.warn("Error while closing indexWriter", t);
         }
       }
 
@@ -221,13 +210,13 @@ public class IndexingProducerNode implements ProducerNode {
           }
         }
         catch (Throwable t) {
-          aLogger.warn("Error while unlocking index: " + t.getMessage());
+          aLogger.warn("Error while unlocking index", t);
         }
       }
     }
 
     endTime = System.currentTimeMillis();
 
-    aLogger.info("  IndexTime: " + (endTime - startTime) + " ms<br>");
+    aLogger.debug("  IndexTime: " + (endTime - startTime) + " ms<br>");
   }
 }