[Bedework-commit] calendarapi r626 - releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/indexing

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-21 14:52:28 -0400 (Wed, 21 May 2008)
New Revision: 626

Modified:
   releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/indexing/BwIndexLuceneImpl.java
Log:
Fix bug in lucene indexing which caused failure for collections

All a noindexing option on restore

Speed up indexing on restore by batching user indexers.

Index collections on restore

Show time spent indexing

Modified: releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/indexing/BwIndexLuceneImpl.java
===================================================================
--- releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/indexing/BwIndexLuceneImpl.java	2008-05-16 03:19:46 UTC (rev 625)
+++ releases/bedework-3.4.1.1/calsvc/src/org/bedework/calsvc/indexing/BwIndexLuceneImpl.java	2008-05-21 18:52:28 UTC (rev 626)
@@ -451,10 +451,15 @@
     rec.addField(BwIndexLuceneDefs.owner, owner.getAccount());
     rec.addField(BwIndexLuceneDefs.summary, summary);
 
-    rec.addField(BwIndexLuceneDefs.startDate, start.substring(0, 8));
-    rec.addField(BwIndexLuceneDefs.endDate, end.substring(0, 8));
-    rec.addField(BwIndexLuceneDefs.dueDate, end.substring(0, 8));
+    if (start != null) {
+      rec.addField(BwIndexLuceneDefs.startDate, start.substring(0, 8));
+    }
 
+    if (end != null) {
+      rec.addField(BwIndexLuceneDefs.endDate, end.substring(0, 8));
+      rec.addField(BwIndexLuceneDefs.dueDate, end.substring(0, 8));
+    }
+
     if (recurringStarts != null) {
       for (String dt: recurringStarts) {
         rec.addField(BwIndexLuceneDefs.startDate, dt.substring(0, 8));