Changeset 17936 for gsdl/trunk

Timestamp:

2008-11-27T12:27:21+13:00 (15 years ago)

Author:

kjdon

Message:

changed ifl code (also used for next and prev search results) so we only ask for one result, rather than all results then iterate through to find the one we want. The old way was really slow for large collections with thousands of search results

File:

• gsdl/trunk/runtime-src/src/recpt/queryaction.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/recpt/queryaction.cpp

@@ -1465 +1465 @@
   FilterResponse_t response;
 
-  text_t maxDoc_old = args["o"];
-  text_t starts_old = args["r"];  
-
-    //if the "ifl" argument is set ignore the "r" and "o" arg
-  if(!args["ifl"].empty()){
-    args["r"] = 1;
-    args["o"] = args["m"];
-  }
- 
+  text_t hits_per_page_old = args["o"];
+  text_t start_results_from_old = args["r"];  
+
+  // if the "ifl" argument is set to 1, we only want to get one document
+  // this may be the first search result (from "I feel lucky") or maybe a 
+  // specified search result (from next/prev search result link)
+  if (args["ifl"] == "1") {
+    args["r"] = args["ifln"]; // the document number we want, 
+    args["o"] = "1";
+  }
 
   bptr->set_filter_options (request, args);
@@ -1504 +1505 @@
     if (err == noError && !args["ifl"].empty()) {
       //Restore the "r" and "o" arg
-      args["r"] = starts_old;
-      args["o"] = maxDoc_old ;
-
+      args["r"] = start_results_from_old;
+      args["o"] = hits_per_page_old;
+      
       //Find whether DocumentSearchResultLinks is enabled
       bool show_links = false;
       text_tmap::const_iterator format_here = cinfo->format.begin();
       text_tmap::const_iterator format_end = cinfo->format.end();
-
-       while (format_here != format_end) {
-     if (((*format_here).first == "DocumentSearchResultLinks") && 
-         ((*format_here).second == "true")){
-       show_links = true;
-           break;
-     }
-         ++format_here;
-       } 
-
-       if (args["ifl"] == 1 || (args["ifl"] == 2 && response.numDocs == 1))
-       {
-     // Find the search result specified by the ifln argument   
-     ResultDocInfo_tarray::iterator thissection = response.docInfo.begin();
-     int section_number = 1;
-     int ifln = args["ifln"].getint();
-              
-     while (section_number != ifln  && thissection != response.docInfo.end()) {     
-       thissection++;
-       section_number++;
-     }
-     // If the search result exists, go directly to it
-     if (section_number == ifln && thissection != response.docInfo.end()) {
-       // Location response (this URL must have "&" and not "&"!)
-       int num_docs =  response.numDocs;
-       int srn = 0;
-       int srp = 0;
-       if (show_links && section_number < num_docs ) {
-         srn = section_number + 1;
-       }
-       if (show_links && section_number > 1 ) {
-         srp = section_number - 1;
-       }
-        
-       textout << outconvert << disp << "Location: _gwcgi_?e=_compressedoptions_&a=d&c=" << collection << "&cl=search&d=" << (*thissection).OID <<"&srn="<<srn<<"&srp="<<srp<< "\n\n";
-       textout << flush;
-       
-       return true;
-     }
-       }
-       
+      
+      while (format_here != format_end) {
+    if (((*format_here).first == "DocumentSearchResultLinks") && 
+        ((*format_here).second == "true")){
+      show_links = true;
+      break;
+    }
+    ++format_here;
+      } 
+      
+      if (args["ifl"] == 1 || (args["ifl"] == 2 && response.numDocs == 1)) {
+    
+    // The first search result is the one we want
+    if (response.docInfo.begin() != response.docInfo.end()) {
+      
+      ResultDocInfo_tarray::iterator section = response.docInfo.begin();
+      
+      // We still need to set "srn" and "srp" values (next and prev search result numbers
+      int ifln = args["ifln"].getint();
+      int srn = ifln + 1;
+      if (srn > response.numDocs) {
+        srn = 0;
+      }
+      int srp = ifln - 1;
+      if (srp < 0) {
+        srp = 0;
+      }
+      
+      
+      textout << outconvert << disp << "Location: _gwcgi_?e=_compressedoptions_&a=d&c=" << collection << "&cl=search&d=" << (*section).OID <<"&srn="<<srn<<"&srp="<<srp<< "\n\n";
+      textout << flush;
+      
+      return true;
+    }
+      }
+    
       // There weren't enough (or any) matching documents
       // We'll just carry on as if ifl wasn't set. The only catch is that get_cgihead_info won't have