Changeset 22974 for main/trunk/greenstone3

Timestamp:

2010-09-28T10:21:36+13:00 (14 years ago)

Author:

davidb

Message:

Code used to test 'coll_db == null' to determine if a database was opened correctly. Since this value is returned by a constructor, it is always non-null, even when it failed to open the database. The routine databaseOK() was added to core class, and is now used in these routines instead of testing for null

Location:

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

Files:

• AbstractGS2DocumentRetrieve.java (modified) (1 diff)
• AbstractGS2Search.java (modified) (1 diff)
• CoverageMetadataRetrieve.java (modified) (2 diffs)
• GS2Browse.java (modified) (1 diff)
• OAIPMH.java (modified) (1 diff)

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

@@ -102 +102 @@
     }
     coll_db = new SimpleCollectionDatabase(database_type);
-    if (coll_db == null) {
+    if (!coll_db.databaseOK()) {
       logger.error("Couldn't create the collection database of type "+database_type);
       return false;

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

@@ -110 +110 @@
     }
     coll_db = new SimpleCollectionDatabase(database_type);
-    if (coll_db == null) {
+    if (!coll_db.databaseOK()) {
       logger.error("Couldn't create the collection database of type "+database_type);
       return false;

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

@@ -92 +92 @@
     }
     coll_db = new SimpleCollectionDatabase(database_type);
-    if (coll_db == null) {
+    if (!coll_db.databaseOK()) {
       logger.error("Couldn't create the collection database of type "+database_type);
       return false;
@@ -190 +190 @@
     protected Element processCoverageMetadataRetrieve(Element request) {
 
+    
+    if (!this.coll_db.databaseOK()) {
+    logger.error("No valid database found\n");
+    return null;
+    }
+
     DBInfo collection_info = this.coll_db.getInfo("collection");
     

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

@@ -86 +86 @@
       database_type = database_type_elem.getAttribute(GSXML.NAME_ATT);
     }
+
     if (database_type == null || database_type.equals("")) {
       database_type = "gdbm"; // the default
     }
     coll_db = new SimpleCollectionDatabase(database_type);
-    if (coll_db == null) {
+    if (!coll_db.databaseOK()) {
       logger.error("Couldn't create the collection database of type "+database_type);
       return false;

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

@@ -115 +115 @@
 
     coll_db = new SimpleCollectionDatabase(infodb_type);
-    if (coll_db == null) {
+    if (!coll_db.databaseOK()) {
       logger.error("Couldn't create the collection database of type "+infodb_type);
       return false;