Changeset 23380 for main/trunk/greenstone2

Timestamp:

2010-12-03T16:40:35+13:00 (13 years ago)

Author:

kjdon

Message:

added in code for i feel lucky (used in next and prev search result links) for searching multiple collections

File:

• main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp

@@ -1010 +1010 @@
   map<text_t, int, lttext_t> termfreqs;
 
+  ColInfoResponse_t *tmp_cinfo;
   while (col_here != col_end) {
 
@@ -1020 +1021 @@
       continue;
     }
-    cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
-    if (cinfo == NULL) {
+    tmp_cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
+    if (tmp_cinfo == NULL) {
       // skip this collection
       logout << "ERROR (query_action::search_multiple_collections): get_collectinfo_ptr returned NULL\n";
@@ -1035 +1036 @@
       // get the formatstring if there is one 
       if (!get_formatstring (classification, browsertype, 
-                 cinfo->format, formatstring)) {
+                 tmp_cinfo->format, formatstring)) {
     formatstring = bptr->get_default_formatstring();
       }
@@ -1101 +1102 @@
   } // for each coll
   
+  // now we have an ordered list of results. If ifl (I feel lucky) is set, then pick out the one we want
+  if (args["ifl"] == 1 || (args["ifl"] == 2 && numdocs == 1)) {
+
+    //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;
+    } 
+
+    // which doc do we want?
+    int docnum;
+    int ifl;
+    int srn = 0;
+    int srp = 0;
+    if (args["ifl"] == 1) {
+      ifl = args["ifln"].getint();
+      docnum = ifl - 1;
+      if (show_links) {
+    // set the values for next and prev search result number
+    srn = ifl + 1;
+    if (srn > numdocs) {
+      srn = 0;
+    }
+    srp = ifl - 1;
+    if (srp < 0) {
+      srp = 0;
+    }
+      }
+    } else {
+      // we just want the first (and only) result
+      docnum = 0;
+    }
+    
+    if (docnum >= 0 && docnum < numdocs) {
+    // get the docnum'th item from the results
+      QueryResult_tset::iterator res_here = results.begin();
+      for (int i=0; i< docnum; i++) {
+    ++res_here;
+      }
+      
+      textout << outconvert << disp 
+          << "Location: _gwcgi_?e=_compressedoptions_&a=d&c=" 
+          << (*res_here).collection << "&cl=search&d=" << (*res_here).doc.OID 
+          << "&srn=" << srn << "&srp=" << srp << "\n\n";
+      textout << flush;
+      
+      return true;
+      
+    }
+  }
+  
+  if (!args["ifl"].empty()) {
+    // if we get here, and ifl was set but we haven't output a document, then we'll carry on as if ifl wasn't set. The only catch is that get_cgihead_info won't have
+    // done the right thing (because ifl was set), so we need to make sure the output is html
+    textout << "Content-type: text/html\n\n";
+  }
+
+
   text_t numdocs_t = numdocs;  
   args["nmd"] = numdocs_t;