Changeset 13366

Timestamp:

2006-11-29T14:18:56+13:00 (17 years ago)

Author:

shaoqun

Message:

added code to support the display of previous and next search result links in a document page

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (8 diffs)
• vlistbrowserclass.cpp (modified) (8 diffs)
• vlistbrowserclass.h (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -463 +463 @@
   arg_ainfo.argdefault = "1";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+ 
+ // "srn" - the next search result  
+  arg_ainfo.shortname = "srn";
+  arg_ainfo.longname = "the next search result";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+    // "srp" - the previous search result  
+  arg_ainfo.shortname = "srp";
+  arg_ainfo.longname = "the previous search result";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
 
@@ -1322 +1341 @@
     if (response.numDocs > 0) {
       numdocs += response.numDocs;
-
+    
       QueryResult_t thisresult;
       thisresult.collection = *col_here;
@@ -1335 +1354 @@
     ++col_here;
   } // for each coll
+  
+  text_t numdocs_t = numdocs;  
+  args["nmd"] = numdocs_t;
 
   disp.setmacro ("freqmsg", "query", freqmsg);
@@ -1367 +1389 @@
       if (count < firstdoc) {++count; ++res_here; continue;}
       if (count > thislast) break;
+      
       formatlistptr = colinfomap[(*res_here).collection].formatlistptr;
       browserptr = colinfomap[(*res_here).collection].browserptr;
@@ -1443 +1466 @@
   FilterRequest_t request;
   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"];
+  }
+ 
+
   bptr->set_filter_options (request, args);
   bptr->load_metadata_defaults (request.fields);
@@ -1453 +1487 @@
   text_t formattedstring = "";
   get_formatted_query_string(formattedstring, segment, args, disp, logout);
- 
+
+
   if (!formattedstring.empty()) { // do the query
     // note! formattedstring is in unicode! mg and mgpp must convert!
     set_queryfilter_options (request, formattedstring, args);
+
     collectproto->filter (collection, request, response, err, logout);
+
     if (err != noError) {
       outconvertclass text_t2ascii;
@@ -1468 +1505 @@
     // Perform the "I'm feeling lucky" trick if the "ifl" argument is set
     if (err == noError && !args["ifl"].empty()) {
-      // Find the search result specified by the ifln argument
+      //Restore the "r" and "o" arg
+      args["r"] = starts_old;
+      args["o"] = maxDoc_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;
+       } 
+
+       // Find the search result specified by the ifln argument   
+      ResultDocInfo_tarray::iterator thissection = response.docInfo.begin();
       int section_number = 1;
-      ResultDocInfo_tarray::iterator thissection = response.docInfo.begin();
-      while (section_number != args["ifln"] && thissection != response.docInfo.end()) {
-    section_number++;
+      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 == args["ifln"] && thissection != response.docInfo.end()) {
+      if (section_number == 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";
+        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 << "&d=" << (*thissection).OID <<"&srn="<<srn<<"&srp="<<srp<< "\n\n";
     textout << flush;
-    return true;
+        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
       // 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";
+      
     }
 
@@ -1517 +1584 @@
   if (err == noError) {
     // output the results
+    text_t numdocs_t = response.numDocs;  
+    args["nmd"] = numdocs_t;
     bool use_table = is_table_content (formatlistptr);
     bptr->output_section_group (response, args, collection, 0, formatlistptr, 

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -61 +61 @@
     "<td valign=\"top\">[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]"
     "{If}{[Source],<br><i>([Source])</i>}</td>";
+}
+
+bool vlistbrowserclass::show_search_result_links(recptproto * collectproto,const text_t &collection,ostream& logout){
+     ColInfoResponse_t cinfo;
+     comerror_t err;
+     collectproto->get_collectinfo (collection, cinfo, err, logout);
+     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;
+     } 
+     
+     return show_links;
 }
 
@@ -74 +95 @@
   text_t link, icon;
   text_t collink = collection;
+  bool show_links = show_search_result_links(collectproto,collection,logout);
+
 
 #ifndef DOCHANDLE
@@ -79 +102 @@
 #endif
 
-  get_link_icon (section, args, collink, link, icon);
+  get_link_icon (section, args, collink, link, icon, show_links);
+
+  //get_link_icon (section, args, collink, link, icon);
+
   bool highlight = false;
   if (!args["d"].empty()) {
@@ -133 +159 @@
   text_t &arg_d = args["d"];
   text_t &arg_cl = args["cl"];
-
+  
   text_t collink = collection;
+  bool show_links = show_search_result_links(collectproto,collection,logout);
+
 #ifndef DOCHANDLE
   if (!collink.empty()) collink = "&amp;c=" + collink;
@@ -183 +211 @@
   }
 
+  int count = 0; 
+
   while (thissection != endsection) {
     ++item;
-    get_link_icon (*thissection, args, collink, link, icon);
+    get_link_icon (*thissection, args, collink, link, icon,show_links);
+    //get_link_icon (*thissection, args, collink, link, icon);
     bool highlight = false;
     if (!arg_d.empty()) {
@@ -227 +258 @@
 // [modification to allow default document detach settings -- kjdon]
 void vlistbrowserclass::get_link_icon (ResultDocInfo_t &section, cgiargsclass &args,
-                       const text_t &collink, text_t &link, text_t &icon) {
+                       const text_t &collink, text_t &link, text_t &icon, bool showresultlinks) {
+
+ 
 
 #ifndef DOCHANDLE
@@ -236 +269 @@
 
   text_t link_end = "\">";
+
 #ifndef DOCHANDLE
   text_t detach_link_end = "&amp;x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
@@ -252 +286 @@
     doctype = section.metadata["doctype"].values[0];
 
+
   text_t &arg_d = args["d"];
   text_t &arg_cl = args["cl"];
-
+ 
+ 
   if (args["a"] == "q") {
     // query results list
 #ifndef DOCHANDLE
-    link += "&amp;cl=search&amp;d=" + section.OID;
+    int result_num = section.result_num;
+    int num_docs = args["nmd"].getint();
+    int srn = 0;
+    int srp = 0;
+    if (showresultlinks && result_num < num_docs) {
+      srn = result_num  + 1;
+    }    
+    if (showresultlinks && result_num > 1 ) {
+      srp = result_num  - 1;
+    }    
+        
+    text_t srp_t = srp; 
+    text_t srn_t = srn; 
+    link +="&amp;srp="+srp_t;
+    link +="&amp;srn="+srn_t;
+    link +="&amp;cl=search&amp;d=" + section.OID;
 #else
     link += "," + section.OID+")";
 #endif
+
+ 
     if (args["xx"] == "1") {
       link += detach_link_end;

trunk/gsdl/src/recpt/vlistbrowserclass.h

@@ -62 +62 @@
 protected:
 
+ 
   virtual void get_link_icon (ResultDocInfo_t &section, cgiargsclass &args,
-                  const text_t &collink, text_t &link, text_t &icon);
+                 const text_t &collink, text_t &link, text_t &icon, bool showresultlinks);
+
+  virtual bool show_search_result_links (recptproto * collectproto,const text_t &collection,ostream& logout);
 
   receptionist *recpt;