Changeset 15625 for gsdl/trunk/src/w32server

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".

Location:

gsdl/trunk/src/w32server

Files:

• cgiwrapper.cpp (modified) (8 diffs)
• settings.cpp (modified) (6 diffs)
• settings.h (modified) (1 diff)

gsdl/trunk/src/w32server/cgiwrapper.cpp

@@ -380 +380 @@
   // required to create a collection specific receptionist
   text_t collection = "";
-  text_tset gdbmhomes;
+  text_tset dbhomes;
   text_tset collections;
 
@@ -404 +404 @@
     // collection specific receptionist - one collection, one gsdlhome
     collections.insert (collection);
-    gdbmhomes.insert (gsdl_gdbmhome);
+    dbhomes.insert (gsdl_dbhome);
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
-    tmp.gsdl_gdbmhome = gsdl_gdbmhome;
+    tmp.gsdl_dbhome = gsdl_dbhome;
     translated_collectinfo[collection] = tmp;
 
@@ -420 +420 @@
     colinfo_tmap::const_iterator end_info = gsdl_collectinfo.end();
     while (this_info != end_info) {
-      if (gdbmhomes.find ((*this_info).second.gsdl_gdbmhome) == gdbmhomes.end()) {
+      if (dbhomes.find ((*this_info).second.gsdl_dbhome) == dbhomes.end()) {
     these_collections.erase (these_collections.begin(), these_collections.end());
     read_dir (filename_cat ((*this_info).second.gsdl_gsdlhome, "collect"), these_collections);
@@ -444 +444 @@
       ++colhere;
     }
-    gdbmhomes.insert ((*this_info).second.gsdl_gdbmhome);
+    dbhomes.insert ((*this_info).second.gsdl_dbhome);
       }
       ++this_info;
     }
   
-    // then if necessary the main gdbmhome (this should only happen if the 
-    // gsdl.ini is a little screwed up and no volume gdbmhomes occurred)
-    if (gdbmhomes.find (gsdl_gdbmhome) == gdbmhomes.end()) {
+    // then if necessary the main dbhome (this should only happen if the 
+    // gsdl.ini is a little screwed up and no volume dbhomes occurred)
+    if (dbhomes.find (gsdl_dbhome) == dbhomes.end()) {
       these_collections.erase (these_collections.begin(), these_collections.end());
-      read_dir (filename_cat (gsdl_gdbmhome, "collect"), these_collections);
+      read_dir (filename_cat (gsdl_dbhome, "collect"), these_collections);
       colhere = these_collections.begin();
       colend = these_collections.end();
@@ -460 +460 @@
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
-    tmp.gsdl_gdbmhome = gsdl_gdbmhome;
+    tmp.gsdl_dbhome = gsdl_dbhome;
     translated_collectinfo[*colhere] = tmp;
     ++colhere;
       }
-      gdbmhomes.insert (gsdl_gdbmhome);
+      dbhomes.insert (gsdl_dbhome);
     }
   }
@@ -481 +481 @@
     // create collection server and add to null protocol
     text_t this_gsdlhome = gsdl_gsdlhome;
-    text_t this_gdbmhome = gsdl_gdbmhome;
+    text_t this_dbhome = gsdl_dbhome;
     colinfo_tmap::const_iterator it = translated_collectinfo.find (*thiscol);
     assert (it != translated_collectinfo.end());
     this_gsdlhome = (*it).second.gsdl_gsdlhome;
-    this_gdbmhome = (*it).second.gsdl_gdbmhome;
+    this_dbhome = (*it).second.gsdl_dbhome;
 
     cservers->add_collection (*thiscol, this_gsdlhome);
@@ -615 +615 @@
   // set defaults
   recpt.configure ("gsdlhome", gsdl_gsdlhome);
-  recpt.configure ("gdbmhome", gsdl_gdbmhome);
+  recpt.configure ("gdbmhome", gsdl_dbhome);
   recpt.configure ("collection", collection);
 
@@ -629 +629 @@
     tmpconf.push_back ((*this_info).first);
     tmpconf.push_back ((*this_info).second.gsdl_gsdlhome);
-    tmpconf.push_back ((*this_info).second.gsdl_gdbmhome);
+    tmpconf.push_back ((*this_info).second.gsdl_dbhome);
     recpt.configure ("collectinfo", tmpconf);
     ++this_info;
   }
 
-  // read in config files of each gdbmhome (in no particular order)
+  // read in config files of each dbhome (in no particular order)
   // those read in last will override those read earlier
   // collections being used together in this way should be 
   // careful not to have main.cfg files that might 
   // screw with each other.
-  text_tset::const_iterator thome = gdbmhomes.begin();
-  text_tset::const_iterator ehome = gdbmhomes.end();
+  text_tset::const_iterator thome = dbhomes.begin();
+  text_tset::const_iterator ehome = dbhomes.end();
   while (thome != ehome) {
     if (!main_cfg_read (recpt, *thome, collection)) {

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;
   }

gsdl/trunk/src/w32server/settings.h

@@ -48 +48 @@
 extern text_t gsdl_enterlib;
 extern text_t gsdl_gsdlhome;
-extern text_t gsdl_gdbmhome;
+extern text_t gsdl_dbhome;
 extern text_t gsdl_collections;
 extern colinfo_tmap gsdl_collectinfo;