Changeset 18656 for gsdl/trunk

Timestamp:

2009-03-11T11:06:35+13:00 (15 years ago)

Author:

kjdon

Message:

now look for .gdb files for collection databases, not ldb/bdb

File:

• gsdl/trunk/common-src/src/lib/gdbmclass.cpp (modified) (2 diffs)

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

@@ -72 +72 @@
   if (gdbm_mode == GDBM_READER)
   {
-    // If the specified GDBM file doesn't exist, try the other extension (we can now read both)
+    // make sure we have the right file extension. Should be db (for systems dbs, and gdb for collection dbs. But need to handle old style ldb/bdb
+
+    // If the specified GDBM file doesn't exist, (should be gdb) try the other extensions (we can now read both)
     if (!file_exists(gdbm_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";
+      if (ends_with(gdbm_filename, ".gdb")) {
+    // only try ldb and bdb for collection dbs, not system dbs which are .db
+    gdbm_filename = substr(gdbm_filename.begin(), gdbm_filename.end() - ((text_t) ".gdb").size()) + ".ldb"; 
+      
+    if (!file_exists(gdbm_filename)) {
+      // try bdb as well
+      gdbm_filename = substr(gdbm_filename.begin(), gdbm_filename.end() - ((text_t) ".ldb").size()) + ".bdb";
+    }
       }
     }
@@ -146 +149 @@
 text_t gdbmclass::getfileextension ()
 {
-  if (littleEndian()) return ".ldb";
-  return ".bdb";
+  // now we always use gdb for gdbm files. later on, if we can't find it, we'll try ldb and bdb for backwards compatibility
+  return ".gdb";
+  //if (littleEndian()) return ".ldb";
+  //return ".bdb";
 }