Changeset 31236 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

Timestamp:

2016-12-14T19:42:53+13:00 (7 years ago)

Author:

ak19

Message:

More checking of oaiinf_db: need to make sure it exists before trying to open the database.

File:

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

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

@@ -131 +131 @@
     if (!oaiinf_db.databaseOK()) {
       logger.error("Couldn't create the oai-inf database of type "+infodb_type);
-      oaiinf_db = null;
       return false;
     }
@@ -144 +143 @@
     // the oaiinf_db is called oai-inf.<infodb_type_extension>
     String oaiinf_db_file = GSFile.OAIInfoDatabaseFile(this.site_home, this.cluster_name, "oai-inf", infodb_type);
-    if (oaiinf_db != null && !this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) {
-      logger.warn("Could not open oai-inf database for collection + " + this.cluster_name + "!");
+    File oaiinfFile = new File(oaiinf_db_file);
+    
+    if(!oaiinfFile.exists()) {
+    logger.warn("oai-inf database for collection + " + this.cluster_name + " does not exist.");
+    oaiinf_db = null;
+    } else if (!this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) {
+    logger.warn("Could not open oai-inf database for collection + " + this.cluster_name + "!");
+    oaiinf_db = null;
     }