Changeset 15323

Timestamp:

2008-05-01T13:35:09+12:00 (16 years ago)

Author:

kjdon

Message:

added support for JDBM (or other) in place of GDBM: changed the possible options for database file name, and changed the method name

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (1 diff)

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

@@ -289 +289 @@
     }
 
-    /** the gdbm database file - 
-     * note, need to change extension depending on OS */
+    /** the collection database file - 
+     * note, need to change extension depending on OS and database type */
     // The perl code can't detect big vs little endian on a Mac, so the Perl
     // code will always name the gdbm db file .bdb on a Mac whether its little
     // endian or not. A Mac little endian file is NOT the same as a Linux 
     // little endian file
-    static public String GDBMDatabaseFile(String site_home, 
-                      String collection_name,
-                      String index_stem) {
-
-    String db_ext = ".ldb";
-    if (Misc.isMac() || Misc.isBigEndian()) {
+  // jdbm files are endian independent ??
+    static public String collectionDatabaseFile(String site_home, 
+                        String collection_name,
+                        String index_stem, 
+                        String database_type) {
+
+        String db_ext = null;
+    if (database_type.equalsIgnoreCase("jdbm")) {
+      db_ext = ".db";
+    } else {
+      // assume gdbm
+      db_ext = ".ldb";
+      if (Misc.isMac() || Misc.isBigEndian()) {
         db_ext = ".bdb";
-    }
+      }
+    } 
+    
     return site_home + File.separatorChar +
         "collect" + File.separatorChar +