Changeset 936 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

2000-02-17T15:35:04+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up search history stuff a bit - replaced strings with macros

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.35  2000/02/17 02:35:04  sjboddie
+   tidied up search history stuff a bit - replaced strings with macros
+
    Revision 1.34  2000/02/15 22:53:52  kjm18
    search history stuff added.
@@ -360 +363 @@
   arg_ainfo.longname = "history display";
   arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
@@ -609 +613 @@
 } // define external macros
 
-void queryaction::define_history_macros(displayclass &disp, cgiargsclass &args, 
-                      recptprotolistclass *protos, ostream &logout) {
+void queryaction::define_history_macros (displayclass &disp, cgiargsclass &args, 
+                     recptprotolistclass *protos, ostream &logout) {
 
   // defines the following macros
@@ -626 +630 @@
     text_t userid = args["z"];
     text_tarray entries;
-    if (get_history_info(userid, entries)) {
+    if (get_history_info (userid, entries, logout)) {
       int count = 1;
       text_tarray::iterator here = entries.begin();
@@ -637 +641 @@
       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";
+      historylist += "<a href=\"_httpclearhistory_\">_textclearhistory_</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";
+      historylist += "<td><a href=\"_gwcgi_?e=_compressedoptions_&a=q&hcl=0\">_textexpand_</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 += "<td><a href=\"_gwcgi_?e=_compressedoptions_&a=q&hcl=1\">_textcontract_</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";
+      historylist += "<table align=center width=500 border=1>\n<tr><th colspan=4 align=center>";
+      historylist += "_textsearchhistory_</th></tr>\n";
+      historylist += "<tr><th width=40>#</th>\n<th width=340>_textquery_</th>\n";
+      historylist += "<th width=60>_textresults_</th><th width=60>_textview_</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
+    parse_saved_args(cgiargs, "q", query); // get query string out
     decode_cgi_arg(query); // un cgisafe it
     
@@ -668 +671 @@
     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 += *here+"\"><img name=\"display\" src=\"_httpicondisplay_\" width=_widthdisplay_ ";
+    historylist += "height=_heightdisplay_ border=\"0\" alt=\"" + userinfo +"\"></a></td></tr>\n";
+    here++;
+    count++;
       }
       historylist+="</table>\n\n";
@@ -677 +680 @@
     } // if
     else {
-      historylist += "Search history not available\n";
+      historylist += "_textnohistory_";
     }
     historylist += "<p><! ---- end of history list ----->\n";
@@ -1107 +1110 @@
     logout << "save failed";
 
-  define_history_macros(disp, args, protos, logout);
+  define_history_macros (disp, args, protos, logout);
 
   textout << outconvert << disp << "_query:header_\n"