Changeset 4210 for trunk/mgpp/text/Queryer.cpp

Timestamp:

2003-05-01T10:59:14+12:00 (21 years ago)

Author:

kjdon

Message:

parseQuery (in GSDLQueryParser) now returns NULL if there has been a syntax error. So all the auxiliary functions either return NULl
if there is an error, or set an error flag to true. Queryer now tells the user that there has been invalid syntax rather than seg faulting

File:

• trunk/mgpp/text/Queryer.cpp (modified) (1 diff)

trunk/mgpp/text/Queryer.cpp

@@ -242 +242 @@
       // regular query
       queryTree = ParseQuery (queryArray, defaultBoolCombine, defaultStemMethod);
-
-      // print the query
-      PrintNode (cout, queryTree);
-
-      MGQuery (indexData, queryInfo, queryTree, queryResult, level);
-      if (shortOutput) {
-    queryResult.printShort(cout);
-    cout << "\n";
-      }else {
-    cout << queryResult;
-    cout << "\n";
-      }
-      // delete the query
-      if (queryTree != NULL) delete queryTree;
-      queryTree = NULL;
+      if (queryTree == NULL) {
+    cout << "invalid syntax\n";
+      } else {
+    // print the query
+    PrintNode (cout, queryTree);
+    
+    MGQuery (indexData, queryInfo, queryTree, queryResult, level);
+    if (shortOutput) {
+      queryResult.printShort(cout);
+      cout << "\n";
+    } else {
+      cout << queryResult;
+      cout << "\n";
+    }
+    // delete the query
+    delete queryTree;
+    queryTree = NULL;
+      }
     }
   }