Changeset 15589

Timestamp:

2008-05-20T11:40:38+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Replacing almost all "gdbmhome" with "dbhome".

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/action.cpp

@@ -44 +44 @@
   if (key == "gsdlhome") {
     gsdlhome = cfgline[0];
-    if (gdbmhome.empty()) gdbmhome = cfgline[0];
+    if (dbhome.empty()) dbhome = cfgline[0];
   }
-  if (key == "gdbmhome") {gdbmhome = cfgline[0];}
+  if (key == "gdbmhome") {dbhome = cfgline[0];}
 }
 

gsdl/trunk/src/recpt/action.h

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

gsdl/trunk/src/recpt/authenaction.cpp

@@ -131 +131 @@
 
 bool authenaction::init (ostream &logout) {
-  if (gdbmhome.empty()) {
-    logout << "ERROR (authenaction::init) gdbmhome is not set\n";
+  if (dbhome.empty()) {
+    logout << "ERROR (authenaction::init) dbhome is not set\n";
     return false;
   }

gsdl/trunk/src/recpt/cgiwrapper.cpp

@@ -312 +312 @@
   
   cout << text_t2ascii << "gsdlhome=" << configinfo.gsdlhome << "\n";
-  if (!configinfo.gdbmhome.empty())
-    cout << text_t2ascii << "gdbmhome=" << configinfo.gdbmhome << "\n";
+  if (!configinfo.dbhome.empty())
+    cout << text_t2ascii << "dbhome=" << configinfo.dbhome << "\n";
   cout << text_t2ascii << "httpprefix=" << configinfo.httpprefix << "\n";
   cout << text_t2ascii << "httpimg=" << configinfo.httpimg << "\n";

gsdl/trunk/src/recpt/queryaction.cpp

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

gsdl/trunk/src/recpt/receptionist.cpp

@@ -52 +52 @@
 void recptconf::clear () {
   gsdlhome.clear();
-  gdbmhome.clear();
+  dbhome.clear();
   collectinfo.erase(collectinfo.begin(), collectinfo.end());
   collection.clear();
@@ -93 +93 @@
 void collectioninfo_t::clear () {
   gsdl_gsdlhome.clear();
-  gsdl_gdbmhome.clear();
+  gsdl_dbhome.clear();
 
   info_loaded = false;
@@ -220 +220 @@
     if (key == "gsdlhome") {
       configinfo.gsdlhome = cfgline[0];
-      if (configinfo.gdbmhome.empty()) configinfo.gdbmhome = cfgline[0];
-    }
-    else if (key == "gdbmhome") configinfo.gdbmhome = cfgline[0];
+      if (configinfo.dbhome.empty()) configinfo.dbhome = cfgline[0];
+    }
+    else if (key == "gdbmhome") configinfo.dbhome = cfgline[0];
     else if (key == "collection") {
       configinfo.collection = cfgline[0];
@@ -272 +272 @@
     collectioninfo_t cinfo;
     cinfo.gsdl_gsdlhome = cfgline[1];
-    cinfo.gsdl_gdbmhome = cfgline[2];
+    cinfo.gsdl_dbhome = cfgline[2];
     configinfo.collectinfo[cfgline[0]] = cinfo;
       }
@@ -705 +705 @@
   }
 
-  text_t logfile = filename_cat (configinfo.gdbmhome, "etc", "usage.txt");
+  text_t logfile = filename_cat (configinfo.dbhome, "etc", "usage.txt");
 
   text_t logstr = script_name;

gsdl/trunk/src/recpt/receptionist.h

@@ -55 +55 @@
 
   text_t gsdl_gsdlhome;
-  text_t gsdl_gdbmhome;
+  text_t gsdl_dbhome;
 
   bool info_loaded;
@@ -77 +77 @@
 struct recptconf {
    text_t gsdlhome;
-   text_t gdbmhome;   // will equal gsdlhome if not set
+   text_t dbhome;   // will equal gsdlhome if not set
    text_t collection; // will equal "" in 'general' mode
    text_t collectdir; // will equal gsdlhome in 'general' mode

gsdl/trunk/src/recpt/statusaction.cpp

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

gsdl/trunk/src/recpt/usersaction.cpp

@@ -152 +152 @@
 bool usersaction::init (ostream &logout) {
 
-  if (gdbmhome.empty()) {
-    logout << "ERROR (usersaction::init) gdbmhome is not set\n";
+  if (dbhome.empty()) {
+    logout << "ERROR (usersaction::init) dbhome is not set\n";
     return false;
   }