beagle r4602 - trunk/beagle/beagled

[dbera svn gnome org]

Author: dbera
Date: Mon Mar 10 03:57:48 2008
New Revision: 4602
URL: http://svn.gnome.org/viewvc/beagle?rev=4602&view=rev

Log:
Forgot to up lucene index version after merging lucene.net-2.1


Modified:
   trunk/beagle/beagled/LuceneCommon.cs

Modified: trunk/beagle/beagled/LuceneCommon.cs
==============================================================================
--- trunk/beagle/beagled/LuceneCommon.cs	(original)
+++ trunk/beagle/beagled/LuceneCommon.cs	Mon Mar 10 03:57:48 2008
@@ -87,7 +87,8 @@
 		// 18: add IsPersistent to properties, and adjust coded values
 		//     in AddPropertyToDocument() and GetPropertyFromDocument();
 		//     changed subdate field format rules for better readability
-		private const int MAJOR_VERSION = 18;
+		// 19: Update lucene and analyzer (lucene.net-2.1)
+		private const int MAJOR_VERSION = 19;
 		private int minor_version = 0;
 
 		private string index_name;
@@ -340,8 +341,11 @@
 				// http://mail-archives.apache.org/mod_mbox/lucene-java-user/200504.mbox/%3c4265767B 5090307 getopt org%3e
 				enumerator = reader.Terms ();
 
-				while (enumerator.Next ()) {
+				do {
 					Term term = enumerator.Term ();
+					if (term == null)
+						break;
+
 					positions = reader.TermPositions (term);
 
 					while (positions.Next ()) {
@@ -352,7 +356,7 @@
 					}
 					positions.Close ();
 					positions = null;
-				}
+				} while (enumerator.Next ());
 
 				enumerator.Close ();
 				enumerator = null;