Changeset 18662 for greenstone3/trunk/src/java/org/greenstone/gsdl3/util/GSFile.java

Timestamp:

2009-03-11T13:55:29+13:00 (15 years ago)

Author:

kjdon

Message:

changed collectionDatabaseFile method. if type is jdbm, then use jdb instead of db, and if type is gdbm, use gdb instead of ldb/bdb

File:

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

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

@@ -289 +289 @@
     }
 
-    /** 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
-  // jdbm files are endian independent ??
+  /** the collection database file - */
     static public String collectionDatabaseFile(String site_home, 
                         String collection_name,
@@ -303 +297 @@
         String db_ext = null;
     if (database_type.equalsIgnoreCase("jdbm")) {
-      db_ext = ".db";
+      db_ext = ".jdb";
     } else {
       // assume gdbm
-      db_ext = ".ldb";
-      
-      // No longer default all Macs to .bdb extension regardless of what endian, 
-      // they are since the Misc.isBigEndian() method does return little endian 
-      // for rata (Intel Mac) and big endian for shuttle (Power PC).
-      if (Misc.isBigEndian()) { // if (Misc.isMac() || Misc.isBigEndian()) {
-        db_ext = ".bdb";
-      }
-    } 
-    
+      db_ext = ".gdb";
+    }
+        
     return site_home + File.separatorChar +
         "collect" + File.separatorChar +