Changeset 13280

Timestamp:

2006-11-15T17:24:48+13:00 (17 years ago)

Author:

mdewsnip

Message:

Tidied up the "I'm feeling lucky" functionality and added an "ifln" argument for specifying which matching result to display.

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -447 +447 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  // "ifl" - I'm feeling lucky! (Go directly to the first matching document)
+  // "ifl" - I'm feeling lucky! (Go directly to a matching document)
   arg_ainfo.shortname = "ifl";
   arg_ainfo.longname = "i'm feeling lucky";
@@ -453 +453 @@
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "ifln" - I'm feeling lucky number (Go directly to the nth matching document)
+  arg_ainfo.shortname = "ifln";
+  arg_ainfo.longname = "i'm feeling lucky number";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "1";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -1456 +1465 @@
      
     }
-    
+
+    // Perform the "I'm feeling lucky" trick if the "ifl" argument is set
     if (err == noError && !args["ifl"].empty()) {
-      // Go directly to the first matching document
+      // Find the search result specified by the ifln argument
+      int section_number = 1;
       ResultDocInfo_tarray::iterator thissection = response.docInfo.begin();
-      if (thissection != response.docInfo.end()) {
-    // This URL must have "&" and not "&"!
-    text_t doc_url = "_gwcgi_?e=_compressedoptions_&a=d&c=" + collection + "&d=" + (*thissection).OID;
-
-    // location response (url may contain macros!!)
-    textout << outconvert << disp << "Location: " << doc_url << "\n\n";
+      while (section_number != args["ifln"] && thissection != response.docInfo.end()) {
+    section_number++;
+    thissection++;
+      }
+
+      // If the search result exists, go directly to it
+      if (section_number == args["ifln"] && thissection != response.docInfo.end()) {
+    // Location response (this URL must have "&" and not "&amp;"!)
+    textout << outconvert << disp << "Location: _gwcgi_?e=_compressedoptions_&a=d&c=" << collection << "&d=" << (*thissection).OID << "\n\n";
     textout << flush;
     return true;
       }
-      // Ooops... there weren't any matching documents
-      else {
-    // We'll just 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";
-      }
+
+      // 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
+      // 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";
     }