Changeset 928

Timestamp:

2000-02-16T11:53:52+13:00 (24 years ago)

Author:

kjm18

Message:

search history stuff added.

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (6 diffs)
• browsetools.h (modified) (1 diff)
• cgiargs.h (modified) (1 diff)
• delhistoryaction.cpp (added)
• delhistoryaction.h (added)
• documentaction.cpp (modified) (5 diffs)
• documentaction.h (modified) (1 diff)
• historydb.cpp (added)
• historydb.h (added)
• infodbclass.cpp (modified) (3 diffs)
• infodbclass.h (modified) (4 diffs)
• librarymain.cpp (modified) (4 diffs)
• pageaction.cpp (modified) (2 diffs)
• pagedbrowserclass.cpp (modified) (5 diffs)
• pagedbrowserclass.h (modified) (3 diffs)
• queryaction.cpp (modified) (10 diffs)
• queryaction.h (modified) (6 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.37  2000/02/15 22:53:47  kjm18
+   search history stuff added.
+
    Revision 1.36  2000/02/06 21:31:36  sjboddie
    made some formerly static functions accessible from elsewhere (for
@@ -171 +174 @@
 // output_controls displays the detach, expand/contract contents,
 // expand/contract text and highlighting/no highlighting buttons
+
 void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
               recptproto * /*collectproto*/, displayclass &disp, 
@@ -226 +230 @@
 // server which would send a link to the cover image if there
 // was one otherwise send title, author and stuff
-static void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
+ void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
                 displayclass &disp, outconvertclass &outconvert, 
                 ostream &textout, ostream &/*logout*/) {
@@ -234 +238 @@
   textout << outconvert << disp << 
     "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
-}
-
-static void output_titles (cgiargsclass &args, recptproto *collectproto, 
+ }
+
+ void output_titles (cgiargsclass &args, recptproto *collectproto, 
                formatinfo_t &formatinfo, displayclass &disp, 
                outconvertclass &outconvert, ostream &textout, 
@@ -533 +537 @@
   }
 }
-
 
 void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc, 
@@ -682 +685 @@
   if (havecontrols) textout << "</td></tr></table>\n";
 }
+
+
+

trunk/gsdl/src/recpt/browsetools.h

@@ -56 +56 @@
                  ostream &textout, ostream &logout);
 
-void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
-              recptproto * /*collectproto*/, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &/*logout*/);
+
+// output_controls displays the detach, expand/contract contents,
+// expand/contract text and highlighting/no highlighting buttons
+ void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
+                 recptproto * /*collectproto*/, displayclass &disp, 
+                 outconvertclass &outconvert, ostream &textout, 
+                 ostream &/*logout*/);
+    
+ void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
+                displayclass &disp, outconvertclass &outconvert, 
+                ostream &textout, ostream &/*logout*/);
+
+ void output_titles (cgiargsclass &args, recptproto *collectproto, 
+               formatinfo_t &formatinfo, displayclass &disp, 
+               outconvertclass &outconvert, ostream &textout, 
+               ostream &logout);
+void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc, 
+                 browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                 recptproto *collectproto, displayclass &disp, 
+                 outconvertclass &outconvert, ostream &textout, 
+                 ostream &logout);
+
+ void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
+                   browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                   recptproto *collectproto, displayclass &disp, 
+                   outconvertclass &outconvert, ostream &textout, 
+                   ostream &logout);
+
 
 #endif

trunk/gsdl/src/recpt/cgiargs.h

@@ -234 +234 @@
 
 #endif
+
+
+

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.34  2000/02/15 22:53:49  kjm18
+   search history stuff added.
+
    Revision 1.33  2000/02/13 20:40:05  sjboddie
    now dm_safe _thisOID_ macro
@@ -372 +375 @@
   iwidth += width.getint();
   
+  
+  
   while (dochere != docend) {
     const text_t &title = (*dochere).metadata["Title"].values[0];
@@ -410 +415 @@
     javaimagesnavbar = "_javasearch_";
   }
+  
+  
   if (numc == 0) navigationbar += "_imagespacer_";
     
@@ -534 +541 @@
     // set _navigationbar_ and _javaimagesnavbar_ macros
     set_navbarmacros (disp, response, args);
+   
       }
     } else {
@@ -1083 +1091 @@
   textout << outconvert << disp << buffer;
 }
+
+
+
+
+
+
+
+
+
+
+

trunk/gsdl/src/recpt/documentaction.h

@@ -53 +53 @@
   virtual void set_java_macros (cgiargsclass &args, displayclass &disp);
 
+  void get_classificationlinks (const text_t &arg_cl, const text_t &collection,
+                recptproto *collectproto, displayclass &disp, 
+                ostream &logout);
+
   virtual void output_text (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                 const TermInfo_tarray &terminfo, const text_t &OID,

trunk/gsdl/src/recpt/infodbclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/02/15 22:53:50  kjm18
+   search history stuff added.
+
    Revision 1.5  1999/10/19 03:23:42  davidb
    Collection building support through web pages
@@ -269 +272 @@
 
   return (ret == 0);
+
+}
+
+//returns true on success
+bool gdbmclass::setinfo (const text_t &key, const text_t &data) {
+  if (gdbmfile == NULL) return false;
+  
+  // store the value
+  datum key_data;
+  datum data_data;
+
+  // get a utf-8 encoded c string of the unicode key
+  key_data.dptr = (to_utf8(key)).getcstr();
+  if (key_data.dptr == NULL) {
+    if (logout != NULL) (*logout) << "gdbmclass: out of memory\n";
+    return false;
+  }
+  key_data.dsize = strlen (key_data.dptr);
+
+  data_data.dptr = (to_utf8(data)).getcstr();
+  if (data_data.dptr == NULL) {
+    if (logout != NULL) (*logout) << "gdbmclass: out of memory\n";
+    delete key_data.dptr;
+  }
+  data_data.dsize = strlen (data_data.dptr);
+
+  int ret = gdbm_store (gdbmfile, key_data, data_data, GDBM_REPLACE);
+  delete key_data.dptr;
+  delete data_data.dptr;
+
+  return (ret == 0);
+
 }
 
@@ -549 +584 @@
 }
 
+

trunk/gsdl/src/recpt/infodbclass.h

@@ -142 +142 @@
   // returns true on success
   bool setinfo (const text_t &key, const infodbclass &info);
+  // returns true on success
+  bool setinfo (const text_t &key, const text_t &data);
 
   void deletekey (const text_t &key);
@@ -151 +153 @@
   text_t getfirstkey ();
   text_t getnextkey (const text_t &key);
-  
+
+    // returns true on success
+  bool getkeydata (text_t key, text_t &data);
+
 protected:
   text_t openfile;
@@ -162 +167 @@
   void get_previous_sibling (text_t &OID, infodbclass &info);
 
-  // returns true on success
-  bool getkeydata (text_t key, text_t &data);
 
   // returns true on success
@@ -172 +175 @@
 
 #endif
+
+
+
+
+

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.21  2000/02/15 22:53:51  kjm18
+   search history stuff added.
+
    Revision 1.20  1999/12/13 02:46:56  davidb
    Teach buildaction about recptionist
@@ -122 +125 @@
 #include "extlinkaction.h"
 #include "buildaction.h"
+#include "delhistoryaction.h"
+//#include "bibqueryaction.h"
+//#include "bibindexaction.h"
+//#include "bibdatabaseaction.h"
 
 #include "browserclass.h"
@@ -233 +240 @@
   recpt.add_action (&aauthenaction);
 
+  delhistoryaction adelhistoryaction;
+  recpt.add_action(&adelhistoryaction);
+
+  //  bibqueryaction abibqueryaction;
+  //recpt.add_action(&abibqueryaction);
+
+  //  bibindexaction abibindexaction;
+  //recpt.add_action (&abibindexaction);
+
+  //  bibdatabaseaction abibdatabaseaction;
+  //recpt.add_action(&abibdatabaseaction):
   // list of browsers
   vlistbrowserclass avlistbrowserclass;
@@ -257 +275 @@
 }
 
+
+
+
+

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.27  2000/02/15 22:53:51  kjm18
+   search history stuff added.
+
    Revision 1.26  2000/02/03 01:49:35  sjboddie
    fixed up some of the preferences stuff
@@ -516 +519 @@
   return true;
 }
+
+
+
+
+

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/02/15 22:53:51  kjm18
+   search history stuff added.
+
    Revision 1.5  2000/02/06 21:29:11  sjboddie
    fixed a bug - made some functions virtual for use with cstr collection
@@ -105 +108 @@
     }
   }
+       
+
+    
 }
 
@@ -176 +182 @@
   }
 
+  if (!found) {
+    textout << outconvert << disp 
+        << "<table><tr valign=top> <td colspan=3><center>\n";
+  }
   int numpages = sections.docInfo.size();
   textout << outconvert << disp 
@@ -182 +192 @@
   if (!found)
     nextarrow = "<a href=\"_httpdocument_&cl=" + args["cl"] + "&d=" + sections.docInfo[0].OID + 
-      "\">" + sections.docInfo[0].metadata["Title"].values[0] + "_iconnext_";
+      "\">" + sections.docInfo[0].metadata["Title"].values[0] + "_iconnext_</a>\n";
   else {
     if (!previousOID.empty())
@@ -200 +210 @@
   return 0;
 }
+
+
+
+
+
+

trunk/gsdl/src/recpt/pagedbrowserclass.h

@@ -41 +41 @@
 
   // returns the name that specifies the browserclass type
-  text_t get_browser_name ();
+  virtual text_t get_browser_name ();
 
   void load_metadata_defaults (text_tset &metadata);
@@ -49 +49 @@
   virtual void processOID (cgiargsclass &args, recptproto *collectproto,
                ostream &logout);
+
 
   virtual int output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
@@ -65 +66 @@
 
 #endif
+

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.34  2000/02/15 22:53:52  kjm18
+   search history stuff added.
+
    Revision 1.33  2000/01/24 22:57:59  sjboddie
    fixed bug in cross-collection searching, tidied up a bit
@@ -151 +154 @@
 #include "cgiutils.h"
 #include "OIDtools.h"
+//#include "infodbclass.h"
+#include "fileutil.h"
+#include "text_t.h"
+#include "historydb.h"
 
 void colinfo_t::clear () {
@@ -347 +354 @@
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "hd" history display  - search history only displayed when
+  // this var set.
+  arg_ainfo.shortname = "hd";
+  arg_ainfo.longname = "history display";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+        
+
+ // "hs"  save - set to 1 in query form, so only save when submit
+  // query
+  // 0 = no save 1 = save
+  arg_ainfo.shortname = "hs";
+  arg_ainfo.longname = "history save";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+
+  // "hcl" compress the list (show only the last 5)
+  // 0 = expand, 1 = compress
+
+  arg_ainfo.shortname = "hcl";
+  arg_ainfo.longname = "history compress list";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "1";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+
 
 }
@@ -407 +450 @@
     cgiarginfo *rinfo = argsinfo.getarginfo ("r");
     if (rinfo != NULL) args["r"] = rinfo->argdefault;
+  }
+  //check hd argument
+    int arg_hd = args.getintarg("hd");
+    if (arg_hd !=0 && arg_hd !=1) {
+      logout << "Warning: \"hd\" argument out of range (" << arg_hd << ")\n";
+          cgiarginfo *hdinfo = argsinfo.getarginfo ("hd");
+          if (hdinfo != NULL) args["hd"] = hdinfo->argdefault;
+    }  
+  //check hs argument
+  int arg_hs = args.getintarg("hs");
+  if (arg_hs !=0 && arg_hs !=1) {
+    logout << "Warning: \"hs\" argument out of range (" << arg_hs << ")\n";
+    cgiarginfo *hsinfo = argsinfo.getarginfo ("hs");
+    if (hsinfo != NULL) args["hs"] = hsinfo->argdefault;
+  }
+
+  // chech hcl argument
+  int arg_hcl = args.getintarg("hcl");
+  if (arg_hcl !=0 && arg_hcl !=1) {
+    logout << "Warning: \"hcl\" argument out of range (" << arg_hcl << ")\n";
+    cgiarginfo *hclinfo = argsinfo.getarginfo ("hcl");
+    if (hclinfo != NULL) args["hcl"] = hclinfo->argdefault;
   }
 
@@ -505 +570 @@
   // _cq2selection                the selection box for combining two queries
   
-  
+
   // can't do anything if collectproto is null (i.e. no collection was specified)
   recptproto *collectproto = protos->getrecptproto (args["c"], logout);
@@ -539 +604 @@
     it = response.filterOptions.find ("CombineQuery");
     if (it != end) set_option_macro ("cq2", args["cq2"], (*it).second, disp);
-  }
+
+    // define_history_macros(disp, args, protos, logout);
+  }
+} // define external macros
+
+void queryaction::define_history_macros(displayclass &disp, cgiargsclass &args, 
+                      recptprotolistclass *protos, ostream &logout) {
+
+  // defines the following macros
+
+  // _searchhistorylist_
+
+  text_t historylist;
+  int arghd = args.getintarg("hd");
+  if (arghd != 1) {
+    historylist="";
+  }
+  else {
+    historylist = "<!-- Search History List -->\n";
+   
+    text_t userid = args["z"];
+    text_tarray entries;
+    if (get_history_info(userid, entries)) {
+      int count = 1;
+      text_tarray::iterator here = entries.begin();
+      text_tarray::iterator end = entries.end();
+      int size=(int)entries.size();
+      if (args["hcl"]==1&&size>5) { // compress the list 
+    here = end-5;
+    count=size-4;
+      }
+      historylist += "<table align=center width=500 border=0>\n";
+      historylist += "<tr><td width=300 align=center>";
+      historylist += "<a href=\"_httpclearhistory_\">Clear History</a></td>\n";
+
+      if (size>5&&args["hcl"]==1) { //compress the list, show the expand button
+       
+      historylist += "<td><a href=\"_gwcgi_?e=_compressedoptions_&a=q&hcl=0\">Expand</a></td>\n";
+      }
+      else if (size >5 && args["hcl"]==0) { // expand the list, show contract button
+    historylist += "<td><a href=\"_gwcgi_?e=_compressedoptions_&a=q&hcl=1\">Contract</a></td>\n";
+      }
+      historylist += "</table>\n";
+      historylist += " <table align=center width=500 border=1> \n <tr><th colspan=4 align=center>";
+      historylist += "Search History </th></tr>\n";
+      historylist += "<tr><th width=40>#</th>\n<th width=340>Query</th>\n";
+      historylist += "<th width=60>Results</th><th width=60>View</th></tr>\n";
+
+      while (here !=end ) {
+    text_t c;
+    text_t query;
+    text_t q = "q";
+    text_t numdocs;
+    text_t cgiargs;
+    text_t  userinfo;
+    split_saved_query(*here,c, numdocs, cgiargs);
+    parse_saved_args(cgiargs, q, query); // get query string out
+    decode_cgi_arg(query); // un cgisafe it
+    
+    format_user_info(cgiargs, userinfo, protos, logout);
+    
+    historylist += "<tr> <td width=40 align=center>"+c+"</td>\n";
+    historylist += "<td width=340 align=left>"+query+"</td><td width=60 align=center>"+numdocs+"</td>\n";
+    historylist += "<td width=60 align=center><a href=\"_gwcgi_?e=_compressedoptions_&";
+    historylist += *here+"\"><img name=\"display\" src=\"/gsdl/images/display.gif\" width=\"60\" ";
+    historylist += "height=\"20\" border=\"0\" alt=\"" + userinfo +"\"></a></td></tr>\n";
+      here++;
+      count++;
+      }
+      historylist+="</table>\n\n";
+     
+    } // if
+    else {
+      historylist += "Search history not available\n";
+    }
+    historylist += "<p><! ---- end of history list ----->\n";
+  } // else display list
+  disp.setmacro("searchhistorylist", "query", historylist);
+  
+} // define history macros
+
+void queryaction::output_ccp (cgiargsclass &args, recptprotolistclass *protos,
+                  displayclass &disp, outconvertclass &outconvert,
+                  ostream &textout, ostream &logout) {
+
+  ColInfoResponse_t cinfo;
+  comerror_t err;
+  InfoFilterOptionsResponse_t fresponse;
+  InfoFilterOptionsRequest_t frequest;
+  frequest.filterName = "QueryFilter";
+
+  text_t &index = args["h"];
+  text_t &subcollection = args["j"];
+  text_t &language = args["n"];
+
+  text_tset collections;
+  text_t arg_cc = args["cc"];
+  decode_cgi_arg (arg_cc);
+  splitchar (arg_cc.begin(), arg_cc.end(), ',', collections);
+
+  textout << outconvert << disp << "_query:header_\n"
+      << "<center>_navigationbar_</center><br>\n"
+      << "<form name=QueryForm method=get action=\"_gwcgi_\">\n"
+      << "<input type=hidden name=a value=\"q\">\n"
+      << "<input type=hidden name=e value=\"_compressedoptions_\">\n"
+      << "<input type=hidden name=ccp value=\"1\">\n"
+      << "<center><table width=_pagewidth_><tr valign=top>\n"
+      << "<td>Select collections to search for \"" << args["q"] 
+      << "\" <i>(index=" << index << " subcollection=" << subcollection
+      << " language=" << language << ")</i></td>\n"
+      << "<td><input type=\"submit\" value=\"_query:textbeginsearch_\"></td>\n"
+      << "</tr></table></center>\n"
+      << "<center><table width=_pagewidth_>\n"
+      << "<tr><td>\n";
+  
+  recptprotolistclass::iterator rprotolist_here = protos->begin();
+  recptprotolistclass::iterator rprotolist_end = protos->end();
+  while (rprotolist_here != rprotolist_end) {
+    if ((*rprotolist_here).p != NULL) {
+      
+      text_tarray collist;
+      (*rprotolist_here).p->get_collection_list (collist, err, logout);
+      if (err == noError) {
+    text_tarray::iterator collist_here = collist.begin();
+    text_tarray::iterator collist_end = collist.end();
+    while (collist_here != collist_end) {
+      
+      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
+      //      if (err == noError && cinfo.isPublic && (cinfo.buildDate > 0)) {
+      if (err == noError && (cinfo.buildDate > 0)) {
+        
+        (*rprotolist_here).p->get_filteroptions (*collist_here, frequest, fresponse, err, logout);
+        if (err == noError) {
+          
+          FilterOption_tmap::const_iterator it;
+          FilterOption_tmap::const_iterator end = fresponse.filterOptions.end();
+          if (!index.empty()) {
+        it = fresponse.filterOptions.find ("Index");
+        if (it == end) {collist_here ++; continue;}
+        text_tarray::const_iterator there = (*it).second.validValues.begin();
+        text_tarray::const_iterator tend = (*it).second.validValues.end();
+        while (there != tend) {
+          if (*there == index) break;
+          there ++;
+        }
+        if (there == tend) {collist_here++; continue;}
+          }
+          if (!subcollection.empty()) {
+        it = fresponse.filterOptions.find ("Subcollection");
+        if (it == end) {collist_here++; continue;}
+        text_tarray::const_iterator there = (*it).second.validValues.begin();
+        text_tarray::const_iterator tend = (*it).second.validValues.end();
+        while (there != tend) {
+          if (*there == subcollection) break;
+          there ++;
+        }
+        if (there == tend) {collist_here++; continue;}
+          }
+          if (!language.empty()) {
+        it = fresponse.filterOptions.find ("Language");
+        if (it == end) {collist_here++; continue;}
+        text_tarray::const_iterator there = (*it).second.validValues.begin();
+        text_tarray::const_iterator tend = (*it).second.validValues.end();
+        while (there != tend) {
+          if (*there == language) break;
+          there ++;
+        }
+        if (there == tend) {collist_here++; continue;}
+          }
+        
+          // we've got a matching collection
+          textout << "<input type=checkbox";
+
+          text_tset::const_iterator t = collections.find (*collist_here);
+          if (t != collections.end()) textout << " checked";
+
+          textout << outconvert 
+              << " name=cc value=\"" << *collist_here << "\">";
+          
+          if (!cinfo.collectionmeta["collectionname"].empty())
+        textout << outconvert << disp << cinfo.collectionmeta["collectionname"];
+          else 
+        textout << outconvert << *collist_here;
+          
+          textout << "<br>\n";
+          
+        }
+      }
+      collist_here ++;
+    }
+      }
+    }
+    rprotolist_here ++;
+  }
+  textout << outconvert << disp 
+      << "</td></tr></table></center>\n"
+      << "</form>\n"
+      << "_query:footer_\n";
+  
 }
 
@@ -823 +1086 @@
   request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
   text_t formattedstring = args["q"];
+  if (!combine_query(args["z"], formattedstring)) {
+    args["q"]=formattedstring;
+  }
   format_querystring (formattedstring, args.getintarg("b"));
   set_queryfilter_options (request, formattedstring, args);
@@ -833 +1099 @@
     return false;
   }
+
   
   define_query_macros (args, disp, response);
+
+  // save the query if appropriate
+  if (!save_search_history(args, response))
+    logout << "save failed";
+
+  define_history_macros(disp, args, protos, logout);
 
   textout << outconvert << disp << "_query:header_\n"
@@ -859 +1132 @@
 void queryaction::define_query_macros (cgiargsclass &args, displayclass &disp, 
                        const FilterResponse_t &response) { 
+
   // set up _freqmsg_ and _quotedquery_ macros
   text_t freqmsg = "_textfreqmsg1_";
@@ -920 +1194 @@
 }
 
-
-
+bool queryaction::save_search_history (cgiargsclass &args, const FilterResponse_t &response) 
+{
+  if (args["q"]=="") return true; // null query, dont save
+  if (args["hs"]=="0") return true; // only save when submit query
+
+  // get userid
+  text_t userid = args["z"];
+
+  // the number of docs goes on the front of the query string
+  int numdocs= response.numDocs;
+  text_t query = text_t(numdocs);
+  if (response.isApprox==MoreThan) { // there were more docs found
+    query.push_back('+');
+  }
+  query += "a=q";
+  query += "&c="+args["c"];
+  query += "&h="+args["h"];
+  query += "&t="+args["t"];
+  query += "&b="+args["b"];
+  query += "&j="+args["j"];
+  query += "&n="+args["n"];
+  query += "&s="+args["s"];
+  query += "&k="+args["k"];
+   
+  text_t qstring = args["q"];
+  text_t formattedquery =cgi_safe(qstring);
+  query += "&q="+formattedquery;
+
+  if (set_history_info(userid, query)) return true;
+  else return false;
+
+
+}
+
+
+
+
+

trunk/gsdl/src/recpt/queryaction.h

@@ -64 +64 @@
   int num_phrases;
 
-  void define_query_macros (cgiargsclass &args, displayclass &disp, 
+  virtual void define_query_macros (cgiargsclass &args, displayclass &disp, 
                 const FilterResponse_t &response); 
 
-  void set_option_macro (const text_t &macroname, text_t current_value,
+  void define_history_macros (displayclass &disp, cgiargsclass &args, 
+                   recptprotolistclass *protos, ostream &logout);
+
+  virtual void set_option_macro (const text_t &macroname, text_t current_value,
              const FilterOption_t &option, displayclass &disp);
+
+  void output_ccp (cgiargsclass &args, recptprotolistclass *protos,
+           displayclass &disp, outconvertclass &outconvert,
+           ostream &textout, ostream &logout);
+  
+
 
   bool search_multiple_collections (cgiargsclass &args, recptprotolistclass *protos,
@@ -75 +84 @@
                     ostream &logout);
 
+
   bool search_single_collection (cgiargsclass &args, const text_t &collection,
                  recptprotolistclass *protos, browsermapclass *browsers, 
@@ -80 +90 @@
                  ostream &textout, ostream &logout);
 
+
+  bool save_search_history(cgiargsclass &args, const FilterResponse_t &response); 
+  bool delete_search_history(cgiargsclass &args);
 
 public:
@@ -88 +101 @@
   bool init (ostream &logout);
   
-  text_t get_action_name () {return "q";}
+  virtual text_t get_action_name () {return "q";}
   
-  bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
+  virtual bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
               ostream &logout);
 
@@ -97 +110 @@
              ostream &logout);
   
-  void define_internal_macros (displayclass &disp, cgiargsclass &args, 
+  virtual void define_internal_macros (displayclass &disp, cgiargsclass &args, 
                    recptprotolistclass *protos, ostream &logout);
 
-  void define_external_macros (displayclass &disp, cgiargsclass &args, 
+  virtual void define_external_macros (displayclass &disp, cgiargsclass &args, 
                    recptprotolistclass *protos, ostream &logout);
   
-  bool do_action (cgiargsclass &args, recptprotolistclass *protos, 
+  virtual bool do_action (cgiargsclass &args, recptprotolistclass *protos, 
           browsermapclass *browsers, displayclass &disp, 
           outconvertclass &outconvert, ostream &textout, 
@@ -110 +123 @@
 
 #endif
+
+