Changeset 31387 for main/trunk/greenstone2/runtime-src/src/colservr/filter.cpp

Timestamp:

2017-02-08T18:31:18+13:00 (7 years ago)

Author:

ak19

Message:

Round 1 of commits for getting OAI deletion policy to work with GS2 (server end). The perl code writing out the OAI db and the GS3 server code implementing the deletion policy had already been completed earlier (end 2016).

File:

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

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

@@ -61 +61 @@
 }
 
+text_t filterclass::getcollectionpath()
+{
+  text_t resolved_filename;
+  
+  if (gsdlhome==dbhome) {
+    // dbhome has defaulted to gsdlhome which we take to means the 
+    // database has been specifically moved out of gsdlhome area.
+    // => it should be whereever collecthome is set to
+    resolved_filename = filename_cat(collecthome, collection);
+  }
+  else {
+    // dbhome is explicitly set to something other than gsdlhome
+    // => use dbhome
+    resolved_filename = filename_cat(dbhome, "collect", collection);
+  }
+
+  return resolved_filename;
+}
+
 text_t filterclass::resolve_db_filename(const text_t& idx,
                     const text_t& file_ext)
 {
+  /*
   text_t resolved_filename;
 
@@ -77 +97 @@
     resolved_filename = filename_cat(dbhome, "collect", collection, "index", "text", idx);
   }
+  */
+  
+  text_t resolved_filename = filename_cat(getcollectionpath(), "index", "text", idx);
+  resolved_filename += file_ext;
+
+  return resolved_filename;
+}
+
+text_t filterclass::resolve_oaidb_filename(const text_t& file_ext)
+{
+  text_t resolved_filename = filename_cat(getcollectionpath(), "etc", "oai-inf");
 
   resolved_filename += file_ext;