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

Timestamp:

2019-02-28T18:40:10+13:00 (5 years ago)

Author:

ak19

Message:

The major change is that opening the coll db and oai-inf db is moved from OAIPMH.configure() into OAIPMH.configureOAI() since we don't want to end up with 2 instances of DB handles: once when the MessageRouter of the library servlet calls configure() on a collection's services including OAIPMH and once when the OAIMessageRouter of the oaiserver servlet calls configure() (before calling configureOAI()) on its OAICollections' OAIPMH services. Instead, the dbs are only opened and the handles stored once, when configureOAI() is called on OAIPMH by OAIMessageRouter when the OAIServer servlet is first visited. Minor accompanying changes are that index_stem and infodb_type need to be member vars instead of local to configure() now.

File:

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

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

@@ -71 +71 @@
   protected HashMap<String, Element> format_meta_elem_map = null;
   
+  protected String index_stem = "";
+  protected String infodb_type = "";
+  
   /** constructor */
   public OAIPMH() {
@@ -78 +81 @@
   public void cleanUp() {
     super.cleanUp();//??
-    this.coll_db.closeDatabase();
+    this.coll_db.closeDatabase();
     if (this.oaiinf_db != null){
         this.oaiinf_db.closeDatabase();
     }
-    
-  }
+  }
+  
   /** configure this service 
   info is the OAIPMH service rack from collectionConfig.xml, and 
@@ -103 +106 @@
     // the index stem is either specified in the buildConfig.xml file (extra_info) or uses the collection name
     Element metadata_list = (Element) GSXML.getChildByTagName(extra_info, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
-    String index_stem = "";
-    String infodb_type = "";
+
     if (metadata_list != null) {
       
@@ -110 +112 @@
       
       if (index_stem_elem != null) {
-    index_stem = GSXML.getNodeText(index_stem_elem);
+    this.index_stem = GSXML.getNodeText(index_stem_elem);
       }
 
       Element infodb_type_elem = (Element) GSXML.getNamedElement(metadata_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, "infodbType");
       if (infodb_type_elem != null) {
-    infodb_type = GSXML.getNodeText(infodb_type_elem);
+    this.infodb_type = GSXML.getNodeText(infodb_type_elem);
       }
 
@@ -121 +123 @@
 
     if (index_stem == null || index_stem.equals("")) {
-    index_stem = this.cluster_name; // index_stem is the name of the db in indext/text, it is <colname>.<db>
+    this.index_stem = this.cluster_name; // index_stem is the name of the db in indext/text, it is <colname>.<db>
     }
     if (infodb_type == null || infodb_type.equals("")) {
-      infodb_type = "gdbm"; // the default
-    }
-
-    coll_db = new SimpleCollectionDatabase(infodb_type);
-    if (!coll_db.databaseOK()) {
-      logger.error("Couldn't create the collection database of type "+infodb_type);
-      return false;
-    }
-
-    oaiinf_db = new SimpleCollectionDatabase(infodb_type);
-    if (!oaiinf_db.databaseOK()) {
-      logger.error("Couldn't create the oai-inf database of type "+infodb_type);
-      return false;
-    }
-
-    
-    // Open databases for querying
-    String coll_db_file = GSFile.collectionDatabaseFile(this.site_home, this.cluster_name, index_stem, infodb_type);
-    if (!this.coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ)) {
-      logger.error("Could not open collection database!");
-      return false;
-    }
-    // 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);
-    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;
-    }
+      this.infodb_type = "gdbm"; // the default
+    }
+
+    // DB OPENING STUFF MOVED TO configureOAI(), because OAIPMH.configure() is called by the regular MessageRouter when this activates collections for the regular "library" servlet
+    // whereas OAIPMH.configureOAI() is only called by OAIMessageRouter when it activates collections for the "oaiserver" servlet (after OAIMessageRouter calls regular configure() first)
+    // We don't want the DBs opened twice: once by MessageRouter's call to OAIPMH.configure() and once by OAIMessageRouter calling OAIPMH.configure().
     
     // work out what sets this collection has. Will usually contain the collection itself, optional super collection, and maybe subcolls if appropriate classifiers are present.
@@ -235 +210 @@
       format_meta_elem_map.put(prefix, OAIXML.getMetadataPrefixElement(this.desc_doc, prefix, collection_version_format));
       
-    }
+    } // end for
+    
+    // Open the coll db and oai-inf db databases and store handles to them  
+    coll_db = new SimpleCollectionDatabase(infodb_type);
+    if (!coll_db.databaseOK()) {
+      logger.error("Couldn't create the collection database of type "+infodb_type);
+      return false;
+    }
+
+    oaiinf_db = new SimpleCollectionDatabase(infodb_type);
+    if (!oaiinf_db.databaseOK()) {
+      logger.error("Couldn't create the oai-inf database of type "+infodb_type);
+      return false;
+    }
+
+    
+    // Open databases for querying
+    String coll_db_file = GSFile.collectionDatabaseFile(this.site_home, this.cluster_name, index_stem, infodb_type);
+    if (!this.coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ)) {
+      logger.error("Could not open collection database!");
+      return false;
+    }
+    // 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);
+    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;
+    }
+    
     return true;
   }