Changeset 4200

Timestamp:

2003-04-30T14:41:06+12:00 (21 years ago)

Author:

kjdon

Message:

added form search capability to cross coll search, put the query format stuff for form queries into a new method so search_single and search_multiple can both use it, search_mulitple now uses define_query_macros, but this is simplified to only do the ones that are the same for both single and multi search. search history now provided for search multi colls - it needs some thought into what to display cos now there is more than one coll.

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1061 +1061 @@
   FilterResponse_t response;
   request.filterResultOptions = FROID | FRmetadata | FRtermFreq | FRranking;
-  text_t formattedstring = args["q"];
   text_t freqmsg = "_textfreqmsg1_";
   int numdocs = 0;
   isapprox isApprox = Exact;
 
-  format_querystring (formattedstring, args.getintarg("b"));
+  text_t formattedstring = "";
+  get_formatted_query_string(formattedstring, args, disp, logout);
+
+  if (formattedstring.empty()) {
+    // dont bother doing a query if no query string
+    define_history_macros (disp, args, protos, logout);
+    textout << outconvert << disp << "_query:header_\n"
+      << "_query:content_";
+    textout << outconvert << disp << "_query:footer_";
+
+    return true;
+  }
+
   set_queryfilter_options (request, formattedstring, args);
 
@@ -1162 +1173 @@
     }
     col_here ++;
-  }
+  } // for each coll
 
   disp.setmacro ("freqmsg", "query", freqmsg);
 
-  int maxdocs = args.getintarg("m");
-  int firstdoc = args.getintarg("r");
-  int hitsperpage = args.getintarg("o");
-  if (num_phrases > 0) isApprox = Exact;
-  if (maxdocs == -1) maxdocs = numdocs;
-  else if (numdocs > maxdocs) {
-    numdocs = maxdocs;
-    isApprox = MoreThan;
-  }
-  if (hitsperpage == -1) hitsperpage = numdocs;
-
-  text_t resline;
-  if (isApprox == Approximate) resline = "_textapprox_";
-  else if (isApprox == MoreThan) resline = "_textmorethan_";
-  
-  if (numdocs == 0) resline = "_textnodocs_";
-  else if (numdocs == 1) resline += "_text1doc_";
-  else resline += text_t(numdocs) + " _textlotsdocs_";
-  disp.setmacro("resultline", "query", resline);
-
+  define_query_macros( args, disp, numdocs, isApprox);
+  // save the query if appropriate
+  save_search_history(args, numdocs, isApprox);
+  define_history_macros (disp, args, protos, logout);
+
+  textout << outconvert << disp << "_query:header_\n"
+      << "_query:content_";
+
+  // now go through each result and output it
   QueryResult_tset::iterator res_here = results.begin();
   QueryResult_tset::iterator res_end = results.end();
@@ -1195 +1195 @@
   browserclass *browserptr = NULL;
 
-  // set up _thisfirst_ and _thislast_ macros
-  disp.setmacro ("thisfirst", "query", firstdoc);
+  int count = 1;
+  int firstdoc = args.getintarg("r");
+  int hitsperpage = args.getintarg("o");
   int thislast = firstdoc + (hitsperpage - 1);
-  if (thislast > numdocs) thislast = numdocs;
-  disp.setmacro ("thislast", "query", thislast);
-
-  // set up _prevfirst_ and _prevlast_ macros
-  if (firstdoc > 1) {
-    disp.setmacro ("prevlast", "query", firstdoc - 1);
-    int prevfirst = firstdoc - hitsperpage;
-    if (prevfirst < 1) prevfirst = 1;
-    disp.setmacro ("prevfirst", "query", prevfirst);
-  }
-
-  // set up _nextfirst_ and _nextlast_ macros
-  if (thislast < numdocs) {
-    disp.setmacro ("nextfirst", "query", thislast + 1);
-    int nextlast = thislast + hitsperpage;
-    if (nextlast > numdocs) nextlast = numdocs;
-    disp.setmacro ("nextlast", "query", nextlast);
-  }
-
-  textout << outconvert << disp << "_query:header_\n"
-      << "_query:content_";
-
-  int count = 1;
 
   // output results
@@ -1289 +1267 @@
   text_t formatstring;
   if (!get_formatstring (classification, browsertype, 
-             cinfo->format, formatstring))
+             cinfo->format, formatstring)) {
     formatstring = bptr->get_default_formatstring();
-
+  }
   FilterRequest_t request;
   FilterResponse_t response;
@@ -1303 +1281 @@
   request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
   text_t formattedstring = "";
-
+  get_formatted_query_string(formattedstring, args, disp, logout);
+
+
+  if (!formattedstring.empty()) { // do the query
+    // note! formattedstring is in unicode! mg and mgpp must convert!
+    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.numDocs, response.isApprox);
+    define_single_query_macros(args, disp, response);
+
+    // save the query if appropriate
+    save_search_history(args, response.numDocs, response.isApprox);
+  }
+  define_history_macros (disp, args, protos, logout);
+  
+  textout << outconvert << disp << "_query:header_\n"
+      << "_query:content_";
+
+  // output the results
+  bool use_table = is_table_content (formatlistptr);
+  bptr->output_section_group (response, args, collection, 0, formatlistptr, 
+                  use_table, request.fields, request.getParents, 
+                  collectproto, disp, outconvert, textout, logout);
+  
+
+  textout << outconvert << disp << "_query:footer_";
+  
+  delete (formatlistptr);
+  
+  return true;
+}
+ 
+// does the formatting of the query string - either uses q for a text search
+// or the form values for an form search
+// also adds dates if appropriate in text search
+void queryaction::get_formatted_query_string (text_t &formattedstring, 
+                          cgiargsclass &args, 
+                          displayclass &disp,
+                          ostream &logout) {
   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"));
+          args.getintarg("dsbc"), args.getintarg("debc"));
   }
   else if (args["qt"]=="1" ){ // form search
@@ -1343 +1367 @@
   } // args["qt"]=1
   else {
-    logout << "ERROR (query_action::search_single_collection): querytype not defined\n";
-    return false;
-  }
-
-  if (!formattedstring.empty()) { // do the query
-    // note! formattedstring is in unicode! mg and mgpp must convert!
-    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_";
-
-  // output the results
-  bool use_table = is_table_content (formatlistptr);
-  bptr->output_section_group (response, args, collection, 0, formatlistptr, 
-                  use_table, request.fields, request.getParents, 
-                  collectproto, disp, outconvert, textout, logout);
-  
-
-  textout << outconvert << disp << "_query:footer_";
-  
-  delete (formatlistptr);
-  
-  return true;
-}
-  
+    logout << "ERROR (query_action::get_formatted_query_string): querytype not defined\n";
+  }
+}
+
+
 // define_query_macros sets the macros that couldn't be set until the
-// query had been done. Those macros are _freqmsg_, _quotedquery_,
+// query had been done. Those macros are 
 // _resultline_, _nextfirst_, _nextlast_, _prevfirst_, _prevlast_,
 // _thisfirst_, and _thislast_
-void queryaction::define_query_macros (cgiargsclass &args, displayclass &disp, 
-                       const FilterResponse_t &response) { 
-  // set up _freqmsg_ and _quotedquery_ macros
-  text_t freqmsg = "_textfreqmsg1_";
-  TermInfo_tarray::const_iterator this_term = response.termInfo.begin();
-  TermInfo_tarray::const_iterator end_term = response.termInfo.end();
-  while (this_term != end_term) {
-    // check that the term doesn't consist completely of digits...
-    //    char *term = (*this_term).term.getcstr();
-    //    char *lastchar;
-    //    strtol(term,&lastchar,10);
-    //    if(*lastchar != '\0'){
-    freqmsg += (*this_term).term + ": " + (*this_term).freq;
-    if ((this_term + 1) != end_term)
-      freqmsg += ", ";
-    //    }
-    //    delete term;
-    this_term ++;
-  }
-  disp.setmacro ("freqmsg", "query", freqmsg);
-
+// this has been simplified so it can be used with both search_single_coll
+// and search_multiple_coll
+void queryaction::define_query_macros (cgiargsclass &args, displayclass &disp,
+                       int numdocs, isapprox isApprox) {
+  
   // set up _resultline_ macro
   text_t resline;
   int maxdocs = args.getintarg("m");
-  int numdocs = response.numDocs;
-  isapprox isApprox = response.isApprox;
   if (num_phrases > 0) isApprox = Exact;
   if (maxdocs == -1) maxdocs = numdocs;
@@ -1458 +1427 @@
 }
 
-bool queryaction::save_search_history (cgiargsclass &args, const FilterResponse_t &response) 
-{
+// define_single_query_macros sets the extra macros for search_single_coll 
+// that couldn't be set until the query had been done. Those macros are 
+// _freqmsg_, _quotedquery_
+void queryaction::define_single_query_macros (cgiargsclass &args, 
+                          displayclass &disp, 
+                          const FilterResponse_t &response) { 
+  // set up _freqmsg_ and _quotedquery_ macros
+  text_t freqmsg = "_textfreqmsg1_";
+  TermInfo_tarray::const_iterator this_term = response.termInfo.begin();
+  TermInfo_tarray::const_iterator end_term = response.termInfo.end();
+  while (this_term != end_term) {
+    freqmsg += (*this_term).term + ": " + (*this_term).freq;
+    if ((this_term + 1) != end_term)
+      freqmsg += ", ";
+    this_term ++;
+  }
+  disp.setmacro ("freqmsg", "query", freqmsg);
+}
+
+// should this change for cross coll search??
+bool queryaction::save_search_history (cgiargsclass &args, int numdocs, 
+                       isapprox isApprox) {
   if (args["q"]=="") return true; // null query, dont save
-  if (args["hs"]=="0") return true; // only save when submit query
-                                    // displayed
+  if (args["hs"]=="0") return true; // only save when submit query pressed
+  
   // get userid
   text_t userid = args["z"];
 
   // the number of docs goes on the front of the query string
-  int numdocs= response.numDocs;
   text_t query = text_t(numdocs);
-  if (response.isApprox==MoreThan) { // there were more docs found
+  if (isApprox==MoreThan) { // there were more docs found
     query.push_back('+');
   }

trunk/gsdl/src/recpt/queryaction.h

@@ -66 +66 @@
   int num_phrases;
 
+  virtual void define_single_query_macros (cgiargsclass &args, 
+                       displayclass &disp, 
+                       const FilterResponse_t &response); 
   virtual void define_query_macros (cgiargsclass &args, displayclass &disp, 
-                const FilterResponse_t &response); 
+                int numDocs, isapprox isApprox); 
 
+  void get_formatted_query_string (text_t &formattedstring, cgiargsclass &args, 
+                   displayclass &disp, ostream &logout);
   void define_query_interface(displayclass &disp, cgiargsclass &args, 
-               recptprotolistclass *protos, ostream &logout);
-
+                  recptprotolistclass *protos, ostream &logout);
+  
   void define_form_macros (displayclass &disp, cgiargsclass &args, 
                recptprotolistclass *protos, ostream &logout);
@@ -110 +115 @@
 
 
-  bool save_search_history(cgiargsclass &args, 
-               const FilterResponse_t &response); 
+  bool save_search_history(cgiargsclass &args, int numdocs, isapprox isApprox);
 
 public: