Changeset 16310 for gsdl/trunk/src/w32server/settings.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/w32server/settings.cpp (modified) (8 diffs)

gsdl/trunk/src/w32server/settings.cpp

@@ -47 +47 @@
 text_t gsdl_enterlib;
 text_t gsdl_gsdlhome;
+text_t gsdl_collecthome;
 text_t gsdl_dbhome;
 text_t gsdl_collections;
@@ -300 +301 @@
     write_ini_line(fout, "enterlib", gsdl_enterlib);
     write_ini_line(fout, "gsdlhome", gsdl_gsdlhome);
+    write_ini_line(fout, "collecthome", gsdl_collecthome);
     write_ini_line(fout, "gdbmhome", gsdl_dbhome);
     
@@ -321 +323 @@
       if (!(*here).second.gsdl_gsdlhome.empty()) 
     write_ini_line(fout, "gsdlhome", (*here).second.gsdl_gsdlhome);
+      if (!(*here).second.gsdl_collecthome.empty()) 
+    write_ini_line(fout, "collecthome", (*here).second.gsdl_collecthome);
       if (!(*here).second.gsdl_dbhome.empty()) 
     write_ini_line(fout, "gdbmhome", (*here).second.gsdl_dbhome);
@@ -385 +389 @@
   gsdl_enterlib = "/gsdl";
   gsdl_gsdlhome = data_location;
+  gsdl_collecthome = filename_cat(data_location,"collect");
   gsdl_dbhome = data_location;
   
@@ -474 +479 @@
       } else if (key == "collections") {
         gsdl_collections = value;
-
+      } 
       // gsdlhome must occur in file before dbhome      
-      } else if (key == "gsdlhome") {
+      else if (key == "gsdlhome") {
         gsdl_gsdlhome = value;
-        gsdl_dbhome = value;
-      
-      } else if (key == "gdbmhome") {
+        gsdl_collecthome = filename_cat(value,"collect");
+        gsdl_dbhome = value;      
+      } 
+      else if (key == "collecthome") {
+        gsdl_collecthome = value;
+      } 
+      else if (key == "gdbmhome") {
         gsdl_dbhome = value;
       }
@@ -488 +497 @@
       if (key == "gsdlhome") {
         gsdl_collectinfo[section].gsdl_gsdlhome = value;
+        gsdl_collectinfo[section].gsdl_collecthome = filename_cat(value,"collecct");
         gsdl_collectinfo[section].gsdl_dbhome = value;
-      } else if (key == "gdbmhome") {
+      } 
+      else if (key == "collecthome") {
+        gsdl_collectinfo[section].gsdl_collecthome = value;
+      }
+      else if (key == "gdbmhome") {
         gsdl_collectinfo[section].gsdl_dbhome = value;
       }
@@ -502 +516 @@
   // extra slashes at the end
   remove_end_slashes (gsdl_gsdlhome);
+  remove_end_slashes (gsdl_collecthome);
   remove_end_slashes (gsdl_dbhome);
   colinfo_tmap::iterator here = gsdl_collectinfo.begin();
@@ -507 +522 @@
   while (here != end) {
     remove_end_slashes ((*here).second.gsdl_gsdlhome);
+    remove_end_slashes ((*here).second.gsdl_collecthome);
     remove_end_slashes ((*here).second.gsdl_dbhome);
     ++here;