Changeset 12421 for trunk/gsdl/src/colservr

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/src/colservr

Files:

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

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;