Changeset 32485 for main/trunk/greenstone3/web/sites/localsite/collect/gberg/java/Indexer.java

Timestamp:

2018-09-25T10:56:42+12:00 (6 years ago)

Author:

kjdon

Message:

greenstone now uses lucene 4.7.2, so upgrading this code to match

File:

• main/trunk/greenstone3/web/sites/localsite/collect/gberg/java/Indexer.java (modified) (5 diffs)

main/trunk/greenstone3/web/sites/localsite/collect/gberg/java/Indexer.java

@@ -1 +1 @@
 import org.greenstone.gsdl3.util.GSEntityResolver;
+import org.greenstone.LuceneWrapper4.GSLuceneUtil;
+import org.greenstone.LuceneWrapper4.GSLuceneConstants;
 
 import org.xml.sax.Attributes;
@@ -9 +11 @@
 import javax.xml.parsers.SAXParserFactory;
 
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.Version;
+
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredField;
+import org.apache.lucene.document.TextField;
 //import org.apache.lucene.document.DateField;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.util.Version;
 //import org.apache.lucene.analysis.SimpleAnalyzer;
 
@@ -40 +53 @@
         SAXParserFactory sax_factory = SAXParserFactory.newInstance();
         sax_parser = sax_factory.newSAXParser();
-        writer = new IndexWriter(index_dir.getPath(), new StandardAnalyzer(), create);
+        Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_47);
+        Analyzer ltcAn = new LimitTokenCountAnalyzer(analyzer,Integer.MAX_VALUE);
+
+        IndexWriterConfig.OpenMode open_mode;
         if (create) {
-        writer.optimize();
-        }
+          open_mode = IndexWriterConfig.OpenMode.CREATE;
+        } else {
+          open_mode = IndexWriterConfig.OpenMode.APPEND;
+        }
+        IndexWriterConfig indexWriterConfig = new IndexWriterConfig(Version.LUCENE_47, ltcAn);
+        indexWriterConfig.setOpenMode(open_mode);
+
+        FSDirectory index_fs_dir = FSDirectory.open(index_dir);
+        writer = new IndexWriter(index_fs_dir, indexWriterConfig);
 
     } catch (Exception e) {
@@ -68 +91 @@
     public void finish() {
     try {
-        writer.optimize();
         writer.close();
     } catch (Exception e) {}
@@ -104 +126 @@
         id += "/>";
 
+        String value;
         if (scope.equals(qName)) {
-
-            current_doc.add(new Field("nodeID", this.file_id+"."+qName,
-                      Field.Store.YES,Field.Index.NO));
+          value = this.file_id+"."+qName;
         } else {
-        current_doc.add(new Field("nodeID", this.file_id+"."+scope+"."+qName+"."+node_id,
-                      Field.Store.YES,Field.Index.NO));
-        }
+          value = this.file_id+"."+scope+"."+qName+"."+node_id;
+        }
+        current_doc.add(new StoredField("nodeID", value));
+                  
     }
     }
     public void endElement(String uri, String localName, String qName) throws SAXException {
     if (XMLTagInfo.isIndexable(qName) && qName.equals(current_node)) {
-        current_doc.add(new Field("content", current_contents,
-                      Field.Store.NO,Field.Index.TOKENIZED));
+      current_doc.add(new TextField("content", current_contents, Field.Store.NO));
         try {
         writer.addDocument(current_doc);