Changeset 1373 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

2000-08-08T15:46:13+12:00 (24 years ago)

Author:

dmm9

Message:

Support for date search

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -276 +276 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-
+     // "ds" - start date
+  arg_ainfo.shortname = "ds";
+  arg_ainfo.longname = "start date";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "de" - end date
+  arg_ainfo.shortname = "de";
+  arg_ainfo.longname = "end date";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "dsbc" - whether or not start date is prechristian
+  arg_ainfo.shortname = "dsbc";
+  arg_ainfo.longname = "start date bc";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "debc" - whether or not end date is prechristian
+  arg_ainfo.shortname = "debc";
+  arg_ainfo.longname = "end date bc";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
 
 }
@@ -998 +1032 @@
 
   format_querystring (formattedstring, args.getintarg("b"));
+  //add_ands(formattedstring, args.getintarg("t"));
+  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);
@@ -1045 +1082 @@
   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 += ", ";
+    char *term = (*this_term).term.getcstr();
+    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 ++;
   }
@@ -1134 +1175 @@
 
 }
+
+
+
+
+
+