Changeset 15680 for gsdl/trunk/src/colservr

Timestamp:

2008-05-23T14:40:43+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Now uses the new dbclass::getfileextension() function to avoid having GDBM-specific filename extension code scattered around.

Location:

gsdl/trunk/src/colservr

Files:

• browsefilter.cpp (modified) (3 diffs)
• queryfilter.cpp (modified) (3 diffs)
• source.cpp (modified) (3 diffs)

gsdl/trunk/src/colservr/browsefilter.cpp

@@ -26 +26 @@
 #include "browsefilter.h"
 #include "fileutil.h"
-#include "gsdltools.h"
 
 
@@ -76 +75 @@
   if (!filterclass::init(logout)) return false;
 
+  if (db_ptr == NULL) {
+    // most likely a configuration problem
+    logout << text_t2ascii 
+       << "configuration error: browsefilter contains a null dbclass\n\n";
+    return false;
+  }
+
   if (indexstem.empty()) {
     indexstem = collection;
@@ -81 +87 @@
   // get the filename for the database and make sure it exists
   db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-
-  if (littleEndian()) db_filename += ".ldb";
-  else db_filename += ".bdb";
-
+  db_filename += db_ptr->getfileextension();
   if (!file_exists(db_filename)) {
     logout << text_t2ascii

gsdl/trunk/src/colservr/queryfilter.cpp

@@ -26 +26 @@
 #include "queryfilter.h"
 #include "fileutil.h"
-#include "gsdltools.h"
-#include <assert.h>
 
 
@@ -404 +402 @@
   }
 
+  if (db_ptr == NULL) {
+    // most likely a configuration problem
+    logout << text_t2ascii 
+       << "configuration error: queryfilter contains a null dbclass\n\n";
+    return false;
+  }
+
   // get the filename for the database and make sure it exists
   if (indexstem.empty()) {
@@ -409 +414 @@
   }
   db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-
-  if (littleEndian()) db_filename += ".ldb";
-  else db_filename += ".bdb";
-
+  db_filename += db_ptr->getfileextension();
   if (!file_exists(db_filename)) {
     logout << text_t2ascii

gsdl/trunk/src/colservr/source.cpp

@@ -27 +27 @@
 #include "fileutil.h"
 #include "OIDtools.h"
-#include "gsdltools.h"
 #include <assert.h>
 
@@ -117 +116 @@
     collectdir = filename_cat (gsdlhome, "collect", collection);
   }
-  
+
+  if (db_ptr == NULL) {
+    // most likely a configuration problem
+    logout << text_t2ascii 
+       << "configuration error: queryfilter contains a null dbclass\n\n";
+    return false;
+  }
+
   // get the filename for the database and make sure it exists
   if (indexstem.empty()) {
@@ -123 +129 @@
   }
   db_filename = filename_cat(dbhome, "collect", collection, "index", "text", indexstem);
-  if (littleEndian()) db_filename += ".ldb";
-  else db_filename += ".bdb";
-
+  db_filename += db_ptr->getfileextension();
   if (!file_exists(db_filename)) {
     logout << text_t2ascii