Changeset 4215

Timestamp:

2003-05-01T12:05:32+12:00 (21 years ago)

Author:

kjdon

Message:

fixed up some left over stuff from changing the mgpp basepath stuff (to make it work on windows), also now checks teh query result for syntax error

Location:

trunk

Files:

• indexers/mgpp/java/org/greenstone/mgpp/Queryer.java (modified) (4 diffs)
• mgpp/java/org/greenstone/mgpp/Queryer.java (modified) (4 diffs)

trunk/indexers/mgpp/java/org/greenstone/mgpp/Queryer.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-
+import java.io.File;
 /** Queryer - java port of c++ Queryer 
  * - uses MGPPWrapper to access mgpp
@@ -49 +49 @@
     String index_path = args[1];
 
+    text_path = base_dir + File.separatorChar+text_path;
+    index_path = base_dir  + File.separatorChar+ index_path;
+    
     // the jni class to access mgpp stuff
     MGPPWrapper wrapper = new MGPPWrapper();
-    wrapper.loadIndexData(base_dir, index_path);
+    wrapper.loadIndexData(index_path);
     
     // the return level
@@ -91 +94 @@
             case 'p': // print doc
             int docnum = Integer.parseInt(data);
-            String doc = wrapper.getDocument(base_dir, text_path, 
+            String doc = wrapper.getDocument(text_path, 
                              level, docnum);
             System.out.println(doc);
@@ -160 +163 @@
             wrapper.runQuery(command);
             MGPPQueryResult res = wrapper.getQueryResult();
-            if (shortOutput) {
-              System.out.println(res.toShortString());
+            if (res.hasSyntaxError()) {
+              System.out.println("invalid syntax error\n");
             } else {
-              System.out.println(res.toString());
+              if (shortOutput) {
+            System.out.println(res.toShortString());
+              } else {
+            System.out.println(res.toString());
+              }
             }
         }

trunk/mgpp/java/org/greenstone/mgpp/Queryer.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-
+import java.io.File;
 /** Queryer - java port of c++ Queryer 
  * - uses MGPPWrapper to access mgpp
@@ -49 +49 @@
     String index_path = args[1];
 
+    text_path = base_dir + File.separatorChar+text_path;
+    index_path = base_dir  + File.separatorChar+ index_path;
+    
     // the jni class to access mgpp stuff
     MGPPWrapper wrapper = new MGPPWrapper();
-    wrapper.loadIndexData(base_dir, index_path);
+    wrapper.loadIndexData(index_path);
     
     // the return level
@@ -91 +94 @@
             case 'p': // print doc
             int docnum = Integer.parseInt(data);
-            String doc = wrapper.getDocument(base_dir, text_path, 
+            String doc = wrapper.getDocument(text_path, 
                              level, docnum);
             System.out.println(doc);
@@ -160 +163 @@
             wrapper.runQuery(command);
             MGPPQueryResult res = wrapper.getQueryResult();
-            if (shortOutput) {
-              System.out.println(res.toShortString());
+            if (res.hasSyntaxError()) {
+              System.out.println("invalid syntax error\n");
             } else {
-              System.out.println(res.toString());
+              if (shortOutput) {
+            System.out.println(res.toShortString());
+              } else {
+            System.out.println(res.toString());
+              }
             }
         }