Changeset 16310 for gsdl/trunk/src/colservr/source.cpp

Timestamp:

2008-07-09T13:12:15+12:00 (16 years ago)

Author:

davidb

Message:

Introduction of 'collecthome' which parallels 'gsdlhome' to allow the toplevel collect folder to be outside of the gsdlhome area

File:

• gsdl/trunk/src/colservr/source.cpp (modified) (5 diffs)

gsdl/trunk/src/colservr/source.cpp

@@ -52 +52 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "collecthome") collecthome = value;
     else if (key == "gdbmhome") dbhome = value;
   }
@@ -77 +78 @@
 }
 
+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);
+  }
+
+  resolved_filename += file_ext;
+
+  return resolved_filename;
+}
+
+
+
 // init should be called after all the configuration is done but
 // before any other methods are called
@@ -83 +119 @@
   outconvertclass text_t2ascii;
   
+  if (collecthome.empty()) collecthome = filename_cat(gsdlhome,"collect");
   if (dbhome.empty()) dbhome = gsdlhome;
 
@@ -114 +151 @@
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
+    collectdir = filename_cat (collecthome, collection);
   }
 
@@ -128 +165 @@
     indexstem = collection;
   }
-  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  db_filename += db_ptr->getfileextension();
+  db_filename = resolve_db_filename(indexstem, db_ptr->getfileextension());
   if (!file_exists(db_filename)) {
     logout << text_t2ascii