Changeset 8029 for trunk/gsdl/src/recpt/querytools.cpp

Timestamp:

2004-08-23T23:24:20+12:00 (20 years ago)

Author:

davidb

Message:

Introduction of code for elementary use of lucene indexer.

File:

• trunk/gsdl/src/recpt/querytools.cpp (modified) (11 diffs)

trunk/gsdl/src/recpt/querytools.cpp

@@ -198 +198 @@
     
 void add_dates(text_t &querystring, int startdate, int enddate, 
-           int startbc, int endbc)
+           int startbc, int endbc, int ct)
 {
   if(startdate)
@@ -232 +232 @@
        if(!enddate)
      {
-       querystring.appendcstr(" [");
-       if(startdate<0)
-         {
-           querystring.appendcstr("bc");
-           querystring.appendint((startdate*-1));
-         }
-       else 
-         querystring.appendint(startdate);
-       querystring.appendcstr("]:CV");
+       if (ct==1) {
+         mgpp_adddateelem(querystring,startdate);
+       }
+       else { // lucene
+         lucene_adddateelem(querystring,startdate);
+       }
      }
        else{
@@ -247 +244 @@
      while(nextdate<=enddate)
        {
-         if(nextdate!=0)
-           {
-         querystring.appendcstr(" [");
-         if(nextdate<0)
-           {
-             querystring.appendcstr("bc");
-             querystring.appendint((nextdate*-1));
-           }
-         else 
-           querystring.appendint(nextdate);
-         querystring.appendcstr("]:CV");
+         if(nextdate!=0) {
+           if (ct==1) {
+         mgpp_adddateelem(querystring,nextdate);
            }
+           else { // lucene
+         lucene_adddateelem(querystring,nextdate);
+           }
+         }
          nextdate++;
        }
@@ -320 +313 @@
 // some query form parsing functions for use with mgpp
 
-void parse_reg_query_form(text_t &querystring, cgiargsclass &args){
-
+void parse_reg_query_form(text_t &querystring, cgiargsclass &args)
+{
   querystring.clear();
+
+  const int ct = args.getintarg("ct");
+  int argt = args.getintarg("t");// t=0 -and, t=1 - or
+
   text_t combine;
-  int argt = args.getintarg("t");// t=0 -and, t=1 - or
-  if (argt == 0) combine = "&";
-  else combine = "|";
+  if (ct==1) {
+    if (argt == 0) combine = "&";
+    else combine = "|";
+  }
+  else { // lucene
+    if (argt == 0) combine = "AND";
+    else combine = "OR";
+  }
   
   text_t field = args["fqf"];
@@ -338 +340 @@
   splitchar(value.begin(), value.end(), ',', values);
 
+
   for (int i=0; i< values.size(); i++) {
     if (!values[i].empty()) {
-      addqueryelem(querystring, fields[i], values[i], combine);
+      if (ct == 1) {
+    mgpp_addqueryelem(querystring, fields[i], values[i], combine);
+      }
+      else { // lucene
+    lucene_addqueryelem(querystring, fields[i], values[i], combine);
+      }
     }
   }
@@ -350 +358 @@
 
   querystring.clear();
-  text_t combine = "&";
+
+  const int ct = args.getintarg("ct");
+  text_t combine;
+  if (ct==1) {
+    combine = "&";
+  }
+  else { // lucene
+    combine = "AND";
+  }
 
   text_t field = args["fqf"];
@@ -380 +396 @@
     if (!values[i].empty()) {
       if (i!=0) {
-    if (combs[i-1]=="and") combine = "&";
-    else if (combs[i-1]=="or")combine = "|";
-    else if (combs[i-1]=="not")combine = "!";
+    if (ct==1) {
+      if (combs[i-1]=="and") combine = "&";
+      else if (combs[i-1]=="or")combine = "|";
+      else if (combs[i-1]=="not")combine = "!";
+    }
+    else { // lucene
+      if (combs[i-1]=="and") combine = "AND";
+      else if (combs[i-1]=="or")combine = "OR";
+      else if (combs[i-1]=="not")combine = "NOT";
+    }
       }
       text_t term = addstemcase(values[i], stems[i], folds[i]);
-      addqueryelem(querystring, fields[i], term, combine);
+      mgpp_addqueryelem(querystring, fields[i], term, combine);
     }
     
@@ -446 +469 @@
 
 
-void addqueryelem(text_t &querystring, text_t &tag, 
+void mgpp_adddateelem(text_t& querystring, const int date)
+{
+  querystring.appendcstr(" [");
+  if(date<0) {
+      querystring.appendcstr("bc");
+      querystring.appendint((date*-1));
+  }
+  else {
+    querystring.appendint(date);
+  }
+  querystring.appendcstr("]:CV");
+}
+
+void lucene_adddateelem(text_t& querystring, const int date)
+{
+  querystring.appendcstr(" CV:(");
+  if(date<0) {
+      querystring.appendcstr("bc");
+      querystring.appendint((date*-1));
+  }
+  else {
+    querystring.appendint(date);
+  }
+  querystring.appendcstr(")");
+}
+
+
+void mgpp_addqueryelem(text_t &querystring, text_t &tag, 
           text_t &query, text_t &combine) {
   if (!querystring.empty()) { // have to put and/or
-    querystring += " "+combine + " ";
+    querystring += " " + combine + " ";
  
   }
@@ -459 +509 @@
   }
 
+}
+
+void lucene_addqueryelem(text_t &querystring, text_t &tag, 
+          text_t &query, text_t &combine) {
+  if (!querystring.empty()) { // have to put and/or
+    querystring += " " + combine + " ";
+ 
+  }
+  if (tag=="ZZ" || tag=="") { // just add onto querystring
+       querystring +=  query;
+  }
+  else {
+    querystring += tag+":("+query+")";
+  }
 }
 
@@ -544 +608 @@
 
 
-void format_field_info(text_t & querystring, const text_t &tag) {
+void mgpp_format_field_info(text_t & querystring, const text_t &tag) {
 
   if (tag == "ZZ" || tag == "") {
@@ -552 +616 @@
   querystring = "["+querystring+"]:"+tag;
 }
+
+void lucene_format_field_info(text_t & querystring, const text_t &tag) {
+
+  if (tag == "ZZ" || tag == "") {
+    return; // do nothing
+  }
+
+  querystring = tag+":("+querystring+")";
+}