Changeset 22948

Timestamp:

2010-09-23T15:55:32+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed more bugs tangentially related to the advanced searching combined with fielded searching bug that was previously crashing the library.cgi and server.exe. This time around, there were no crashes but the recent corrections to the combined searching needed to work with SQL queries as well. When testing this last, it was discovered that 1. the SQL form wasn't displaying in preferences even when sqlite was set as the infodbtype in collect.cfg and its format Searchtypes line set to include sqlform next to plain and form. This was fixed by making CGIWrapper remember to instantiate sqlqueryaction and not just queryaction. 2. the RunQuery button would eat commas on submission (previously choosing to turn them into non-descript spaces), this has now been fixed in the query.dm macro.

Location:

main/trunk/greenstone2

Files:

• macros/query.dm (modified) (4 diffs)
• runtime-src/src/w32server/cgiwrapper.cpp (modified) (3 diffs)

main/trunk/greenstone2/macros/query.dm

@@ -613 +613 @@
 
 
-// convert commas and spaces to plus
-// also convert other illegal characters to %xx codes
+// convert spaces to plus
+// also convert other illegal characters (including commas) to %xx codes
+// This routine used to treat commas like spaces (replacing them with a plus), 
+// but this is no longer good enough for handling sql-queries
 function format(string) \{
    var str = "" + string;
@@ -622 +624 @@
    for (j = 0; j < str.length; j++) \{
        ch=str.charAt(j);
-       if (ch == " "|| ch == ",") \{
+       if (ch == " ") \{
            if (flag == 0) \{     
           out += "+";
@@ -629 +631 @@
         continue;
     \}
-    if (ch == ";" || ch == ":" || ch == "/" || ch == "?" ||
+    if (ch == "," || ch == ";" || ch == ":" || ch == "/" || ch == "?" ||
             ch == "@" || ch == "&" || ch == "=" || ch == "#" ||
         ch == "%") \{
@@ -920 +922 @@
 <p>For example:<br>
 <i>
-  element in ('dc.Keywords') AND value='Farming'<br>
-  element in ('dls.Title') AND value LIKE 'F%'<br>
-  element in ('dls.Title') AND value<'F%'<br>
+  element in (\'dc.Keywords\') AND value=\'Farming\'<br>
+  element in (\'dls.Title\') AND value LIKE \'F%\'<br>
+  element in (\'dls.Title\') AND value<\'F%\'<br>
 </i>
 )

main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp

@@ -61 +61 @@
 #include "pingaction.h"
 #include "queryaction.h"
+#if defined(USE_SQLITE)
+#include "sqlqueryaction.h"
+#endif
+
 #include "documentaction.h"
 #include "dynamicclassifieraction.h"
@@ -346 +350 @@
 tipaction *atipaction = NULL;
 queryaction *aqueryaction = NULL;
+#if defined(USE_SQLITE)
+sqlqueryaction *asqlqueryaction = NULL;
+#endif
 documentaction *adocumentaction = NULL;
 dynamicclassifieraction *adynamicclassifieraction = NULL;
@@ -584 +591 @@
   }
   
+#if defined(USE_SQLITE)
+  if (asqlqueryaction == NULL) {
+    asqlqueryaction = new sqlqueryaction();
+    asqlqueryaction->set_receptionist (&recpt);
+    recpt.add_action (asqlqueryaction);
+  }
+#endif
+
   if (adocumentaction == NULL) {
     adocumentaction = new documentaction();