Changeset 18663 for greenstone3

Timestamp:

2009-03-11T13:56:28+13:00 (15 years ago)

Author:

kjdon

Message:

we now use gdb all the time internally for database extension. In the open database method, if gdb not there check for ldb/bdb for legacy collections

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java

@@ -66 +66 @@
     // The java version of the C++ code in common-src/src/lib/gdbmclass.cpp
     if(mode == GdbmFile.READER) {
-        // Looking to read in the database
-        // => check to see if .ldb/.bdb file already there
-        // if not (first time) then generate using txt2db
+      // Looking to read in the database
+      // we now use gdb extension. Check for ldb/bdb in case of legacy collection
+      // if not (first time) then generate using txt2db
         if (!new File(filename).exists()) {
-        logger.warn("Database file " + filename + " does not exist. Looking for txtgz version of db file.");
+          logger.warn("Database file " + filename + " does not exist. Looking for ldb/bdb version");
+          int extension = filename.lastIndexOf('.');
+          String filename_head = filename.substring(0, extension);
+          filename = filename_head + ".ldb";
+          if (!new File(filename).exists()) {
+        filename = filename_head + ".bdb";
         
+        if (!new File(filename).exists()) {
+        logger.warn("ldb/bdb version of database file " + filename + " does not exist. Looking for txtgz version of db file.");
+        // put the filename back to gdb
+        filename = filename_head + ".gdb";
         // need to generate architecture native GDBM file using txt2db
         
         // replace sought after gdbm filename ext with ".txt.gz"
         
-        int extension = filename.lastIndexOf('.');
-        String txtgzFilename = filename.substring(0, extension) + ".txt.gz";
+        String txtgzFilename = filename_head + ".txt.gz";
         if(new File(txtgzFilename).exists()) {          
             // Test to make sure Perl is on the path
@@ -103 +111 @@
             }           
         }
+        }
+          }
+          
         }
     }