Changeset 1373

Timestamp:

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

Author:

dmm9

Message:

Support for date search

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (4 diffs)
• querytools.cpp (modified) (2 diffs)
• querytools.h (modified) (1 diff)

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 @@
 
 }
+
+
+
+
+
+

trunk/gsdl/src/recpt/querytools.cpp

@@ -25 +25 @@
 
 #include "querytools.h"
-
+#include <ctype.h>
 
 // request.filterResultOptions and request.fields (if required) should
@@ -185 +185 @@
 }
 
+void add_ands(text_t& querystring, int querytype)
+{
+
+  if(querytype==0)
+    {
+      text_t formattedstring;
+      
+      bool spacelast = false;
+      
+      text_t::const_iterator here = querystring.begin();
+      text_t::const_iterator end = querystring.end();
+      
+
+      querystring = formattedstring;
+
+      while(here!=end && isspace((*here)))
+    here++;
+      
+      if(here==end)
+    return;
+
+      while(here!=end)
+    {
+      if(isspace((*here)))
+      {
+        while(here!=end && isspace((*here)))
+          here++;
+        if(here!=end)
+          formattedstring.appendcstr(" AND ");
+      }
+      if(!isspace((*here)))
+        {
+          formattedstring.push_back((*here));
+        }
+      here++;
+    }
+      querystring = formattedstring;
+    }
+}
+
+  
+    
+void add_dates(text_t &querystring, int startdate, int enddate, 
+           int startbc, int endbc)
+{
+  if(startdate)
+    {
+      int querystringis = 0;
+      text_t::const_iterator here = querystring.begin();
+      text_t::const_iterator end = querystring.end();
+      while(here!=end)
+    {
+      if(!(isspace((*here)))){
+        here = end;
+        querystringis = 1;
+      }
+      else
+        here++;
+    }
+      //converting BCE dates
+      if(startbc && startdate > 0)
+    {
+      startdate *= -1;
+    }
+      if(endbc && enddate > 0)
+    {
+      enddate *= -1;
+    }
+       if(enddate != 0 && enddate<startdate)
+    {
+      cout<<"enddate too small"<<endl;
+      return;
+    }
+       if(querystringis)
+     querystring.appendcstr(" AND");
+       if(!enddate)
+     {
+       querystring.appendcstr(" [");
+       querystring.appendint(startdate);
+       querystring.appendcstr("]:Date");
+     }
+       else{
+     int nextdate = startdate;
+     querystring.appendcstr(" (");
+     while(nextdate<=enddate)
+       {
+         if(nextdate!=0)
+           {
+          querystring.appendcstr(" [");
+          querystring.appendint(nextdate);
+          querystring.appendcstr("]:Date");
+           }
+         nextdate++;
+       }
+     querystring.appendcstr(" )");
+       }
+    }
+}
 void get_phrases (const text_t &querystring, text_tarray &phrases) {
 

trunk/gsdl/src/recpt/querytools.h

@@ -42 +42 @@
 void format_querystring (text_t &querystring, int querymode);
 
+void add_dates(text_t &querystring, int startdate, int enddate, 
+           int startbc, int endbc);
+
 void get_phrases (const text_t &querystring, text_tarray &phrases);
 
+void add_ands(text_t& querystring, int querytype);
+
 #endif
+
+
+
+