Changeset 15587

Timestamp:

2008-05-20T11:24:59+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Changed a lot of "gdbmhome" to "dbhome".

Location:

gsdl/trunk/src/colservr

Files:

• browsefilter.cpp (modified) (1 diff)
• collectserver.cpp (modified) (1 diff)
• collectserver.h (modified) (1 diff)
• filter.cpp (modified) (2 diffs)
• filter.h (modified) (1 diff)
• gdbmsource.cpp (modified) (3 diffs)
• gdbmsource.h (modified) (1 diff)
• queryfilter.cpp (modified) (1 diff)

gsdl/trunk/src/colservr/browsefilter.cpp

@@ -80 +80 @@
   }
   // get the filename for the database and make sure it exists
-  db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
+  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
 
   if (littleEndian()) db_filename += ".ldb";

gsdl/trunk/src/colservr/collectserver.cpp

@@ -84 +84 @@
     }
     else if (key == "gsdlhome") configinfo.gsdlhome = value;
-    else if (key == "gdbmhome") configinfo.gdbmhome = value;
+    else if (key == "gdbmhome") configinfo.dbhome = value;
     else if (key == "collection") {
       configinfo.collection = value;

gsdl/trunk/src/colservr/collectserver.h

@@ -59 +59 @@
 struct colservrconf {
   text_t gsdlhome;
-  text_t gdbmhome;
+  text_t dbhome;
   text_t collection;
   text_t collectdir;

gsdl/trunk/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 == "gdbmhome") dbhome = value;
     else if ((key == "filteroptdefault") && (cfgline.size() == 2)) {
       // see if this filter has an option with this name
@@ -70 +70 @@
   }
 
-  if (gdbmhome.empty()) gdbmhome = gsdlhome;
+  if (dbhome.empty()) dbhome = gsdlhome;
   
   // get the collection directory name

gsdl/trunk/src/colservr/filter.h

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

gsdl/trunk/src/colservr/gdbmsource.cpp

@@ -48 +48 @@
     else if (key == "collectdir") collectdir = value;
     else if (key == "gsdlhome") gsdlhome = value;
-    else if (key == "gdbmhome") gdbmhome = value;
+    else if (key == "gdbmhome") dbhome = value;
   }
 
@@ -77 +77 @@
   outconvertclass text_t2ascii;
   
-  if (gdbmhome.empty()) gdbmhome = gsdlhome;
+  if (dbhome.empty()) dbhome = gsdlhome;
 
   if (!sourceclass::init (logout)) return false;
@@ -117 +117 @@
     indexstem = collection;
   }
-  db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
+  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
   if (littleEndian()) db_filename += ".ldb";
   else db_filename += ".bdb";

gsdl/trunk/src/colservr/gdbmsource.h

@@ -40 +40 @@
 protected:
   text_t gsdlhome;
-  text_t gdbmhome;
+  text_t dbhome;
   text_t collection;
   text_t collectdir;

gsdl/trunk/src/colservr/queryfilter.cpp

@@ -409 +409 @@
     indexstem = collection;
   }
-  db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
+  db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
 
   if (littleEndian()) db_filename += ".ldb";