Changeset 30260 for main/trunk

Timestamp:

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

Author:

jmt12

Message:

Replacing hardcoded database file extensions with call to DBHelper (which keeps track of registered dbtypes and their extensions). This also required a slight reordering of the code to ensure the static constructor for the dbtype had been called prior to asking for the extension

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ArchiveRetrieve.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ArchiveRetrieve.java

@@ -21 +21 @@
 package org.greenstone.gsdl3.service;
 
+import org.greenstone.gsdl3.util.DBHelper;
 import org.greenstone.gsdl3.util.DBInfo;
 import org.greenstone.gsdl3.util.GSPath;
@@ -139 +140 @@
         return result;
     }
-    
+
+
+     /** @function processSourceFileOIDRetrieveService(Element)
+     *  @brief
+     *  @param request
+     *  @return Element
+     */
     protected Element processSourceFileOIDRetrieveService(Element request)
     {
@@ -168 +175 @@
             databaseType = "gdbm"; // the default
         }
-        
-        String dbExt = null;
-        if (databaseType.equalsIgnoreCase("jdbm")) 
-        {
-            dbExt = ".jdb";
-        } 
-        else 
-        {
-            dbExt = ".gdb"; // assume gdbm
-        }
-        
+
         coll_db = new SimpleCollectionDatabase(databaseType);
         if (!coll_db.databaseOK()) 
@@ -185 +182 @@
             return null;
         }
+
+    // Moved to ensure that the appropriate FlatDatabaseWrapper
+    // has been initialised during the SimpleCollectionDatabase
+    // call above. That way we can easily retrieve the database
+    // extension from the DBHelper [jmt12]
+    String dbExt = DBHelper.getDBExtFromDBType(databaseType);
+    if (null == dbExt || dbExt.equals("")) {
+       // assume gdbm
+       logger.warn("Could not recognise database type \"" + databaseType + "\", defaulting to GDBM and extension \".gdb\"");
+       dbExt = ".gdb";
+    }
 
         coll_db.openDatabase
@@ -211 +219 @@
         return result;
     }
-    
+    /** processSourceFileOIDRetrieveService(Element) **/
+
     protected Element processAssociatedImportFilesRetrieve(Element request)
     {
@@ -240 +249 @@
         }
         
-        String dbExt = null;
-        if (databaseType.equalsIgnoreCase("jdbm")) 
-        {
-            dbExt = ".jdb";
-        } 
-        else 
-        {
-            dbExt = ".gdb"; // assume gdbm
-        }
-        
         coll_db = new SimpleCollectionDatabase(databaseType);
         if (!coll_db.databaseOK()) 
@@ -257 +256 @@
         }
 
+    // Moved to ensure that the appropriate FlatDatabaseWrapper
+    // has been initialised during the SimpleCollectionDatabase
+    // call above. That way we can easily retrieve the database
+    // extension from the DBHelper.
+    String dbExt = DBHelper.getDBExtFromDBType(databaseType);
+    if (null == dbExt || dbExt.equals(""))
+    {
+        // assume gdbm
+        logger.warn("Could not recognise database type \"" + databaseType + "\", defaulting to GDBM and extension \".gdb\"");
+        dbExt = ".gdb";
+    }
+        
         coll_db.openDatabase
         (