Changeset 940

Timestamp:

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

Author:

sjboddie

Message:

tidied up a bit - replaced strings with macros etc.

File:

• trunk/gsdl/src/recpt/delhistoryaction.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/delhistoryaction.cpp

@@ -41 +41 @@
 delhistoryaction::delhistoryaction () {
 
-  //  num_phrases = 0;
-
   // this action uses cgi variable "a"
   cgiarginfo arg_ainfo;
@@ -58 +56 @@
   arg_ainfo.longname = "history deletion mode";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "delete";
@@ -64 +61 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
- // "hsr" -- the selected records
- 
+  // "hsr" -- the selected records
   arg_ainfo.shortname = "hsr";
   arg_ainfo.longname = "history selected records";
@@ -76 +72 @@
 
   // "hdh" delete history for current user
-  // clear history = delete some, delete all
-
+  // clear history = 0 = delete some, 1 = delete all
   arg_ainfo.shortname = "hdh";
   arg_ainfo.longname = "history delete history";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -122 +118 @@
 
 void delhistoryaction::define_external_macros (displayclass &/*disp*/, cgiargsclass &/*args*/, 
-                      recptprotolistclass */*protos*/, ostream &/*logout*/) {
+                           recptprotolistclass * /*protos*/, ostream &/*logout*/) {
 
   // define_external_macros sets the following macros:
-
+  
   // can't do anything if collectproto is null (i.e. no collection was specified)
   //recptproto *collectproto = protos->getrecptproto (args["c"], logout);
   //if (collectproto == NULL) return;
-
-    // define_history_macros(disp, args, protos, logout);
-  
-} // define external macros
+  
+  // define_history_macros(disp, args, protos, logout);
+  
+}
+
 
 void delhistoryaction::define_history_macros(displayclass &disp, cgiargsclass &args, 
-                      recptprotolistclass *protos, ostream &logout) {
+                         recptprotolistclass *protos, ostream &logout) {
 
   // defines the following macros
@@ -146 +143 @@
     text_tarray entries;
 
-    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=60>select</th><th width=40>#</th>\n<th width=340>Query</th>\n";
-    historylist += "<th width=60>Results</th></tr>\n";
-    if (get_history_info(userid, entries)) {
+    historylist += "<table align=center width=500 border=1> \n <tr><th colspan=4 align=center>";
+    historylist += "_query:textsearchhistory_</th></tr>\n";
+    historylist += "<tr><th width=60>_textselect_</th><th width=40>#</th>\n<th width=340>_query:textquery_</th>\n";
+    historylist += "<th width=60>_query:textresults_</th></tr>\n";
+    if (get_history_info (userid, entries, logout)) {
       int count = 1;
       text_tarray::iterator here = entries.begin();
@@ -159 +156 @@
     text_t querynum;
     text_t query;
-    text_t q = "q";
     text_t numdocs;
     text_t cgiargs;
     text_t  userinfo;
     split_saved_query(*here, querynum, 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
     
@@ -189 +185 @@
 
 bool delhistoryaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
-                 browsermapclass */*browsers*/, displayclass &disp, 
-                 outconvertclass &outconvert, ostream &textout, 
-                 ostream &logout) {
+                  browsermapclass * /*browsers*/, displayclass &disp, 
+                  outconvertclass &outconvert, ostream &textout, 
+                  ostream &logout) {
 
   if (args["hdh"] !="") {
@@ -205 +201 @@
 
 
-bool delhistoryaction::delete_search_history(cgiargsclass &args)
-{
-
+bool delhistoryaction::delete_search_history (cgiargsclass &args) {
+  
   bool result;
   text_t userid = args["z"];
   text_t type = args["hdh"];
-  decode_cgi_arg(type);
-  if (type=="Delete All") {
-    result=delete_all_history_info(userid);
-  }else if (type=="Clear History"){
+  if (type == "1") {
+    result = delete_all_history_info (userid);
+  } else {
     text_t records = args["hsr"];
     text_t deletemode = args["hmode"];
-    result=delete_history_info(userid, deletemode, records);
-  } else {
-    result=false;
+    result = delete_history_info (userid, deletemode, records);
   }
 
   return result;
-
-}
-
-
-
-
-
+}
+
+
+
+
+