Changeset 1915

Timestamp:

2001-02-07T12:33:33+13:00 (23 years ago)

Author:

kjm18

Message:

new look for history.
mg cols: small/large querybox option.
mgpp cols: querybox options, also form queries - simple/advanced
involves new cgiargs (fqa, fqn, fqs, fqk, fqf, fqv), new macros etc

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (22 diffs)
• queryaction.h (modified) (2 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -33 +33 @@
 #include "text_t.h"
 #include "historydb.h"
+#include "htmlutils.h" // for html_safe in do_action
+#include "gsdltools.h"
 
 void colinfo_t::clear () {
@@ -59 +61 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+   // "ct" - 0 = mg, 1 = mgpp
+  arg_ainfo.shortname = "ct";
+  arg_ainfo.longname = "collection type";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+ 
   // "b" - 0 = simple, 1 = advanced
   arg_ainfo.shortname = "b";
@@ -122 +133 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+
   // "q"
   arg_ainfo.shortname = "q";
@@ -232 +244 @@
 
   // "hd" history display  - search history only displayed when
-  // this var set.
+  // this var set to something other than 0
+  // this number of records is displayed
   arg_ainfo.shortname = "hd";
   arg_ainfo.longname = "history display";
-  arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplechar = true;
   arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
@@ -242 +255 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
         
-
- // "hs"  save - set to 1 in query form, so only save when submit
+  // "hs"  save - set to 1 in query form, so only save when submit
   // query
   // 0 = no save 1 = save
@@ -254 +266 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-
-  // "hcl" compress the list (show only the last 5)
-  // 0 = expand, 1 = compress
-
-  arg_ainfo.shortname = "hcl";
-  arg_ainfo.longname = "history compress list";
-  arg_ainfo.multiplechar = false;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "1";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-
   // new arg for granularity, for mgpp collections
   arg_ainfo.shortname = "g";
@@ -276 +275 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-     // "ds" - start date
+  // "ds" - start date
   arg_ainfo.shortname = "ds";
   arg_ainfo.longname = "start date";
@@ -312 +311 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // "qt" - 0 = text, 1 = form
+  arg_ainfo.shortname = "qt";
+  arg_ainfo.longname = "query type";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "qb" - 0 = regular, 1 = large
+  arg_ainfo.shortname = "qb";
+  arg_ainfo.longname = "query box type";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "fqn" - number of fields in the query form
+  arg_ainfo.shortname = "fqn";
+  arg_ainfo.longname = "form query num fields";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "4";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "fqf" - the list of field names in the form query
+  // - a comma separated list
+  arg_ainfo.shortname = "fqf";
+  arg_ainfo.longname = "form query fields";
+  arg_ainfo.multiplechar = true;
+  //arg_ainfo.multiplevalue = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+  
+  // "fqv" - the list of values in the form query
+  // - a comma separated list
+  arg_ainfo.shortname = "fqv";
+  arg_ainfo.longname = "form query values";
+  arg_ainfo.multiplechar = true;
+  //arg_ainfo.multiplevalue = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+  
+
+  // "fqs" - the list of stemming options in the form query
+  // - a comma separated list
+  arg_ainfo.shortname = "fqs";
+  arg_ainfo.longname = "form query stems";
+  arg_ainfo.multiplechar = true;
+  //arg_ainfo.multiplevalue = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+  
+
+  // "fqk" - the list of casefolding options in the form query
+  // - a comma separated list
+  arg_ainfo.shortname = "fqk";
+  arg_ainfo.longname = "form query casefolds";
+  arg_ainfo.multiplechar = true;
+  //arg_ainfo.multiplevalue = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+  
+  // "fqc" - the list of boolean operators in the form query
+  // - a comma separated list
+  arg_ainfo.shortname = "fqc";
+  arg_ainfo.longname = "form query combines";
+  arg_ainfo.multiplechar = true;
+  //arg_ainfo.multiplevalue = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "fqa" - form query advanced - for "run query"
+  arg_ainfo.shortname = "fqa";
+  arg_ainfo.longname = "form query advanced query";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+  
 }
 
@@ -373 +465 @@
   }
   //check hd argument
-    int arg_hd = args.getintarg("hd");
-    if (arg_hd !=0 && arg_hd !=1) {
-      logout << "Warning: \"hd\" argument out of range (" << arg_hd << ")\n";
-          cgiarginfo *hdinfo = argsinfo.getarginfo ("hd");
-          if (hdinfo != NULL) args["hd"] = hdinfo->argdefault;
-    }  
+  int arg_hd = args.getintarg("hd");
+  if (arg_hd <0 ) {
+    logout << "Warning: \"hd\" argument less than 0 (" << arg_hd << ")\n";
+    cgiarginfo *hdinfo = argsinfo.getarginfo ("hd");
+    if (hdinfo != NULL) args["hd"] = hdinfo->argdefault;
+  }  
+  
   //check hs argument
   int arg_hs = args.getintarg("hs");
@@ -387 +480 @@
   }
 
-  // chech hcl argument
-  int arg_hcl = args.getintarg("hcl");
-  if (arg_hcl !=0 && arg_hcl !=1) {
-    logout << "Warning: \"hcl\" argument out of range (" << arg_hcl << ")\n";
-    cgiarginfo *hclinfo = argsinfo.getarginfo ("hcl");
-    if (hclinfo != NULL) args["hcl"] = hclinfo->argdefault;
+  // check ct argument
+  int arg_ct = args.getintarg("ct");
+  if (arg_ct !=0 && arg_ct !=1) {
+    logout << "Warning: \"ct\" argument out of range (" << arg_ct << ")\n";
+    cgiarginfo *ctinfo = argsinfo.getarginfo ("ct");
+    if (ctinfo != NULL) args["ct"] = ctinfo->argdefault;
+  }
+
+  // check qt argument
+  int arg_qt = args.getintarg("qt");
+  if (arg_qt !=0 && arg_qt !=1) {
+    logout << "Warning: \"qt\" argument out of range (" << arg_qt << ")\n";
+    cgiarginfo *qtinfo = argsinfo.getarginfo ("qt");
+    if (qtinfo != NULL) args["qt"] = qtinfo->argdefault;
+  }
+
+  // check qb argument
+  int arg_qb = args.getintarg("qb");
+  if (arg_qb !=0 && arg_qb !=1) {
+    logout << "Warning: \"qb\" argument out of range (" << arg_qb << ")\n";
+    cgiarginfo *qbinfo = argsinfo.getarginfo ("qb");
+    if (qbinfo != NULL) args["qb"] = qbinfo->argdefault;
+  }
+
+  // check fqa argument
+  int arg_fqa = args.getintarg("fqa");
+  if (arg_fqa !=0 && arg_fqa !=1) {
+    logout << "Warning: \"fqa\" argument out of range (" << arg_fqa << ")\n";
+    cgiarginfo *fqainfo = argsinfo.getarginfo ("fqa");
+    if (fqainfo != NULL) args["fqa"] = fqainfo->argdefault;
+  }
+
+  // check fqn argument
+  int arg_fqn = args.getintarg("fqn");
+  if (arg_fqn < -1) {
+    logout << "Warning: \"fqn\" argument less than -1 (" << arg_fqn << ")\n";
+    cgiarginfo *fqninfo = argsinfo.getarginfo ("fqn");
+    if (fqninfo != NULL) args["fqn"] = fqninfo->argdefault;
   }
 
@@ -406 +531 @@
 
 void queryaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
-                      recptprotolistclass * /*protos*/, 
-                      ostream &/*logout*/) {
+                      recptprotolistclass * protos, 
+                      ostream &logout) {
 
   // define_internal_macros sets the following macros:
@@ -449 +574 @@
   if (args.getintarg("s")) quotedquery += "_textstemon_";
   disp.setmacro ("quotedquery", "query", quotedquery);
+
+  define_form_macros(disp, args, protos, logout);
 }
 
@@ -478 +605 @@
   macrovalue += "</select>\n";
   disp.setmacro (macroname + "selection", "Global", macrovalue);
+}
+
+// sets the selection box macro _fqfselection_.
+void queryaction::set_fqfselection_macro (const FilterOption_t &option, 
+                     displayclass &disp) {
+
+  if (option.validValues.empty()) return;
+  text_t macrovalue = "";
+
+  macrovalue += "<select name=\"fqf\" onChange=\"updatefqf();\">\n";
+  
+  text_tarray::const_iterator thisvalue = option.validValues.begin();
+  text_tarray::const_iterator endvalue = option.validValues.end();
+
+  while (thisvalue != endvalue) {
+    macrovalue += "<option value=\"" + *thisvalue + "\">_";    
+    macrovalue += *thisvalue + "_\n";
+    thisvalue ++;
+  }
+  macrovalue += "</select>\n";
+  disp.setmacro ("fqfselection", "query", macrovalue);
+
 }
 
@@ -530 +679 @@
     if (it!=end) set_option_macro("g", args["g"], (*it).second, disp);
 
-    // define_history_macros(disp, args, protos, logout);
+    // should probably go into define_internal_macros
+    // _fqfselection_
+    it = response.filterOptions.find("IndexField");
+    if (it!=end) {
+      set_fqfselection_macro((*it).second, disp);
+    }
   }
 } // define external macros
+
+void queryaction::define_form_macros (displayclass &disp, cgiargsclass &args, 
+               recptprotolistclass *protos, ostream &logout) {
+
+  // defines the following macros
+  // _regformlist_
+  // _advformlist_
+
+  if (args["ct"]!="1" || args["qt"]!="1") 
+    return; // dont need these macros
+
+    // mgpp & form query only needs the macros defined
+  text_t form = "";
+  int argfqn = args.getintarg("fqn");
+  
+  if (args["b"] == "1") { // advanced form
+    form += "<tr>_firstadvformelement_</tr>\n";
+    for (int i=1; i<argfqn; i++) {      
+    form += "<tr>_advformelement_</tr>\n";
+    }
+    disp.setmacro("advformlist", "query", form);
+  }
+  else { // simple form
+    for (int i=0; i<argfqn; i++) {
+      form += "<tr>_regformelement_</tr>\n"; 
+    }
+    disp.setmacro("regformlist", "query", form);
+  }
+  
+}
 
 void queryaction::define_history_macros (displayclass &disp, cgiargsclass &args, 
@@ -543 +727 @@
   text_t historylist;
   int arghd = args.getintarg("hd");
-  if (arghd != 1) {
+  if (arghd == 0) {
     historylist="";
   }
@@ -555 +739 @@
       text_tarray::iterator here = entries.begin();
       text_tarray::iterator end = entries.end();
-      int size=(int)entries.size();
-      if (args["hcl"]==1&&size>5) { // compress the list 
-    here = end-5;
-    count=size-4;
+      int numrecords=(int)entries.size();
+      if (numrecords>arghd) { // only display some of them 
+    numrecords = arghd;
       }
-      historylist += "<table align=center width=500 border=0>\n";
-      historylist += "<tr><td width=300 align=center>";
-      historylist += "<a href=\"_httpclearhistory_\">_textclearhistory_</a></td>\n";
-
-      if (size>5&&args["hcl"]==1) { //compress the list, show the expand button
-       
-      historylist += "<td><a href=\"_gwcgi_?_optsite_e=_compressedoptions_&a=q&hcl=0\">_textexpand_</a></td>\n";
-      }
-      else if (size >5 && args["hcl"]==0) { // expand the list, show contract button
-    historylist += "<td><a href=\"_gwcgi_?_optsite_e=_compressedoptions_&a=q&hcl=1\">_textcontract_</a></td>\n";
-      }
-      historylist += "</table>\n";
-      historylist += "<table align=center width=500 border=1>\n<tr><th colspan=4 align=center>";
-      historylist += "_textsearchhistory_</th></tr>\n";
-      historylist += "<tr><th width=40>#</th>\n<th width=340>_textquery_</th>\n";
-      historylist += "<th width=60>_textresults_</th><th width=60>_textview_</th></tr>\n";
-
-      while (here !=end ) {
-    text_t c;
+      historylist += "<form name=\"HistoryForm\"><table width=537>\n";
+
+      for (int i=0; i<numrecords;i++) {
     text_t query;
     text_t numdocs;
     text_t cgiargs;
-    text_t  userinfo;
-    split_saved_query(*here,c, numdocs, cgiargs);
+    text_t userinfo;
+    text_t escquery;
+    split_saved_query(entries[i],numdocs,cgiargs);
     parse_saved_args(cgiargs, "q", query); // get query string out
     decode_cgi_arg(query); // un cgisafe it
+    escquery = escape_quotes(query); // escape the quotes
+    text_t histvalue = "histvalue";
+    histvalue += i;
+    disp.setmacro(histvalue, "query", escquery);
+    format_user_info(cgiargs, userinfo, args, protos, logout);
     
-    format_user_info(cgiargs, userinfo, protos, logout);
-    
-    historylist += "<tr> <td width=40 align=center>"+c+"</td>\n";
-    historylist += "<td width=340 align=left>"+query+"</td><td width=60 align=center>"+numdocs+"</td>\n";
-    historylist += "<td width=60 align=center><a href=\"_gwcgi_?_optsite_e=_compressedoptions_&";
-    historylist += *here+"\"><img name=\"display\" src=\"_httpicondisplay_\" width=_widthdisplay_ ";
-    historylist += "height=_heightdisplay_ border=\"0\" alt=\"" + userinfo +"\"></a></td></tr>\n";
-    here++;
-    count++;
+    historylist += "<tr><td align=right>_imagehistbutton_(";
+    historylist += i;
+    historylist += ")</td>\n";
+    historylist += "<td><nobr><table border=1 cellspacing=0 ";
+    historylist += "cellpadding=0><tr><td width=365 align=left>"
+      + query 
+      + "</td></tr></table></td><td width=110 align=center><small>"
+      + numdocs;
+    if (numdocs == 1) historylist += " _texthresult_";
+    else historylist += " _texthresults_";
+    if (!userinfo.empty()) {
+      historylist += "<br>( "+userinfo+" )</small></td>\n";
+    }
       }
-      historylist+="</table>\n\n";
+      historylist+="</table></form>\n\n";
      
-    } // if
+    } // if get history info 
     else {
       historylist += "_textnohistory_";
@@ -1040 +1217 @@
   // do the query
   request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
-  text_t formattedstring = args["q"];
-  if (!combine_query (args["z"], formattedstring, gsdlhome)) {
-    args["q"]=formattedstring; 
-  }
-
-  format_querystring (formattedstring, args.getintarg("b"));
-  add_dates(formattedstring, args.getintarg("ds"), args.getintarg("de"),
+  text_t formattedstring = "";
+
+  if (args["qt"]=="0") { // normal text search
+    formattedstring = args["q"];
+    format_querystring (formattedstring, args.getintarg("b"));
+    add_dates(formattedstring, args.getintarg("ds"), args.getintarg("de"),
         args.getintarg("dsbc"), args.getintarg("debc"));
-  set_queryfilter_options (request, formattedstring, args);
-  collectproto->filter (collection, request, response, err, logout);
-  if (err != noError) {
-    outconvertclass text_t2ascii;
-    logout << text_t2ascii
-       << "queryaction::search_single_collections: call to QueryFilter failed "
-       << "for " << collection << " collection (" << get_comerror_string (err) << ")\n";
+  }
+  else if (args["qt"]=="1" ){ // form search
+
+    if (args["b"]=="1" && args["fqa"]=="1") { // explicit query
+      formattedstring = args["q"];
+    }
+    else { // form search
+      if (args["b"]=="0") { // regular form
+    parse_reg_query_form(formattedstring, args);
+      }
+      else  { // advanced form
+    parse_adv_query_form(formattedstring, args);
+      }
+      args["q"] = formattedstring;
+      
+      // also reset the _cgiargq_ macro as it has changed now
+      disp.setmacro("cgiargq", "Global", html_safe(args["q"]));
+      
+      // reset the compressed options to include the q arg
+      text_t compressedoptions = recpt->get_compressed_arg(args, logout);
+      if (!compressedoptions.empty()) {
+    disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
+    // need a decoded version of compressedoptions for use within forms
+    // as browsers encode values from forms before sending to server
+    // (e.g. %25 becomes %2525)
+    decode_cgi_arg (compressedoptions);
+    disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
+      }
+    } // form search
+  } // args["qt"]=1
+  else {
+    logout << "ERROR (query_action::search_single_collection): querytype not defined\n";
     return false;
   }
 
-  
-  define_query_macros (args, disp, response);
-
-  // save the query if appropriate
-  if (!save_search_history(args, response))
-    logout << "save failed";
+  if (!formattedstring.empty()) { // do the query
+    set_queryfilter_options (request, formattedstring, args);
+    collectproto->filter (collection, request, response, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii
+         << "queryaction::search_single_collections: call to QueryFilter failed "
+         << "for " << collection << " collection (" << get_comerror_string (err) << ")\n";
+      return false;
+    }
+ 
+    define_query_macros (args, disp, response);
+
+    // save the query if appropriate
+    if (!save_search_history(args, response))
+      logout << "save failed"; 
+  }
 
   define_history_macros (disp, args, protos, logout);
-
+  
   textout << outconvert << disp << "_query:header_\n"
       << "_query:content_";
@@ -1096 +1308 @@
   while (this_term != end_term) {
     char *term = (*this_term).term.getcstr();
-    if(term[0]<'0' || term[0] >'9'){
+    //   if(term[0]<'0' || term[0] >'9'){
       freqmsg += (*this_term).term + ": " + (*this_term).freq;
       if ((this_term + 1) != end_term)
     freqmsg += ", ";
-    }
+      // }
     delete term;
     this_term ++;
@@ -1156 +1368 @@
 bool queryaction::save_search_history (cgiargsclass &args, const FilterResponse_t &response) 
 {
-
   if (args["q"]=="") return true; // null query, dont save
   if (args["hs"]=="0") return true; // only save when submit query
-
+                                    // displayed
   // get userid
   text_t userid = args["z"];
@@ -1169 +1380 @@
     query.push_back('+');
   }
-  query += "a=q";
-  query += "&c="+args["c"];
+  query += "c="+args["c"];
   query += "&h="+args["h"];
   query += "&t="+args["t"];
@@ -1178 +1388 @@
   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;
 
-  if (set_history_info(userid, query, gsdlhome)) return true;
+  bool display=false;
+  int hd = args.getintarg("hd");
+  if (hd > 0) display=true;
+  if (set_history_info(userid, query, gsdlhome, display)) return true;
   else return false;
 
@@ -1191 +1405 @@
 
 
-
-
-

trunk/gsdl/src/recpt/queryaction.h

@@ -69 +69 @@
                 const FilterResponse_t &response); 
 
+  void define_form_macros (displayclass &disp, cgiargsclass &args, 
+               recptprotolistclass *protos, ostream &logout);
+
+  void set_fqfselection_macro (const FilterOption_t &option, 
+                  displayclass &disp);
+
+
   void define_history_macros (displayclass &disp, cgiargsclass &args, 
                    recptprotolistclass *protos, ostream &logout);
@@ -79 +86 @@
            ostream &textout, ostream &logout);
   
-
-
-  bool search_multiple_collections (cgiargsclass &args, recptprotolistclass *protos,
-                    browsermapclass *browsers, displayclass &disp,
-                    outconvertclass &outconvert, ostream &textout,
+  bool search_multiple_collections (cgiargsclass &args, 
+                    recptprotolistclass *protos,
+                    browsermapclass *browsers, 
+                    displayclass &disp,
+                    outconvertclass &outconvert, 
+                    ostream &textout,
                     ostream &logout);
-
-
-  bool search_single_collection (cgiargsclass &args, const text_t &collection,
-                 recptprotolistclass *protos, browsermapclass *browsers, 
-                 displayclass &disp, outconvertclass &outconvert, 
+  
+  bool search_single_collection (cgiargsclass &args, 
+                 const text_t &collection,
+                 recptprotolistclass *protos, 
+                 browsermapclass *browsers, 
+                 displayclass &disp, 
+                 outconvertclass &outconvert, 
                  ostream &textout, ostream &logout);
 
 
-  bool save_search_history(cgiargsclass &args, const FilterResponse_t &response); 
-  bool delete_search_history(cgiargsclass &args);
+  bool save_search_history(cgiargsclass &args, 
+               const FilterResponse_t &response); 
 
 public: