Changeset 21903

Timestamp:

2010-04-19T12:58:30+12:00 (14 years ago)

Author:

kjdon

Message:

updated to use individual search and retrieve wrappers

File:

• main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Queryer.java (modified) (6 diffs)

main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Queryer.java

@@ -66 +66 @@
     String text_path = args[2];
 
-    // the jni class to access mg stuff
-    MGWrapper wrapper = new MGWrapper();
-    wrapper.setIndex(index_path);
+    // the jni classes to access mg stuff
+    MGSearchWrapper searcher = new MGSearchWrapper();
+    MGRetrieveWrapper retriever = new MGRetrieveWrapper();
+    searcher.setIndex(index_path);
+    retriever.setIndex(index_path);
 
     System.out.println("Welcome to Java Queryer :-)");
@@ -94 +96 @@
             switch (x) {
             case 'q': // clean up and exit
-            wrapper.unloadIndexData();
+            searcher.unloadIndexData();
+            retriever.unloadIndexData();
             return;
             case 'h': // print help message
@@ -100 +103 @@
             break;
             case 'd': // print query param settings
-            String info = wrapper.getQueryParams();
+            String info = searcher.getQueryParams();
             System.out.println(info);
             break;
             case 'p': // print doc
             int docnum = Integer.parseInt(data);
-            String doc = wrapper.getDocument(base_dir, text_path, docnum);
+            String doc = retriever.getDocument(base_dir, text_path, docnum);
             System.out.println(doc);
             break;
             case 'm': //match docs
             int match = Integer.parseInt(data);
-            wrapper.setMaxDocs(match);
+            searcher.setMaxDocs(match);
             break;
             case 's': // set stem on/off
             int stem = Integer.parseInt(data);
             if (stem==0 ){
-                wrapper.setStem(false);
+                searcher.setStem(false);
             } else if(stem==1) {
-                wrapper.setStem(true);
+                searcher.setStem(true);
             } else {
                 System.err.println("Error: stem should be 0 or 1");
@@ -125 +128 @@
             int casef = Integer.parseInt(data);
             if (casef==0) {
-                wrapper.setCase(false);
+                searcher.setCase(false);
             } else if (casef==1) {
-                wrapper.setCase(true);
+                searcher.setCase(true);
             } else {
                 System.err.println("Error: case should be 0 or 1");
@@ -133 +136 @@
             break;
             case 'i': // set index
-            wrapper.setIndex(data);
+            searcher.setIndex(data);
             break;
             case 't': // set query type some/all
             int type = Integer.parseInt(data);
             if (type==0 || type==1) {
-                wrapper.setMatchMode(type);
+                searcher.setMatchMode(type);
             } else {
                 System.err.println("Error: type should be 0 (some) or 1 (all)");
@@ -157 +160 @@
         else {
             // a query
-            wrapper.runQuery(base_dir, text_path, command);
-            MGQueryResult res = wrapper.getQueryResult();
+            searcher.runQuery(base_dir, text_path, command);
+            MGQueryResult res = searcher.getQueryResult();
             System.out.println("(Java) Matching documents: " + res.getTotalDocs());
             if (shortOutput) {