Changeset 15625 for gsdl/trunk/src/w32server/settings.cpp

Timestamp:

2008-05-22T11:26:01+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Replaced a bunch of "gdbmhome" with "dbhome".

File:

• gsdl/trunk/src/w32server/settings.cpp (modified) (6 diffs)

gsdl/trunk/src/w32server/settings.cpp

@@ -47 +47 @@
 text_t gsdl_enterlib;
 text_t gsdl_gsdlhome;
-text_t gsdl_gdbmhome;
+text_t gsdl_dbhome;
 text_t gsdl_collections;
 colinfo_tmap gsdl_collectinfo;
@@ -300 +300 @@
     write_ini_line(fout, "enterlib", gsdl_enterlib);
     write_ini_line(fout, "gsdlhome", gsdl_gsdlhome);
-    write_ini_line(fout, "gdbmhome", gsdl_gdbmhome);
+    write_ini_line(fout, "gdbmhome", gsdl_dbhome);
     
     write_ini_line(fout, "logfilename", gsdl_log_name);
@@ -321 +321 @@
       if (!(*here).second.gsdl_gsdlhome.empty()) 
     write_ini_line(fout, "gsdlhome", (*here).second.gsdl_gsdlhome);
-      if (!(*here).second.gsdl_gdbmhome.empty()) 
-    write_ini_line(fout, "gdbmhome", (*here).second.gsdl_gdbmhome);
+      if (!(*here).second.gsdl_dbhome.empty()) 
+    write_ini_line(fout, "gdbmhome", (*here).second.gsdl_dbhome);
       
       ++here;
@@ -385 +385 @@
   gsdl_enterlib = "/gsdl";
   gsdl_gsdlhome = data_location;
-  gsdl_gdbmhome = data_location;
+  gsdl_dbhome = data_location;
   
   // debug settings
@@ -475 +475 @@
         gsdl_collections = value;
 
-      // gsdlhome must occur in file before gdbmhome        
+      // gsdlhome must occur in file before dbhome      
       } else if (key == "gsdlhome") {
         gsdl_gsdlhome = value;
-        gsdl_gdbmhome = value;
+        gsdl_dbhome = value;
       
       } else if (key == "gdbmhome") {
-        gsdl_gdbmhome = value;
+        gsdl_dbhome = value;
       }
     } else {
       
-      // gsdlhome must occur in file before gdbmhome
+      // gsdlhome must occur in file before dbhome
       if (key == "gsdlhome") {
         gsdl_collectinfo[section].gsdl_gsdlhome = value;
-        gsdl_collectinfo[section].gsdl_gdbmhome = value;
+        gsdl_collectinfo[section].gsdl_dbhome = value;
       } else if (key == "gdbmhome") {
-        gsdl_collectinfo[section].gsdl_gdbmhome = value;
+        gsdl_collectinfo[section].gsdl_dbhome = value;
       }
     }
@@ -502 +502 @@
   // extra slashes at the end
   remove_end_slashes (gsdl_gsdlhome);
-  remove_end_slashes (gsdl_gdbmhome);
+  remove_end_slashes (gsdl_dbhome);
   colinfo_tmap::iterator here = gsdl_collectinfo.begin();
   colinfo_tmap::iterator end = gsdl_collectinfo.end();
   while (here != end) {
     remove_end_slashes ((*here).second.gsdl_gsdlhome);
-    remove_end_slashes ((*here).second.gsdl_gdbmhome);
+    remove_end_slashes ((*here).second.gsdl_dbhome);
     ++here;
   }