Changeset 20731 for indexers/trunk

Timestamp:

2009-09-28T16:12:28+13:00 (15 years ago)

Author:

kjdon

Message:

removed all use of gs2:id as section ids. Now always use gs2:docOID, which is the same as teh greenstone oid. incremental section ids don't work when it comes to incremental build and deleting documents

Location:

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper

Files:

• GS2IndexModifier.java (modified) (1 diff)
• GS2LuceneEditor.java (modified) (1 diff)
• GS2LuceneIndexer.java (modified) (2 diffs)

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper/GS2IndexModifier.java

@@ -89 +89 @@
         int doc_num = -1;
         // Create a new term to encapsulate this node id
-        Term term = new Term("nodeID", String.valueOf(node_id));
+    // was nodeID, now using docOID --kjdon
+        Term term = new Term("docOID", String.valueOf(node_id));
         debug("Searching using term: " + term.toString());
         // Ensure the indexReader exists

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

@@ -229 +229 @@
 
                 // We also have to initialize the nodeId value
-                document.add(new Field("nodeID", String.valueOf(node_id), Field.Store.YES, Field.Index.TOKENIZED));
+        // changed to use docOID --kjdon
+                document.add(new Field("docOID", String.valueOf(node_id), Field.Store.YES, Field.Index.TOKENIZED));
 
                 // Re-index document

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneIndexer.java

@@ -316 +316 @@
         current_node_ = qName;
         
-        String node_id = atts.getValue("gs2:id");
-        print(" " + qName + ": " + node_id + " (" + mode_ + ")" );
-        current_doc_.add(new Field("nodeID", node_id, Field.Store.YES, Field.Index.UN_TOKENIZED));
+        //String node_id = atts.getValue("gs2:id");
+        //print(" " + qName + ": " + node_id + " (" + mode_ + ")" );
+        //current_doc_.add(new Field("nodeID", node_id, Field.Store.YES, Field.Index.UN_TOKENIZED));
         
         current_doc_oid_ = atts.getValue("gs2:docOID");
+        print(" " + qName + ": " + current_doc_oid_ + " (" + mode_ + ")" );
         current_doc_.add(new Field("docOID", current_doc_oid_, Field.Store.YES, Field.Index.UN_TOKENIZED));
         }
@@ -399 +400 @@
         path = path + "/"+qName;
         if (atts.getLength()>0) {
-        String id = atts.getValue("gs2:id");
+          // was gs2:id, changed to gs2:docOID --kjdon
+        String id = atts.getValue("gs2:docOID");
         if (id != null) {
-            path +=  "[@gs2:id='"+id+"']";
+            path +=  "[@gs2:docOID='"+id+"']";
         }
         else {
+          // is this ever used? not in perl currently
             id = atts.getValue("gs3:id");
             if (id != null) {