Changeset 14090

Timestamp:

2007-05-24T09:34:58+12:00 (17 years ago)

Author:

mdewsnip

Message:

Added a new value for the "ifl" argument: when equal to "2", it only redirects to the first matching document if there is one match. Many thanks to Jens Wille.

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1522 +1522 @@
        } 
 
-       // 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();
+       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;
-    }    
+     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 "&amp;"!)
+       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;
-      }
+       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;
+     }
+       }
        
       // There weren't enough (or any) matching documents