Changeset 962

Timestamp:

2000-02-22T10:57:50+13:00 (24 years ago)

Author:

sjboddie

Message:

actions are now configured with gsdlhome

Location:

trunk/gsdl/src/recpt

Files:

• action.cpp (modified) (2 diffs)
• action.h (modified) (1 diff)
• delhistoryaction.cpp (modified) (2 diffs)
• queryaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/action.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.19  2000/02/21 21:57:49  sjboddie
+   actions are now configured with gsdlhome
+
    Revision 1.18  1999/11/01 21:10:57  sjboddie
    chnaged arguments passed to many functions
@@ -123 +126 @@
 
 // configure should be called once for each configuration line
-// the default version does nothing
-void action::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
+void action::configure (const text_t &key, const text_tarray &cfgline) {
+  if (key == "gsdlhome") {gsdlhome = cfgline[0];}
 }
 

trunk/gsdl/src/recpt/action.h

@@ -49 +49 @@
 protected:
   cgiargsinfoclass argsinfo;
-
+  text_t gsdlhome;
 
 public:

trunk/gsdl/src/recpt/delhistoryaction.cpp

@@ -147 +147 @@
     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)) {
+    if (get_history_info (userid, entries, gsdlhome, logout)) {
       int count = 1;
       text_tarray::iterator here = entries.begin();
@@ -207 +207 @@
   text_t type = args["hdh"];
   if (type == "1") {
-    result = delete_all_history_info (userid);
+    result = delete_all_history_info (userid, gsdlhome);
   } else {
     text_t records = args["hsr"];
     text_t deletemode = args["hmode"];
-    result = delete_history_info (userid, deletemode, records);
+    result = delete_history_info (userid, deletemode, records, gsdlhome);
   }
 

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.36  2000/02/21 21:57:48  sjboddie
+   actions are now configured with gsdlhome
+
    Revision 1.35  2000/02/17 02:35:04  sjboddie
    tidied up search history stuff a bit - replaced strings with macros
@@ -630 +633 @@
     text_t userid = args["z"];
     text_tarray entries;
-    if (get_history_info (userid, entries, logout)) {
+    if (get_history_info (userid, entries, gsdlhome, logout)) {
       int count = 1;
       text_tarray::iterator here = entries.begin();
@@ -1089 +1092 @@
   request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
   text_t formattedstring = args["q"];
-  if (!combine_query(args["z"], formattedstring)) {
+  if (!combine_query (args["z"], formattedstring, gsdlhome)) {
     args["q"]=formattedstring;
   }
@@ -1225 +1228 @@
   query += "&q="+formattedquery;
 
-  if (set_history_info(userid, query)) return true;
+  if (set_history_info(userid, query, gsdlhome)) return true;
   else return false;