Changeset 16310 for gsdl/trunk/src/colservr/filter.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/filter.cpp (modified) (4 diffs)

gsdl/trunk/src/colservr/filter.cpp

@@ -27 +27 @@
 #include "fileutil.h"
 #include <assert.h>
+
+#include <iostream>
+using namespace std;
 
 
@@ -46 +49 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "collecthome") collecthome = value;
     else if (key == "gdbmhome") dbhome = value;
     else if ((key == "filteroptdefault") && (cfgline.size() == 2)) {
@@ -56 +60 @@
   }
 }
+
+text_t filterclass::resolve_db_filename(const text_t& idx,
+                    const text_t& file_ext)
+{
+  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
@@ -70 +97 @@
   }
 
+  if (collecthome.empty()) collecthome = filename_cat(gsdlhome,"collect");
   if (dbhome.empty()) dbhome = gsdlhome;
   
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gsdlhome, "collect", collection);
+    collectdir = filename_cat (collecthome, collection);
   }