Changeset 24073 for main/trunk

Timestamp:

2011-05-20T16:43:29+12:00 (13 years ago)

Author:

davidb

Message:

Two features added:

1) allow for SQL matching 'startingwith'
2) numeric based searching '<num' and similar, which is in addition to string searching with '<' etc.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp

@@ -738 +738 @@
   for (int i=0; i< values.size(); ++i) {
     if (!values[i].empty()) {
-      text_t this_value = values[i];
-
-      // remove operators for simple search, segments text if necessary
-      format_querystring(this_value, argb, segment); 
-           
-      // add tag info for this field (and other processing)
-      format_field_info_sql(this_value, fields[i], sqlcombs[i], argt, argb);
-
-      const text_t DISTINCT_SELECT_WHERE
-    = "SELECT DISTINCT docOID FROM document_metadata WHERE ";
+      text_t this_value;
+      const text_t STARTINGWITH_CONDITION = "STARTINGWITH";
+      const text_t LIKE_CONDITION = "LIKE";
+      
+      //Change the STARTINGWITH operator to 'LIKE' and then adds '%' to the end of the value field
+      //in order to search a field starting with certain words.
+      if (sqlcombs[i] == STARTINGWITH_CONDITION)
+          {this_value = values[i];
+          this_value += "%";
+          // remove operators for simple search, segments text if necessary
+          format_querystring(this_value, argb, segment); 
+          // add tag info for this field (and other processing)
+          format_field_info_sql(this_value, fields[i], LIKE_CONDITION, argt, argb);}
+
+      else 
+          {this_value = values[i];
+          // remove operators for simple search, segments text if necessary
+          format_querystring(this_value, argb, segment); 
+          // add tag info for this field (and other processing)
+          format_field_info_sql(this_value, fields[i], sqlcombs[i], argt, argb);}
+
+      
+      const text_t DISTINCT_SELECT_WHERE = "SELECT DISTINCT docOID FROM document_metadata WHERE ";
 
       if (querystring.empty()) {
@@ -808 +821 @@
     else if (combs[i-1]=="not") { combine = "NOT"; }
       }
-      text_t this_value = values[i];
-
-      // remove operators for simple search, segments text if necessary
-      format_querystring(this_value, argb, segment); 
-
-      // add tag info for this field (and other processing)
-      format_field_info_sql(this_value, fields[i], sqlcombs[i], argt, argb);
-
-      // add into query string
-
-      const text_t DISTINCT_SELECT_WHERE
-    = "SELECT DISTINCT docOID FROM document_metadata WHERE ";
+      text_t this_value;
+      const text_t STARTINGWITH_CONDITION = "STARTINGWITH";
+      const text_t LIKE_CONDITION = "LIKE";
+      
+      //Change the STARTINGWITH operator to 'LIKE' and then adds '%' to the end of the value field
+      //in order to search a field starting with certain words.
+      if (sqlcombs[i] == STARTINGWITH_CONDITION)
+          {this_value = values[i];
+          this_value += "%";
+          // remove operators for simple search, segments text if necessary
+          format_querystring(this_value, argb, segment); 
+          // add tag info for this field (and other processing)
+          format_field_info_sql(this_value, fields[i], LIKE_CONDITION, argt, argb);}
+
+      else 
+          {this_value = values[i];
+          // remove operators for simple search, segments text if necessary
+          format_querystring(this_value, argb, segment); 
+          // add tag info for this field (and other processing)
+          format_field_info_sql(this_value, fields[i], sqlcombs[i], argt, argb);}
+      
+      const text_t DISTINCT_SELECT_WHERE = "SELECT DISTINCT docOID FROM document_metadata WHERE ";
 
       if (querystring.empty()) {
@@ -980 +1003 @@
   element_in += tags_in + ") AND (";
 
+  
   if (sqlcomb == "=") {
     // override what it means to do equality, to make it more like full text
@@ -1025 +1049 @@
 
     element_in += orterms;
+  }
+  //We cast the value from STRING to REAL to allow numeric sorting
+  else if (sqlcomb == "<num") {
+    element_in += "CAST(value as REAL) < CAST('" + querystring+"' AS REAL)";
+  }
+  else if (sqlcomb == ">num") {
+    element_in += "CAST(value as REAL) > CAST('" + querystring+"' AS REAL)";
+  }
+   else if (sqlcomb == "<=num") {
+    element_in += "CAST(value as REAL) <= CAST('" + querystring+"' AS REAL)";
+  }
+  else if (sqlcomb == ">=num") {
+    element_in += "CAST(value as REAL) >= CAST('" + querystring+"' AS REAL)";
+  }
+  else if (sqlcomb == "=num") {
+    element_in += "CAST(value as REAL) = CAST('" + querystring+"' AS REAL)";
   }
   else {