Changeset 2212 for trunk/gsdl/src/recpt

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/recpt

Files:

• action.cpp (modified) (1 diff)
• action.h (modified) (1 diff)
• authenaction.cpp (modified) (2 diffs)
• nullproto.cpp (modified) (1 diff)
• queryaction.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (2 diffs)
• statusaction.cpp (modified) (1 diff)
• usersaction.cpp (modified) (1 diff)
• usersaction.h (modified) (1 diff)

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