Changeset 22948 for main/trunk/greenstone2/runtime-src/src/w32server

Timestamp:

2010-09-23T15:55:32+12:00 (14 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.

File:

• main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp (modified) (3 diffs)

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();