Changeset 10164 for trunk/indexers

Timestamp:

2005-06-23T11:34:09+12:00 (19 years ago)

Author:

davidb

Message:

Code upgraded to support incremental building. This mostly involves parsing
the -create flag in main and passing it down to lower level functions (as
a boolean flag).

Location:

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

Files:

• GS2LuceneIndexer.java (modified) (2 diffs)
• IndexXML.java (modified) (1 diff)
• Indexer.java (modified) (4 diffs)

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

@@ -9 +9 @@
 
 import java.io.*;
+import java.util.Vector;
 
 public class GS2LuceneIndexer {
 
-    public static void main (String args[]) throws Exception { 
-    if (args.length != 3) {
-        System.out.println("Usage: java GS2LuceneIndexer doc-tag-level building_dir index");
+    public static void main (String args[]) throws Exception 
+    { 
+
+    int verbosity = 1;
+    boolean create = false;
+
+    Vector filtered_args = new Vector();
+
+    int argc = args.length;
+    int i = 0;
+    while (i<argc) {
+        if (args[i].startsWith("-")) {
+
+        // -create causes build to be incremental
+        if (args[i].equals("-create")) {
+            create = true;
+        }
+
+        // -verbosity [num]
+        else if (args[i].equals("-verbosity")) {
+            i++;
+            if (i<argc) {
+            verbosity = Integer.parseInt(args[i]);
+            }
+        }
+        else {
+            System.out.println("Unrecognised option: " + args[i]);
+        }
+        }
+        else {
+        filtered_args.add((Object)args[i]);
+        }
+        i++;
+    }
+
+    if (filtered_args.size() != 3) {
+        System.out.println("Usage: java GS2LuceneIndexer [-create|-verbosity [num]] doc-tag-level building_dir index");
         return;
     }
  
-    String doc_tag_level     = args[0];
-    String building_dirname  = args[1];
-    String index_dirname     = args[2];
+    String doc_tag_level     = (String)filtered_args.get(0);
+    String building_dirname  = (String)filtered_args.get(1);
+    String index_dirname     = (String)filtered_args.get(2);
 
     String import_dirname = building_dirname + File.separator + "text";
@@ -36 +71 @@
     
     // Set up indexer
-    IndexXML indexer = new IndexXML(doc_tag_level,idx_dir);
+    IndexXML indexer = new IndexXML(doc_tag_level,idx_dir, create);
     indexer.init(); 
 

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

@@ -14 +14 @@
     File out_dir_         = null;
     Indexer indexer_      = null;
-    
-    public IndexXML(String doc_tag_level, File out_dir)
+    boolean create_index_ = false;
+
+    public IndexXML(String doc_tag_level, File out_dir, boolean create)
     {
     doc_tag_level_ = doc_tag_level;
     out_dir_ = out_dir;
+    create_index_ = create;
     }
 
     public void init() 
     {
-    indexer_ = new Indexer(doc_tag_level_, out_dir_, true);
+    indexer_ = new Indexer(doc_tag_level_, out_dir_, create_index_);
     }
 

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

@@ -81 +81 @@
     public void index (String xml_text) 
     {
-    file_id_ = "<xml doc as string>";
+    file_id_ = "<xml doc on stdin>";
     path_ = "";
 
@@ -104 +104 @@
     }
 
+    protected void print(String s) 
+    { 
+    System.out.print(s); 
+    }
+
     protected void println(String s) 
     { 
@@ -112 +117 @@
     {
         println("Starting to index " + file_id_);
+        print("[");
     }
 
     public void endDocument() throws SAXException 
     {
+        println("]");
         println("... indexing finished.");
     }
@@ -129 +136 @@
         String node_id = atts.getValue("gs2:id");
 
-        System.out.println("**** Indexing "+ qName + " " + node_id );
+        print(" " + qName + ": " + node_id );
         current_doc_.add(Field.UnIndexed("nodeID", node_id));
     }