Changeset 24731 for main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneEditor.java

Timestamp:

2011-10-07T11:36:07+13:00 (13 years ago)

Author:

sjm84

Message:

Lucene 3.x version of code accidentally commited rolling back to 2.x compatible version

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneEditor.java (modified) (7 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneEditor.java

@@ -33 +33 @@
 
 import java.io.IOException;
-import java.io.File;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -39 +38 @@
 
 import org.apache.lucene.analysis.Analyzer;
-//import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-
-import org.apache.lucene.store.SimpleFSDirectory;
-import org.apache.lucene.index.IndexWriter.MaxFieldLength;
 
 
@@ -150 +146 @@
         throws IOException
     {
-        Analyzer analyzer = new GS2Analyzer();
+        Analyzer analyzer = new StandardAnalyzer();
         // create an index in /tmp/index, overwriting an existing one:
         index_modifier = new GS2IndexModifier(index_path, analyzer);
@@ -192 +188 @@
     {
         debug("GS2LuceneEditor.editIndex(" + node_id + ",'" + field + "','" + old_value + "','" + new_value + "')");
-        debug("- Initial number of documents in index: " + index_modifier.numDocs());
+        debug("- Initial number of documents in index: " + index_modifier.docCount());
         // Retrieve the document requested
         int doc_num = index_modifier.getDocNumByNodeID(node_id);
@@ -234 +230 @@
                 // We also have to initialize the nodeId value
         // changed to use docOID --kjdon
-                document.add(new Field("docOID", String.valueOf(node_id), Field.Store.YES, Field.Index.ANALYZED));
+                document.add(new Field("docOID", String.valueOf(node_id), Field.Store.YES, Field.Index.TOKENIZED));
 
                 // Re-index document
@@ -300 +296 @@
                 for(int i = 0; i < values.size(); i++)
                     {
-                        document.add(new Field(field, (String)values.get(i), Field.Store.YES, Field.Index.ANALYZED));
+                        document.add(new Field(field, (String)values.get(i), Field.Store.YES, Field.Index.TOKENIZED));
                     }
                 values.clear();
@@ -322 +318 @@
                 for(int i = 0; i < values.size(); i++)
                     {
-                        document.add(new Field(field, (String)values.get(i), Field.Store.YES, Field.Index.ANALYZED));
+                        document.add(new Field(field, (String)values.get(i), Field.Store.YES, Field.Index.TOKENIZED));
                     }
                 values.clear();