Changeset 4217

Timestamp:

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

Author:

kjdon

Message:

now we pass on syntax_error from mgpp parsing back to the mgppqueryfilter via queryresultsclass

Location:

trunk/gsdl/src/colservr

Files:

• mgppsearch.cpp (modified) (1 diff)
• queryinfo.cpp (modified) (2 diffs)
• queryinfo.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -135 +135 @@
   QueryNode *queryTree = NULL;
   queryTree = ParseQuery(queryArray, defaultBoolCombine, defaultStemMethod);
-    
+  if (queryTree == NULL) { // syntax error
+    queryresult.syntax_error = true;
+    return true; // should we return true or false?
+  }
   UCArray level;
   UCArrayClear(level);

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -319 +319 @@
   docs_matched = 0;
   is_approx = Exact;
-
+  syntax_error = false;
   postprocessed = false;
 
@@ -330 +330 @@
   docs_matched = q.docs_matched;
   is_approx = q.is_approx;
-
+  syntax_error = q.syntax_error;
   postprocessed = q.postprocessed;
-  
+
   docs = q.docs;
   terms = q.terms;

trunk/gsdl/src/colservr/queryinfo.h

@@ -168 +168 @@
   isapprox is_approx;
   //  bool is_approx;   // not available on all versions of mg
-
+  bool syntax_error; // whether the query string was invalid
   bool postprocessed; // whether this record has been post-processed