Changeset 2745

Timestamp:

2001-09-21T12:20:54+12:00 (23 years ago)

Author:

kjm18

Message:

changes for gselection for mgpp queries, and some form query parsing changes

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (5 diffs)
• queryaction.h (modified) (1 diff)
• querytools.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -266 +266 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  // new arg for granularity, for mgpp collections
+  // "g" - new arg for granularity, for mgpp collections
   arg_ainfo.shortname = "g";
   arg_ainfo.longname = "granularity";
@@ -614 +614 @@
   text_t macrovalue = "";
 
-  macrovalue += "<select name=\"fqf\" onChange=\"updatefqf();\">\n";
+  if (option.validValues.size() == 1) {
+    macrovalue = "_ZZ_";
+  }
+  else {
+    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);
+
+}
+// sets the selection box macros _gselection_.
+void queryaction::set_gselection_macro (text_t current_value,
+                    const FilterOption_t &option, 
+                    displayclass &disp) {
+  
+  if (option.validValues.size() <= 1) {
+    return;
+  } 
+  
+  text_t macrovalue = "<select name=\"g\">\n";
+  
+  if (current_value.empty()) current_value = option.defaultValue;
   
   text_tarray::const_iterator thisvalue = option.validValues.begin();
@@ -620 +650 @@
 
   while (thisvalue != endvalue) {
-    macrovalue += "<option value=\"" + *thisvalue + "\">_";    
-    macrovalue += *thisvalue + "_\n";
+    macrovalue += "<option value=\"" + *thisvalue + "\"";
+    if (*thisvalue == current_value)
+      macrovalue += " selected";
+    macrovalue += ">_" + *thisvalue + "_\n";
     thisvalue ++;
   }
   macrovalue += "</select>\n";
-  disp.setmacro ("fqfselection", "query", macrovalue);
-
+  disp.setmacro ("gselection", "Global", macrovalue);
 }
 
@@ -677 +708 @@
     // _gselection_ (Level) // for mgpp collections
     it = response.filterOptions.find("Level");
-    if (it!=end) set_option_macro("g", args["g"], (*it).second, disp);
+    if (it!=end) set_gselection_macro(args["g"], (*it).second, disp);
 
     // should probably go into define_internal_macros
@@ -754 +785 @@
     parse_saved_args(cgiargs, "q", query); // get query string out
     decode_cgi_arg(query); // un cgisafe it
-    escquery = escape_quotes(query); // escape the quotes
+    escquery = escape_quotes(query); // escape the quotes and newlines
     text_t histvalue = "histvalue";
     histvalue += i;

trunk/gsdl/src/recpt/queryaction.h

@@ -82 +82 @@
              const FilterOption_t &option, displayclass &disp);
 
+  virtual void set_gselection_macro (text_t current_value,
+                     const FilterOption_t &option, 
+                     displayclass &disp);
+
   void output_ccp (cgiargsclass &args, recptprotolistclass *protos,
            displayclass &disp, outconvertclass &outconvert,

trunk/gsdl/src/recpt/querytools.cpp

@@ -252 +252 @@
          else 
            querystring.appendint(nextdate);
-         querystring.appendcstr("]:Coverage");
+         querystring.appendcstr("]:CO");
            }
          nextdate++;
@@ -335 +335 @@
     if (!values[i].empty()) {
       text_t text = formatelem(values[i]);
-      addqueryelem(querystring, fields[i], values[i], combine);
+      addqueryelem(querystring, fields[i], text, combine);
     }
   }
@@ -347 +347 @@
 
   bool space = false;
+  int words = 0;
   text_t newtext = "";
   while (here != end) {
     if (is_unicode_letdig(*here)) {
       newtext.push_back(*here);
+      if (space==false) words++;
       space = true;
     }
@@ -362 +364 @@
   }
 
+  if (words > 1) { // have a phrase, put it in quotes
+    newtext = "\""+newtext+"\"";
+    cout <<"new text="<<newtext.getcstr()<<endl;
+  }
   return newtext;
 }
@@ -402 +408 @@
     else if (combs[i-1]=="not")combine = "!";
       }
-      text_t term = values[i];
+      text_t term = formatelem(values[i]);
       term = addstemcase(term, stems[i], folds[i]);
       addqueryelem(querystring, fields[i], term, combine);
@@ -419 +425 @@
 
   while (here !=end) {
+
     if (is_unicode_letdig(*here)) {
       // not word boundary
@@ -435 +442 @@
       //else word += "c";
     }
+    
     word += " ";
     outtext += word;
     word.clear();
       }
-      //outtext.push_back(*here);
+      if (*here == '\"') {
+    outtext.push_back(*here);
+      }
       here++;
     }