Changeset 31388 for main/trunk/greenstone2/runtime-src/src/colservr/queryfilter.cpp

Timestamp:

2017-02-08T19:08:39+13:00 (7 years ago)

Author:

ak19

Message:

Second commit to do with implementing OAI deletion policy for GS2. This commit is only loosely related, as it shifts functions duplicated in source.h and filter.h (and cpp files) into the new colserver.h and cpp files for sharing.

File:

• main/trunk/greenstone2/runtime-src/src/colservr/queryfilter.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
 
 #include "queryfilter.h"
+#include "colservertools.h"
 #include "fileutil.h"
 
@@ -253 +254 @@
     indexstem = collection;
   }
-  db_filename = resolve_db_filename(indexstem,db_ptr->getfileextension());
+  db_filename = resolve_db_filename(gsdlhome, dbhome, collecthome, collection,
+                    indexstem,db_ptr->getfileextension());
   if (!file_exists(db_filename)) {
     logout << text_t2ascii