Changeset 23492 for main

Timestamp:

2010-12-16T00:14:16+13:00 (13 years ago)

Author:

davidb

Message:

Additionoal check added before printing out warning about a filter not being available/recognized.

File:

• main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

@@ -452 +452 @@
     response.clear ();
     err = protocolError;
-    logout << text_t2ascii << "Protocol Error: filter options requested for non-existent\n"
-       << "filter \"" << request.filterName << "\".\n\n";
+    text_t& infodbtype = collectinfo.infodbType;
+
+    // Don't print out the warning if were's asking about SQLQueryFilter 
+    // when we know the infodbtype is something other than .*sql.*
+
+    if ((request.filterName != "SQLQueryFilter") 
+    || (findword(infodbtype.begin(),infodbtype.end(),"sql") != infodbtype.end())) {
+      logout << text_t2ascii << "Protocol Error: filter options requested for non-existent\n"
+         << "filter \"" << request.filterName << "\".\n\n";
+    }
   }
 }