Changeset 18051 for gsdl/trunk/common-src

Timestamp:

2008-12-04T10:54:51+13:00 (15 years ago)

Author:

mdewsnip

Message:

Now looks for the opposite endianness file if the desired one doesn't exist, since we can now read both. By Michael Dewsnip from DL Consulting Ltd (​http://www.dlconsulting.com).

Location:

gsdl/trunk/common-src/src/lib

Files:

• gdbmclass.cpp (modified) (3 diffs)
• gdbmclass.h (modified) (1 diff)

gsdl/trunk/common-src/src/lib/gdbmclass.cpp

@@ -69 +69 @@
   }
 
+  text_t gdbm_filename = filename;
   if (gdbm_mode == GDBM_READER)
   {
-    if (!file_exists(filename))
+    // If the specified GDBM file doesn't exist, try the other extension (we can now read both)
+    if (!file_exists(gdbm_filename))
     {
-      generate_from_txtgz(filename);
+      if (ends_with(gdbm_filename, ".ldb"))
+      {
+    gdbm_filename = substr(gdbm_filename.begin(), gdbm_filename.end() - ((text_t) ".ldb").size()) + ".bdb";
+      }
+      else if (ends_with(gdbm_filename, ".bdb"))
+      {
+    gdbm_filename = substr(gdbm_filename.begin(), gdbm_filename.end() - ((text_t) ".bdb").size()) + ".ldb";
+      }
     }
-  }
-
-  char *namebuffer = filename.getcstr();
+
+    // DEPRECATED -- No longer necessary now that the GDBM library reads both little-endian and big-endian files
+    if (!file_exists(gdbm_filename))
+    {
+      // We're desperate, so try generating the desired GDBM file from a txtgz file
+      gdbm_filename = filename;
+      generate_from_txtgz(gdbm_filename);
+    }
+  }
+
+  char *namebuffer = gdbm_filename.getcstr();
   do {
 #ifdef __WIN32__
@@ -91 +108 @@
   if (gdbmfile == NULL && logout != NULL) {
     outconvertclass text_t2ascii;
-    (*logout) << text_t2ascii << "database open failed on: " << filename << "\n";
+    (*logout) << text_t2ascii << "database open failed on: " << gdbm_filename << "\n";
   }
 
@@ -263 +280 @@
 
 
-// DEPRECATED -- No longer necessary now that the GDBM library reads both little-endian and big-endian
+// DEPRECATED -- No longer necessary now that the GDBM library reads both little-endian and big-endian files
 void gdbmclass::generate_from_txtgz (text_t filename)
 {

gsdl/trunk/common-src/src/lib/gdbmclass.h

@@ -85 +85 @@
   text_t getnextkey (const text_t &key);
 
-  // DEPRECATED -- No longer necessary now that the GDBM library reads both little-endian and big-endian
+  // DEPRECATED -- No longer necessary now that the GDBM library reads both little-endian and big-endian files
   void generate_from_txtgz (text_t filename);
 };