Changeset 30262 for main/trunk/greenstone3

Timestamp:

2015-09-28T10:45:13+13:00 (9 years ago)

Author:

jmt12

Message:

Altered the collectionDatabaseFile function to no longer use hardcoded file extensions, but instead to look them up via the registered database types in the DBHelper.

File:

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

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

@@ -31 +31 @@
 import org.apache.log4j.Logger;
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.gsdl3.util.DBHelper;
 
 /**
@@ -343 +344 @@
     }
 
-    /** the collection database file - */
-    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 = ".jdb";
-        }
-        else
-        {
-            // assume gdbm
-            db_ext = ".gdb";
-        }
-
-        return site_home + File.separatorChar + "collect" + File.separatorChar + collection_name + File.separatorChar + "index" + File.separatorChar + "text" + File.separatorChar + index_stem + db_ext;
-
-    }
+    /** the collection database file - */
+    static public String collectionDatabaseFile(String site_home, String collection_name, String index_stem, String database_type)
+    {
+    String db_ext = DBHelper.getDBExtFromDBType(database_type);
+    if (null == db_ext || db_ext.equals("")) {
+        logger.warn("Could not recognise database type \"" + database_type + "\", defaulting to GDBM and extension \".gdb\"");
+        // assume gdbm
+        db_ext = ".gdb";
+    }
+    return site_home + File.separatorChar + "collect" + File.separatorChar + collection_name + File.separatorChar + "index" + File.separatorChar + "text" + File.separatorChar + index_stem + db_ext;
+    }
 
     // some file utility methods