Changeset 2212

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.

Location:

trunk/gsdl/src

Files:

• colservr/browsefilter.cpp (modified) (1 diff)
• colservr/filter.cpp (modified) (2 diffs)
• colservr/filter.h (modified) (1 diff)
• colservr/mggdbmsource.cpp (modified) (1 diff)
• colservr/queryfilter.cpp (modified) (1 diff)
• recpt/action.cpp (modified) (1 diff)
• recpt/action.h (modified) (1 diff)
• recpt/authenaction.cpp (modified) (2 diffs)
• recpt/nullproto.cpp (modified) (1 diff)
• recpt/queryaction.cpp (modified) (2 diffs)
• recpt/receptionist.cpp (modified) (2 diffs)
• recpt/statusaction.cpp (modified) (1 diff)
• recpt/usersaction.cpp (modified) (1 diff)
• recpt/usersaction.h (modified) (1 diff)
• w32server/cgiwrapper.cpp (modified) (9 diffs)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -70 +70 @@
 
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(collectdir,"index","text",collection);
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
 
   if (littleEndian()) gdbm_filename += ".ldb";

trunk/gsdl/src/colservr/filter.cpp

@@ -46 +46 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
+    else if (key == "gdbmhome") gdbmhome = value;
     else if ((key == "filteroptdefault") && (cfgline.size() == 2)) {
       // see if this filter has an option with this name
@@ -69 +70 @@
   }
 
+  if (gdbmhome.empty()) gdbmhome = gsdlhome;
+  
   // get the collection directory name
   if (collectdir.empty()) {

trunk/gsdl/src/colservr/filter.h

@@ -36 +36 @@
 protected:
   text_t gsdlhome;
+  text_t gdbmhome;
   text_t collection;
   text_t collectdir;

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -78 +78 @@
   // get the collection directory name
   if (collectdir.empty()) {
-    collectdir = filename_cat (gdbmhome, "collect", collection);
+    collectdir = filename_cat (gsdlhome, "collect", collection);
   }
   
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(collectdir,"index","text",collection);
-
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
   if (littleEndian()) gdbm_filename += ".ldb";
   else gdbm_filename += ".bdb";

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -339 +339 @@
 
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(collectdir,"index","text",collection);
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
 
   if (littleEndian()) gdbm_filename += ".ldb";

trunk/gsdl/src/recpt/action.cpp

@@ -42 +42 @@
 // configure should be called once for each configuration line
 void action::configure (const text_t &key, const text_tarray &cfgline) {
-  if (key == "gsdlhome") {gsdlhome = cfgline[0];}
+  if (key == "gsdlhome") {
+    gsdlhome = cfgline[0];
+    if (gdbmhome.empty()) gdbmhome = cfgline[0];
+  }
+  if (key == "gdbmhome") {gdbmhome = cfgline[0];}
 }
 

trunk/gsdl/src/recpt/action.h

@@ -48 +48 @@
   cgiargsinfoclass argsinfo;
   text_t gsdlhome;
+  text_t gdbmhome;
 
 public:

trunk/gsdl/src/recpt/authenaction.cpp

@@ -131 +131 @@
     else if (key == "keyfile") keyfile = cfgline[0];
     else if (key == "keydecay") keydecay = cfgline[0].getint();
-    else if (key == "gsdlhome") {
-      if (usersfile.empty())
-    usersfile = filename_cat (cfgline[0], "etc", "users.db");
-      if (keyfile.empty())
-    keyfile = filename_cat (cfgline[0], "etc", "key.db");
-    }
   }
 
@@ -143 +137 @@
 
 bool authenaction::init (ostream &logout) {
+
+  if (gdbmhome.empty()) {
+    logout << "ERROR (authenaction::init) gdbmhome is not set\n";
+    return false;
+  }
+
+  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
+  if (keyfile.empty()) keyfile = filename_cat (gdbmhome, "etc", "key.db");
+
   return action::init (logout);
 }

trunk/gsdl/src/recpt/nullproto.cpp

@@ -72 +72 @@
   // the protocol should not configure the collection set; it should be
   // done direct to the collection server set
-  if (key == "gsdlhome") {
+  if (key == "gsdlhome" || key == "gdbmhome") {
     cset->configure(key, cfgline);
   }

trunk/gsdl/src/recpt/queryaction.cpp

@@ -735 +735 @@
     text_t userid = args["z"];
     text_tarray entries;
-    if (get_history_info (userid, entries, gsdlhome, logout)) {
+    if (get_history_info (userid, entries, gdbmhome, logout)) {
       int count = 1;
       text_tarray::iterator here = entries.begin();
@@ -1397 +1397 @@
   int hd = args.getintarg("hd");
   if (hd > 0) display=true;
-  if (set_history_info(userid, query, gsdlhome, display)) return true;
+  if (set_history_info(userid, query, gdbmhome, display)) return true;
   else return false;
 

trunk/gsdl/src/recpt/receptionist.cpp

@@ -206 +206 @@
     cgiarginfo *info = NULL;
     if (key == "gsdlhome") configinfo.gsdlhome = cfgline[0];
+    else if (key == "gdbmhome") configinfo.gdbmhome = cfgline[0];
     else if (key == "collection") {
       configinfo.collection = cfgline[0];
@@ -660 +661 @@
   }
 
-  text_t logfile = filename_cat (configinfo.gsdlhome, "etc");
-  logfile = filename_cat (logfile, "usage.txt");
+  text_t logfile = filename_cat (configinfo.gdbmhome, "etc", "usage.txt");
 
   text_t logstr = script_name;

trunk/gsdl/src/recpt/statusaction.cpp

@@ -906 +906 @@
                    ostream &textout, ostream &/*logout*/) {
 
-  text_t maincfgfile = filename_cat (gsdlhome, "etc", "main.cfg");
+  text_t maincfgfile = filename_cat (gdbmhome, "etc", "main.cfg");
 
   textout << outconvert << disp << "_status:infoheader_(main.cfg)\n"

trunk/gsdl/src/recpt/usersaction.cpp

@@ -148 +148 @@
   if (cfgline.size() == 1) {
     if (key == "usersfile") usersfile = cfgline[0];
-    else if (key == "gsdlhome") {
-      if (usersfile.empty())
-    usersfile = filename_cat (cfgline[0], "etc", "users.db");
-    }
   }
 
   action::configure (key, cfgline);
+}
+
+bool usersaction::init (ostream &logout) {
+
+  if (gdbmhome.empty()) {
+    logout << "ERROR (usersaction::init) gdbmhome is not set\n";
+    return false;
+  }
+
+  if (usersfile.empty()) usersfile = filename_cat (gdbmhome, "etc", "users.db");
+
+  return action::init (logout);
 }
 

trunk/gsdl/src/recpt/usersaction.h

@@ -42 +42 @@
 
   void configure (const text_t &key, const text_tarray &cfgline);
+
+  bool init (ostream &logout);
   
   text_t get_action_name () {return "um";}

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)) {