Changeset 17938 for gsdl

Timestamp:

2008-11-27T13:29:08+13:00 (15 years ago)

Author:

kjdon

Message:

forgot to test on show_links when setting srn, srp in last commit

File:

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

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

@@ -1472 +1472 @@
   // specified search result (from next/prev search result link)
   if (args["ifl"] == "1") {
-    args["r"] = args["ifln"]; // the document number we want, 
+    args["r"] = args["ifln"]; // the document number we want
     args["o"] = "1";
   }
@@ -1529 +1529 @@
       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;
+      // We still need to set "srn" and "srp" values (next and prev search result numbers) if we are showing them
+      int srn = 0;
+      int srp = 0;
+      if (show_links) {
+        int ifln = args["ifln"].getint();
+        srn = ifln + 1;
+        if (srn > response.numDocs) {
+          srn = 0;
+        }
+        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 << outconvert << disp 
+          << "Location: _gwcgi_?e=_compressedoptions_&a=d&c=" 
+          << collection << "&cl=search&d=" << (*section).OID 
+          << "&srn=" << srn << "&srp=" << srp << "\n\n";
       textout << flush;
       
@@ -1575 +1581 @@
     }
   }
+  
+  //Restore the "r" and "o" arg in case they have been changed and we still get here
+  args["r"] = start_results_from_old;
+  args["o"] = hits_per_page_old;
+
   define_history_macros (disp, args, protos, logout);