Changeset 11717

Timestamp:

2006-04-27T11:43:46+12:00 (18 years ago)

Author:

kjdon

Message:

made the history work again after John broke it by change & separator to & where its saved but not where its read in

Location:

branches/gsdl-2_70-distribution-branch/gsdl/src/recpt

Files:

• historydb.cpp (modified) (6 diffs)
• queryaction.cpp (modified) (2 diffs)

branches/gsdl-2_70-distribution-branch/gsdl/src/recpt/historydb.cpp

@@ -31 +31 @@
 
 #define MAX_RECORDS 20
+#define HIST_SEP ';'
 
 // returns true on success (in which case historyinfo will contain
@@ -151 +152 @@
       if (entry==key) {
     here=it+1;
-        it=findchar(here, end, '&');
+        it=findchar(here, end, HIST_SEP);
     value = substr(here, it);
     return;
@@ -168 +169 @@
   text_tarray values;
 
-  splitchar(here, end, '&', values);
+  splitchar(here, end, HIST_SEP, values);
   
   text_tarray::iterator start = values.begin();
@@ -231 +232 @@
   infodbclass argsinfo;
   parse_saved_args(historyargs, argsinfo);
-  
   text_t collect = argsinfo["c"];
   if (collect=="") {
@@ -237 +237 @@
     return;
   }
-
+ 
   if (collect != args["c"]) {
     userinfo += collect+", ";
@@ -260 +260 @@
 
   if (argsinfo["b"] != args["b"] || argsinfo["t"] != args["t"]) {
-    text_t mode;
     if (argsinfo["b"]=="0") { // simple mode
       if (argsinfo["t"]=="0") {
-    mode = " _texthallwords_";
-      }
-      else { // t=1
-    mode = " _texthsomewords_";
+    userinfo += " _texthallwords_, ";
+      }
+      else if (argsinfo["t"]=="1"){
+    userinfo += " _texthsomewords_, ";
       }
       
     } 
-    else { // advanced mode
+    else if (argsinfo["b"] == "1") { // advanced mode
       if (argsinfo["t"]=="0") {
-    mode = " _texthboolean_";
-      }
-      else {
-    mode = " _texthranked_";
-      }
-    }
-    userinfo += mode+", ";
-  }
-  
-  if (argsinfo["k"] != args["k"]) {
+    userinfo += " _texthboolean_, ";
+      }
+      else if (argsinfo["t"]=="1") {
+    userinfo += " _texthranked_, ";
+      }
+    }
+  }
+  
+  if (argsinfo["k"] != "" && argsinfo["k"] != args["k"]) {
     text_t options;
-    if (argsinfo["k"]=="0") {
-      options = " _texthcaseoff_";
-    }
-    else {
-      options = " _texthcaseon_";
-    }
-    userinfo += options+", ";
-  }
-
-  if (argsinfo["s"] != args["s"]) {
-    text_t stem;
+    // the text translations are the wrong way round
+    if (argsinfo["k"]=="1") {
+      userinfo += " _texthcaseoff_, ";
+    }
+    else if (argsinfo["k"]=="0") {
+      userinfo += " _texthcaseon_, ";
+    }
+  }
+
+  if (argsinfo["s"] != "" && argsinfo["s"] != args["s"]) {
     if (argsinfo["s"]=="0") {
-      stem = " _texthstemoff_";
-    }
-    else {
-      stem = " _texthstemon_";
-    }
-    userinfo += stem+", ";
-  }
-
-}
+      userinfo += " _texthstemoff_, ";
+    }
+    else if (argsinfo["s"]=="1") {
+      userinfo += " _texthstemon_, ";
+    }
+  }
+
+}

branches/gsdl-2_70-distribution-branch/gsdl/src/recpt/queryaction.cpp

@@ -817 +817 @@
 
   // defines the following macros
-
   // _searchhistorylist_
 
@@ -1601 +1600 @@
   }
   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"];
-  query += "&g="+args["g"]; 
+  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"];
+  query += ";g="+args["g"]; 
   
   text_t qstring = args["q"];
   //text_t formattedquery =cgi_safe(qstring);
   //query += "&q="+formattedquery;
-  query += "&q="+qstring;
+  query += ";q="+qstring;
   bool display=false;
   int hd = args.getintarg("hd");