ref #6535 fix calls to version number from other places

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / opt / config / DataSourceConfigurer.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/DataSourceConfigurer.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/DataSourceConfigurer.java
index 81745429222b48f19301db2aa8bb2b2120a064db..ca8c6f3f38730fe75708b0e2061a59a3438b2e6e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/DataSourceConfigurer.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/DataSourceConfigurer.java
@@ -167,7 +167,16 @@ public class DataSourceConfigurer extends AbstractWebApplicationConfigurer {
             }
             ResultSet tables = connection.getMetaData().getTables(connection.getCatalog(), null, metadataTableName, null);
             if(tables.first()){
-                ResultSet resultSet = connection.createStatement().executeQuery(CdmMetaDataPropertyName.DB_SCHEMA_VERSION.getSqlQuery());
+                ResultSet resultSet;
+                try {
+                    resultSet = connection.createStatement().executeQuery(CdmMetaDataPropertyName.DB_SCHEMA_VERSION.getSqlQuery());
+                } catch (Exception e) {
+                    try {
+                        resultSet = connection.createStatement().executeQuery(CdmMetaDataPropertyName.DB_SCHEMA_VERSION.getSqlQueryOld());
+                    } catch (Exception e1) {
+                        throw e1;
+                    }
+                }
                 String version = null;
                 if(resultSet.next()){
                     version = resultSet.getString(1);
@@ -304,7 +313,11 @@ public class DataSourceConfigurer extends AbstractWebApplicationConfigurer {
     public Properties hibernateProperties(){
         Properties props = getHibernateProperties();
         props.setProperty(HIBERNATE_DIALECT, inferHibernateDialectName());
-        props.setProperty(HIBERNATE_SEARCH_DEFAULT_INDEX_BASE, CdmUtils.getCdmHomeSubDir(CdmUtils.SUBFOLDER_WEBAPP).getPath() + "/index/".replace("/", File.separator) + findProperty(ATTRIBUTE_DATASOURCE_NAME, true));
+        String searchPath = CdmUtils.getCdmHomeSubDir(CdmUtils.SUBFOLDER_WEBAPP).getPath();
+        props.setProperty(HIBERNATE_SEARCH_DEFAULT_INDEX_BASE,
+                searchPath +
+                "/index/".replace("/", File.separator) +
+                findProperty(ATTRIBUTE_DATASOURCE_NAME, true));
         logger.debug("hibernateProperties: " + props.toString());
         return props;
     }