Changeset 1913

Timestamp:

2001-02-07 12:07:28 (8 years ago)

Author:

kjm18

Message:

history revamp. new format: numdocs args. query num no longer saved, so
#x in a query no longer references previous queries. deletion of history no
longer provided, max saved queries per user set in MAX_RECORDS (20).
For new user, history only saved once history display has been turned on.

Files:

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

trunk/gsdl/src/recpt/historydb.cpp

@@ -30 +30 @@
-#include "OIDtools.h"
-
+#define MAX_RECORDS 20
-
-// returns true on success (in which case historyinfo will contain
@@ -64 +65 @@
-
-// returns true on success
-
+
+
+
-
-  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
@@ -72 +75 @@
-  gdbmclass historydb;
-  
-querynum
-
-
-
+oldhistoryresult
+new
+
+
-  if ( !historydb.opendatabase(historyfile, GDBM_READER, 1000, true)) {
-    // not created yet
-
-querynum="1";
+old
+if (!display) return true; // dont need to save
-  }
-  else {
-
-    // get history list
-
-
-querynum="1";
+old
+old
+if (!display) return true; // dont need to save
-   }
-   historydb.closedatabase();
-  }
-
-// get next query num
-if (historyresult!="") {
-  text_tarray entries;
-historyresult.begin(), 
-get_query_num(entries.back(), querynum
-querynum.setint(querynum.getint()+1)
+text_tarray entries;
+
+if (oldhistoryresult!="") {
+oldhistoryresult.begin(), old
+numentries = entries.size(
+if (numentries >= MAX_RECORDS) numentries = MAX_RECORDS-1
-  }
-  
-  // open for writing
-  if (!historydb.opendatabase(historyfile, GDBM_WRCREAT, 1000, true)) return false;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -130 +135 @@
-  
-}
-
-//deletes only the selected records
-bool delete_history_info (const text_t &userid, const text_t &deletemode, 
-                          const text_t &selection, const text_t &gsdlhome) {
-
-  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
-  bool result = false;
-  // open the history database  
-  gdbmclass historydb;
-  
-  if ( !historydb.opendatabase(historyfile, GDBM_READER, 1000, true)) return false;
-
-  // get history list
-  text_t historyresult;
-
-  if (! historydb.getkeydata(userid, historyresult)) return false;
-   
-  historydb.closedatabase();
-
-  text_t newhistory; // for the new list of search history
-  // get list of queries
-  text_tarray queries;
-  splitchar(historyresult.begin(), historyresult.end(), '\n', queries);
-  text_tarray::iterator begin=queries.begin();
-  text_tarray::iterator end=queries.end();
-  
-  // get list of numbers to delete
-  text_tarray numbers;
-  splitchar(selection.begin(), selection.end(), ',', numbers);
-  text_tarray::iterator numbegin=numbers.begin();
-  text_tarray::iterator numend=numbers.end();
-
-  bool tdefault, tset;
-  if (deletemode=="delete") {
-    tdefault=true;
-    tset=false;
-  }
-  else {// deletemode == save
-    tdefault=false;
-    tset=true;
-  }
-
-  // create a HistRecord map of all the entries
-  HistRecordmap records;
-  while (begin != end) {
-    HistRecord rec;
-    rec.entry=*begin;
-    rec.save=tdefault;
-    text_t num;
-    get_query_num(*begin, num);
-    records[num] = rec;
-    begin++;
-  }
-
- 
-  // now set the save field for all records that are selected
-  while(numbegin != numend) {
-    
-    if (is_number(*numbegin)) {
-      if (records.count(*numbegin)==1) {
-        records[*numbegin].save=tset;
-      } // else invalid number
-    }
-    else{
-      int start, stop;
-      if (get_selection_params(*numbegin, start, stop)) {
-        for (int i=start; i<=stop; i++) {
-          text_t num = i;
-          if (records.count(num)==1) {
-            records[num].save=tset;
-          }
-        }
-      }
-      else { // dodgy format 
-        // error message
-      }
-      
-    }
-    numbegin++;
-  } // while
-  
-  HistRecordmap::iterator recbegin = records.begin();
-  HistRecordmap::iterator recend = records.end();
- 
-  //create new history record - go through all Records
-  // and add to new history those with save set to true
-  while (recbegin != recend) {
-    if ((*recbegin).second.save) {
-      expand_query((*recbegin).second, records);
-      newhistory += (*recbegin).second.entry + "\n";
-    }
-    recbegin++;
-  }
-  
-  // open for writing
-  if (!historydb.opendatabase(historyfile, GDBM_WRITER, 1000, true)) return false;
-  
-  if (historydb.setinfo(userid, newhistory)) result = true; 
-  
-  historydb.closedatabase();
-  return result;
-}
-
-bool get_selection_params (text_t &data, int &start, int &stop) {
-  
-  text_tarray results;
-  
-  splitchar(data.begin(), data.end(), '-', results);
-  if (results.size()==2 && is_number(results[0]) && is_number(results[1])) {
-    start=results[0].getint();
-    stop=results[1].getint();
-    return true;
-  }
-  
-  // error message
-  return false;
-}
-
-// expand query takes a HistRecord, and expands out any hashes in
-// the query string for queries that aren't to be saved
-bool expand_query(HistRecord &record,  HistRecordmap &records) {
-
-  text_tarray args;
-  splitchar(record.entry.begin(), record.entry.end(), '&', args);
-
-  text_tarray::iterator begin=args.begin();
-  text_tarray::iterator end=args.end();
-
-  text_t query;
-  // find the q argument
-  while(begin != end) {
-    if ((*begin)[0] == 'q'&& (*begin)[1] == '=') {
-      query=*begin;
-      args.erase(begin);
-      break;
-    } else begin++;
-  }
-  if (query !="") {
-    
-    //remove the q=
-    text_t::iterator front = query.begin();
-    query.erase(front);
-    front=query.begin();
-    
-    query.erase(front);
-    decode_cgi_arg(query);
-    // now have just the query string
-    // check any refs in it to see if they are still valid
-    combine_query(query, records);
-    text_t formattedquery = cgi_safe(query);
-    text_t newquery = "q=";
-    newquery += formattedquery;
-
-    args.push_back(newquery);
-    joinchar(args, '&', record.entry); 
-    
-    return true;
-  } 
-  return false;
-}
-
-// replaces a reference to a previous query with the search
-// string from that query
-bool combine_query(text_t &userid, text_t &query, const text_t &gsdlhome) 
-{
-  text_t::iterator begin = query.begin();
-  text_t::iterator end = query.end();
-  text_t::iterator it = findchar(begin, end, '#');
-  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");
-  text_t historyresult;
-  // open the history database  
-  gdbmclass historydb;
-  bool exists = false;
-  if (historydb.opendatabase(historyfile, GDBM_READER, 1000, true)) {
-    // get history list
-    if (historydb.getkeydata(userid, historyresult)) {
-      exists=true;
-      
-      historydb.closedatabase();
-    }
-  }
-  if (!exists) {// cant open history file, or user entry doesn't exist. replace #x with blanks 
-    while(it !=end) {
-      queryresult += substr(begin, it);
-      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, '#');
-    }
-    queryresult += substr(begin, end);
-    query = queryresult;
-    return result;
-  }
-
-  // if have got to here, have a previous history in historyresult
-  text_tarray historyinfo;
-  splitchar(historyresult.begin(), historyresult.end(), '\n', historyinfo);
-  text_tarray::iterator histbegin = historyinfo.begin();
-  text_tarray::iterator histend = historyinfo.end();
-  
-  text_tmap historymap;
-  // put all entries into a map, so can pull out the appropriate one easily
-  while (histbegin != histend) {
-    text_t num;
-    get_query_num(*histbegin, num);
-    historymap[num]=*histbegin;
-    histbegin++;
-  }
-  while(it!=end) { // while there still is a hash present
-    text_t querynum;
-    text_t newquery;
-    
-    while (begin!=end) {
-      if (*begin==text_t('#')) {
-        begin++;
-        if(*begin<'0'||*begin>'9') { // not a history ref, leave in
-          queryresult.push_back('#');
-        }
-        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();
-        }
-      } // if #
-      else {
-        queryresult.push_back(*begin);
-        begin++;
-      }
-    } // while begin!=end
-    
-    // have got to end of query string, 
-    // now go back and check for internal #
-    query = queryresult;
-    begin = query.begin();
-    end = query.end();
-    it = findchar(begin, end, '#');
-    queryresult.clear();
-    
-  } // while it !=end
-  
-  
-  return result;
-  
-} // combine query
-
-
-// replaces a reference to a previous query with the search
-// string from that query, uses the Histrecordmap rather than the GDBM file
-bool combine_query( text_t &query, HistRecordmap &records) 
-{
-  text_t::iterator begin = query.begin();
-  text_t::iterator end = query.end();
-  text_t::iterator it = findchar(begin, end, '#');
-  if (it==end) return true;  // no need to swap anything
-    
-  text_t queryresult = "";
-  bool changed=true;
-  while(it!=end && changed) { // while there still is a hash present
-                              // and query has changed since last time round
-                              // we are leaving some #X in 
-    text_t querynum;
-    text_t newquery;
-    changed=false;
-    while (begin!=end) { // go through the query looking for hash
-      if (*begin==text_t('#')) {
-        begin++;
-        if ( *begin<'0' || *begin>'9') { // not a ref
-          queryresult.push_back('#');
-        }
-        else {
-          while(begin !=end && *begin>='0'&&*begin<='9') {
-            querynum.push_back(*begin);
-            begin++;
-          }
-          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();
-        }
-      } // if its a hash
-      else {
-        queryresult.push_back(*begin);
-        begin++;
-      }
-    } // while begin!=end
-    
-    // have got to end of query string, 
-    // now go back and check for internal #
-    query = queryresult;
-    begin = query.begin();
-    end = query.end();
-    it = findchar(begin, end, '#');
-    queryresult.clear();
-    
-  } // while it !=end
-  
-  return true;
-} // combine query
-
-// retrieves the value of one of the arguments
@@ -515 +190 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-  text_t::iterator begin = query.begin();
-  text_t::iterator end = query.end();
-  
-
-
-
-
-
-
-
-
-
+
-    numdocs.push_back(*begin);
-    begin++;
-
+
+
-  if (*begin == '+') {  // get the + if there
-    numdocs.push_back(*begin);
-    begin++;
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  cgiargs += (substr(begin, end));  // put rest of query into cgiargs
-
-}
-
-
+
+
+
-{
-  logout << "in format user info";
-  text_tset metadata;
-
+
+
-  infodbclass argsinfo;
-cgi
+history
-  
-  text_t collect = argsinfo["c"];
@@ -567 +237 @@
-    return;
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/gsdl/src/recpt/historydb.h

@@ -31 +31 @@
-#include "text_t.h"
-#include "recptproto.h"
+#include "cgiargs.h"
-
+/*
-struct HistRecord {
-  text_t entry;
@@ -46 +48 @@
-typedef map<text_t, HistRecord, ltinttext_t> HistRecordmap;
-
+*/
-// returns true on success (in which case historyinfo will contain
-// the information for this history)
@@ -53 +56 @@
-// returns true on success
-bool set_history_info (const text_t &userid, const text_t &historyinfo, 
-
+, bool display
-
+// delete all history for one user
-bool delete_all_history_info (const text_t &userid, const text_t &gsdlhome);
-
-// deletes only the entries specified
-bool delete_history_info(const text_t &userid, const text_t &deletemode,
-                         const text_t &selection, const text_t &gsdlhome);
-
-// takes a text_t with x-y, and retrieves the x and y params
-bool get_selection_params (text_t &data, int &start, int &stop);
-
-bool expand_query(HistRecord &query, HistRecordmap &records);
-
-// combine query looks for #x and replaces it with the query
-// string from the xth entry. THe first one looks up the xth
-// query in the database (used before running a query), the 
-// second version looks it up inthe records map (used in
-// delete history -are doing a lotof #x replacing at once.
-bool combine_query(text_t &userid, text_t &query, const text_t &gsdlhome);
-bool combine_query(text_t &userid, HistRecordmap  &records);
-
-// retrieves the value of an arg (key) from a list of cgi args
@@ -80 +67 @@
-// extracts out the components of an entry in the database
-// currently:
-
-
-
-
-
+
+
-
-// takes the cgiarg string, and outputs it in some form useful
-// to the user
-void format_user_info (text_t &cgiargs, text_t &info, 
+                       cgiargsclass &args,
-                       recptprotolistclass *protos, ostream &logout);
-