Changeset 2212 for trunk/gsdl/src/w32server/cgiwrapper.cpp

Timestamp:

2001-03-20T21:48:12+12:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a bug that was causing the local library server to attempt to write
files to gsdlhome (i.e. the cd-rom drive if served from a cd) under certain
circumstances.

File:

• trunk/gsdl/src/w32server/cgiwrapper.cpp (modified) (9 diffs)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -228 +228 @@
 }
 
-static void page_errorparseargs (const text_t &gsdlhome) {
+static void page_errorparseargs (const text_t &/*gsdlhome*/) {
 
   text_t message = "Error\n\n"
@@ -238 +238 @@
 }
 
-static void page_errorcgipage (const text_t &gsdlhome) {
+static void page_errorcgipage (const text_t &/*gsdlhome*/) {
 
   text_t message = "Error\n\n"
@@ -351 +351 @@
   // required to create a collection specific receptionist
   text_t collection = "";
-  text_tset gsdlhomes;
+  text_tset gdbmhomes;
   text_tset collections;
 
@@ -371 +371 @@
     // collection specific receptionist - one collection, one gsdlhome
     collections.insert (collection);
-    gsdlhomes.insert (gsdl_gsdlhome);
+    gdbmhomes.insert (gsdl_gdbmhome);
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
@@ -387 +387 @@
     colinfo_tmap::const_iterator end_info = gsdl_collectinfo.end();
     while (this_info != end_info) {
-      if (gsdlhomes.find ((*this_info).second.gsdl_gsdlhome) == gsdlhomes.end()) {
+      if (gdbmhomes.find ((*this_info).second.gsdl_gdbmhome) == gdbmhomes.end()) {
     these_collections.erase (these_collections.begin(), these_collections.end());
     read_dir (filename_cat ((*this_info).second.gsdl_gsdlhome, "collect"), these_collections);
@@ -411 +411 @@
       colhere ++;
     }
-    gsdlhomes.insert ((*this_info).second.gsdl_gsdlhome);
+    gdbmhomes.insert ((*this_info).second.gsdl_gdbmhome);
       }
       this_info ++;
     }
   
-    // then if necessary the main gsdlhome (this should only happen if the 
-    // gsdl.ini is a little screwed up and no volume gsdlhomes occurred
-    if (gsdlhomes.find (gsdl_gsdlhome) == gsdlhomes.end()) {
+    // 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()) {
       these_collections.erase (these_collections.begin(), these_collections.end());
-      read_dir (filename_cat (gsdl_gsdlhome, "collect"), these_collections);
+      read_dir (filename_cat (gsdl_gdbmhome, "collect"), these_collections);
       colhere = these_collections.begin();
       colend = these_collections.end();
@@ -431 +431 @@
     colhere ++;
       }
-      gsdlhomes.insert (gsdl_gsdlhome);
+      gdbmhomes.insert (gsdl_gdbmhome);
     }
   }
@@ -525 +525 @@
   // set defaults
   recpt.configure ("gsdlhome", gsdl_gsdlhome);
+  recpt.configure ("gdbmhome", gsdl_gdbmhome);
   recpt.configure ("collection", collection);
 
@@ -543 +544 @@
   }
 
-  // read in config files of each gsdlhome (in no particular order)
+  // read in config files of each gdbmhome (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 = gsdlhomes.begin();
-  text_tset::const_iterator ehome = gsdlhomes.end();
+  text_tset::const_iterator thome = gdbmhomes.begin();
+  text_tset::const_iterator ehome = gdbmhomes.end();
   while (thome != ehome) {
     if (!main_cfg_read (recpt, *thome, collection)) {