Changeset 31388 for main/trunk/greenstone2/runtime-src/src/colservr/source.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/source.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 
 #include "source.h"
+#include "colservertools.h"
 #include "fileutil.h"
 #include "OIDtools.h"
@@ -88 +89 @@
 }
 
-text_t sourceclass::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 sourceclass::resolve_db_filename(const text_t& idx,
-                    const text_t& file_ext)
-{
-  // This is an exact copy of the method (of the same name) in filterclass
-  // Makes sense to merge them, in which either gsdlhome, collecthome,
-  // dbhome, and collection need to also be passed in as parameters,
-  // or else there is some notion of a shared base class that both
-  // filter and source inherit from
-
-  // NB: there is an even greater opportunity to share more code in this
-  // function if sql_db_ptr/db_ptr and db_filename and sql_db_filename
-  // are also drawn from one object
-
-  /*
-  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, "index", "text", idx);
-  }
-  else {
-    // dbhome is explicitly set to something other than gsdlhome
-    // => use dbhome
-    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 sourceclass::resolve_oaidb_filename(const text_t& file_ext)
-{
-  text_t resolved_filename = filename_cat(getcollectionpath(), "etc", "oai-inf");
-
-  resolved_filename += file_ext;
-
-  return resolved_filename;
-}
 
 // init should be called after all the configuration is done but
@@ -204 +142 @@
     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
@@ -211 +150 @@
   }
   
-  oaidb_filename = resolve_oaidb_filename(oaidb_ptr->getfileextension());
+  oaidb_filename = resolve_oaidb_filename(gsdlhome, dbhome, collecthome, collection,
+                      oaidb_ptr->getfileextension());
 
   return true;