Changeset 1786

Timestamp:

2000-12-12T15:00:05+13:00 (23 years ago)

Author:

kjm18

Message:

fixed the handling of #x in the query string - only #n where n is a number
are treated as references to history items. So #icus (stem, case) will be left
in the query string.

File:

• trunk/gsdl/src/recpt/historydb.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/historydb.cpp

@@ -201 +201 @@
         records[num].save=tset;
       }
-    }}
-    else { // dodgy format 
-      // error message
     }
+      }
+      else { // dodgy format 
+    // error message
+      }
       
     }
     numbegin++;
   } // while
-    
+  
   HistRecordmap::iterator recbegin = records.begin();
   HistRecordmap::iterator recend = records.end();
@@ -299 +300 @@
   if (it==end) return true;  // no need to swap anything
    
- 
+  bool result=true;
   text_t queryresult = "";
   text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
@@ -318 +319 @@
       queryresult += substr(begin, it);
       it++;
-      while(*it>='0'&&*it<='9') it++;
+      if (*it<'0' || *it>'9') {
+    queryresult.push_back('#'); // put the hash back if its not next to a number
+      }      
+      else {
+    while(*it>='0'&&*it<='9') it++;
+    result = false;
+      }
       begin=it;
       it=findchar(begin, end, '#');
@@ -324 +331 @@
     queryresult += substr(begin, end);
     query = queryresult;
-    return false;
-  }
-  bool result=true;
+    return result;
+  }
 
   // if have got to here, have a previous history in historyresult
@@ -349 +355 @@
       if (*begin==text_t('#')) {
     begin++;
-    while(begin !=end && *begin>='0'&&*begin<='9') {
-      querynum.push_back(*begin);
-      begin++;
+    if(*begin<'0'||*begin>'9') { // not a history ref, leave in
+      queryresult.push_back('#');
     }
-        text_t oldquery = historymap[querynum];
-    if (oldquery !="") {   // valid entry
-      parse_saved_args(oldquery, "q", newquery);
-      decode_cgi_arg(newquery);
-      queryresult += newquery;
+    else { // history ref
+      while(begin !=end && *begin>='0'&&*begin<='9') {
+        querynum.push_back(*begin);
+        begin++;
+      }
+      text_t oldquery = historymap[querynum];
+      if (oldquery !="") {   // valid entry
+        parse_saved_args(oldquery, "q", newquery);
+        decode_cgi_arg(newquery);
+        queryresult += newquery;
+      }
+      else {
+        result=false; // have replaced #n with nothing
+      }
+      querynum.clear();
     }
-    else {
-      result=false;
-    }
-    querynum.clear();
-        // else do nothing (replace #x with nothing)
-      } // if
+      } // if #
       else {
     queryresult.push_back(*begin);
@@ -407 +417 @@
       if (*begin==text_t('#')) {
     begin++;
-    while(begin !=end && *begin>='0'&&*begin<='9') {
-      querynum.push_back(*begin);
-      begin++;
+    if ( *begin<'0' || *begin>'9') { // not a ref
+      queryresult.push_back('#');
     }
-    if(records.count(querynum)>0) { // valid entry
-      if (!records[querynum].save){ // referenced record to be deleted
-        // get the q arg out of referenced query
-        parse_saved_args(records[querynum].entry, "q", newquery);
-        decode_cgi_arg(newquery);
-        queryresult += newquery;
-        changed=true;
+    else {
+      while(begin !=end && *begin>='0'&&*begin<='9') {
+        querynum.push_back(*begin);
+        begin++;
       }
-      else { // leave the #x in
-       queryresult.push_back('#');
-       queryresult +=  querynum;
-      }
+      if(records.count(querynum)>0) { // valid entry
+        if (!records[querynum].save){ // referenced record to be deleted
+          // get the q arg out of referenced query
+          parse_saved_args(records[querynum].entry, "q", newquery);
+          decode_cgi_arg(newquery);
+          queryresult += newquery;
+          changed=true;
+        }
+        else { // leave the #x in
+          queryresult.push_back('#');
+          queryresult +=  querynum;
+        }
+      }// else do nothing (replace #x with nothing)
+      querynum.clear();
+      newquery.clear();
     }
-    querynum.clear();
-    newquery.clear();
-    // else do nothing (replace #x with nothing)
       } // if its a hash
       else {