Changeset 12421

Timestamp:

2006-08-09T13:06:51+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now catches TooManyClauses exceptions from Lucene and tells the user that this has happened.

Location:

trunk/gsdl

Files:

• macros/english.dm (modified) (1 diff)
• src/colservr/expat_resultset.cpp (modified) (1 diff)
• src/colservr/lucenequeryfilter.cpp (modified) (2 diffs)
• src/colservr/queryinfo.cpp (modified) (2 diffs)
• src/colservr/queryinfo.h (modified) (1 diff)
• src/recpt/comtypes.cpp (modified) (2 diffs)
• src/recpt/comtypes.h (modified) (1 diff)
• src/recpt/queryaction.cpp (modified) (3 diffs)

trunk/gsdl/macros/english.dm

@@ -317 +317 @@
 _textinvalidquery_ {Invalid query syntax}
 _textstopwordsmsg_ {The following words are too common and were ignored: }
+_textlucenetoomanyclauses_ {Your query contained too many search terms; please try a more specific query.}
 
 _textmorethan_ {More than }

trunk/gsdl/src/colservr/expat_resultset.cpp

@@ -45 +45 @@
   if (element_name == "Error") {
     char* error_type_str = get_attribute(attributes, "type");
+    queryresult_ptr->error_message = error_type_str;
     if ((text_t) error_type_str == "PARSE_EXCEPTION") {
       queryresult_ptr->syntax_error = true;

trunk/gsdl/src/colservr/lucenequeryfilter.cpp

@@ -164 +164 @@
   queryresultsclass queryresults;
   do_multi_query (request, queryfilterparams, queryresults, err, logout);
+  response.error_message = queryresults.error_message;
   if (err != noError) return;
+
   // assemble document results
   if (need_matching_docs (request.filterResultOptions)) {
@@ -343 +345 @@
             
       if (query_params.size() == 1) {
+    multiresults.error_message = thisqueryresults.error_message;
     multiresults.docs = thisqueryresults.docs; // just one set of results
     multiresults.docs_matched = thisqueryresults.docs_matched;

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -328 +328 @@
 
 void queryresultsclass::clear () {
+  error_message = g_EmptyText;
   docs_matched = 0;
   is_approx = Exact;
@@ -339 +340 @@
 
 queryresultsclass &queryresultsclass::operator=(const queryresultsclass &q) {
+  error_message = q.error_message;
   docs_matched = q.docs_matched;
   is_approx = q.is_approx;

trunk/gsdl/src/colservr/queryinfo.h

@@ -168 +168 @@
   queryresultsclass () {clear();}
 
+  text_t error_message;  // Currently only used by Lucene
   int docs_matched; // not available on all versions of mg
   isapprox is_approx;

trunk/gsdl/src/recpt/comtypes.cpp

@@ -263 +263 @@
 
 void FilterResponse_t::clear () {
+  error_message = g_EmptyText;
   numDocs = 0;
   isApprox = Exact;
@@ -271 +272 @@
 
 FilterResponse_t &FilterResponse_t::operator=(const FilterResponse_t &x) {
+  error_message = x.error_message;
   numDocs = x.numDocs;
   isApprox = x.isApprox;

trunk/gsdl/src/recpt/comtypes.h

@@ -328 +328 @@
   FilterResponse_t () {clear();}
 
+  text_t error_message;  // Currently only used by Lucene
   int numDocs;
   isapprox isApprox;

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1219 +1219 @@
       break;
     }
+    if (response.error_message == "TOO_MANY_CLAUSES") {
+      freqmsg = "_textlucenetoomanyclauses_";
+      break;
+    }
     if (isApprox == Exact)
       isApprox = response.isApprox;
@@ -1370 +1374 @@
   get_formatted_query_string(formattedstring, segment, args, disp, logout);
 
-    if (!formattedstring.empty()) { // do the query
+  if (!formattedstring.empty()) { // do the query
     // note! formattedstring is in unicode! mg and mgpp must convert!
     set_queryfilter_options (request, formattedstring, args);
@@ -1426 +1430 @@
       save_search_history(args, response.numDocs, response.isApprox);
     }
+
+    // If Lucene threw a TooManyClauses exception, tell the user about it
+    if (args["ct"] == 2 && response.error_message == "TOO_MANY_CLAUSES") {
+      disp.setmacro ("freqmsg", "query", "_textlucenetoomanyclauses_");
+    }
   }
   define_history_macros (disp, args, protos, logout);
-  
+
   textout << outconvert << disp << "_query:header_\n"
       << "_query:content_";