Changeset 4220

Timestamp:

2003-05-01T14:38:08+12:00 (21 years ago)

Author:

kjdon

Message:

the call to filter gets an err of syntaxError if the query was invalid. in this case, we set the freqmsg macro to say invalid query syntax, rather than word count: ... and dont bother to display the results.

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (7 diffs)
• queryaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1077 +1077 @@
     return true;
   }
+  bool syntax_error = false;
 
   set_queryfilter_options (request, formattedstring, args);
@@ -1134 +1135 @@
     // do the query
     collectproto->filter (*col_here, request, response, err, logout);
-    if (err != noError) {
+    if (err != noError && err != syntaxError) {
       outconvertclass text_t2ascii;
       logout << text_t2ascii
@@ -1142 +1143 @@
     }
 
+    if (err == syntaxError) {
+      syntax_error = true;
+      freqmsg = "_textinvalidquery_";
+      // assume the syntax will be invalid for all colls
+      break;
+    }
     if (isApprox == Exact)
       isApprox = response.isApprox;
@@ -1185 +1192 @@
       << "_query:content_";
 
-  // now go through each result and output it
-  QueryResult_tset::iterator res_here = results.begin();
-  QueryResult_tset::iterator res_end = results.end();
-  text_tset metadata; // empty !!
-  bool getParents = false; // don't care !!
-  bool use_table;
-  ResultDocInfo_t thisdoc;
-  format_t *formatlistptr = NULL;
-  browserclass *browserptr = NULL;
-
-  int count = 1;
-  int firstdoc = args.getintarg("r");
-  int hitsperpage = args.getintarg("o");
-  int thislast = firstdoc + (hitsperpage - 1);
-
-  // output results
-  while (res_here != res_end) {
-    if (count < firstdoc) {count ++; res_here ++; continue;}
-    if (count > thislast) break;
-    formatlistptr = colinfomap[(*res_here).collection].formatlistptr;
-    browserptr = colinfomap[(*res_here).collection].browserptr;
-    thisdoc = (*res_here).doc;
-    use_table = is_table_content (formatlistptr);
-
-    collectproto = protos->getrecptproto ((*res_here).collection, logout);
-    if (collectproto == NULL) {
-      logout << outconvert << "queryaction::search_multiple_collections: " << (*res_here).collection
-         << " collection has a NULL collectproto, ignoring results\n";
+  if (!syntax_error) {
+    
+    // now go through each result and output it
+    QueryResult_tset::iterator res_here = results.begin();
+    QueryResult_tset::iterator res_end = results.end();
+    text_tset metadata; // empty !!
+    bool getParents = false; // don't care !!
+    bool use_table;
+    ResultDocInfo_t thisdoc;
+    format_t *formatlistptr = NULL;
+    browserclass *browserptr = NULL;
+    
+    int count = 1;
+    int firstdoc = args.getintarg("r");
+    int hitsperpage = args.getintarg("o");
+    int thislast = firstdoc + (hitsperpage - 1);
+    
+    // output results
+    while (res_here != res_end) {
+      if (count < firstdoc) {count ++; res_here ++; continue;}
+      if (count > thislast) break;
+      formatlistptr = colinfomap[(*res_here).collection].formatlistptr;
+      browserptr = colinfomap[(*res_here).collection].browserptr;
+      thisdoc = (*res_here).doc;
+      use_table = is_table_content (formatlistptr);
+      
+      collectproto = protos->getrecptproto ((*res_here).collection, logout);
+      if (collectproto == NULL) {
+    logout << outconvert << "queryaction::search_multiple_collections: " << (*res_here).collection
+           << " collection has a NULL collectproto, ignoring results\n";
+    res_here ++;
+    continue;
+      }
+      
+      browserptr->output_section_group (thisdoc, args, (*res_here).collection, 0, 
+                    formatlistptr, use_table, metadata, getParents, 
+                    collectproto, disp, outconvert, textout, logout);
+      //    textout << outconvert << "(ranking: " << (*res_here).doc.ranking << ")\n";
       res_here ++;
-      continue;
-    }
-
-    browserptr->output_section_group (thisdoc, args, (*res_here).collection, 0, 
-                          formatlistptr, use_table, metadata, getParents, 
-                          collectproto, disp, outconvert, textout, logout);
-    //    textout << outconvert << "(ranking: " << (*res_here).doc.ranking << ")\n";
-    res_here ++;
-    count ++;
-  }
-
+      count ++;
+    }
+  }
   textout << outconvert << disp << "_query:footer_";
   
@@ -1288 +1297 @@
     set_queryfilter_options (request, formattedstring, args);
     collectproto->filter (collection, request, response, err, logout);
-    if (err != noError) {
+    if (err != noError && err != syntaxError) {
       outconvertclass text_t2ascii;
       logout << text_t2ascii
@@ -1295 +1304 @@
       return false;
     }
- 
+
+    bool syntax_error = false;
+    if (err == syntaxError) syntax_error = true;
+    //return false;
     define_query_macros (args, disp, response.numDocs, response.isApprox);
-    define_single_query_macros(args, disp, response);
+    define_single_query_macros(args, disp, response, syntax_error);
 
     // save the query if appropriate
@@ -1432 +1444 @@
 void queryaction::define_single_query_macros (cgiargsclass &args, 
                           displayclass &disp, 
-                          const FilterResponse_t &response) { 
-  // set up _freqmsg_ and _quotedquery_ macros
-  text_t freqmsg = "_textfreqmsg1_";
-  TermInfo_tarray::const_iterator this_term = response.termInfo.begin();
-  TermInfo_tarray::const_iterator end_term = response.termInfo.end();
-  while (this_term != end_term) {
-    freqmsg += (*this_term).term + ": " + (*this_term).freq;
-    if ((this_term + 1) != end_term)
-      freqmsg += ", ";
-    this_term ++;
+                          const FilterResponse_t &response,
+                          bool syntax_error) {
+    // set up _freqmsg_ and _quotedquery_ macros
+
+  text_t freqmsg = "";
+  if (syntax_error) {
+    freqmsg = "_textinvalidquery_";
+  } else {
+    freqmsg = "_textfreqmsg1_";
+    TermInfo_tarray::const_iterator this_term = response.termInfo.begin();
+    TermInfo_tarray::const_iterator end_term = response.termInfo.end();
+    while (this_term != end_term) {
+      freqmsg += (*this_term).term + ": " + (*this_term).freq;
+      if ((this_term + 1) != end_term)
+    freqmsg += ", ";
+      this_term ++;
+    }
   }
   disp.setmacro ("freqmsg", "query", freqmsg);

trunk/gsdl/src/recpt/queryaction.h

@@ -68 +68 @@
   virtual void define_single_query_macros (cgiargsclass &args, 
                        displayclass &disp, 
-                       const FilterResponse_t &response); 
+                       const FilterResponse_t &response,
+                       bool syntax_error); 
   virtual void define_query_macros (cgiargsclass &args, displayclass &disp, 
                 int numDocs, isapprox isApprox);