Changeset 21782

Timestamp:

2010-03-15T10:57:35+13:00 (14 years ago)

Author:

kjdon

Message:

slightly modified where info comes from in config files. service rack now in collectionConfig, indexstem and infodbtype from metadata in buildConfig

File:

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

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

@@ -61 +61 @@
   protected String site_name = "";
   protected String coll_name = "";
-  protected Element coll_config_xml = null;
-  
+ 
   /** constructor */
   public OAIPMH() {
@@ -72 +71 @@
     this.coll_db.closeDatabase();
   }
-  /** configure this service */
+  /** configure this service 
+  info is the OAIPMH service rack from collectionConfig.xml, and 
+  extra_info is buildConfig.xml */
   public boolean configure(Element info, Element extra_info) {
     if (!super.configure(info, extra_info)){
@@ -80 +81 @@
     
     //get the names from ServiceRack.java
-    site_name = this.router.getSiteName();
-    coll_name = this.cluster_name;
-    //get the collection-specific configurations from collectionConfig.xml
-    coll_config_xml = OAIXML.getCollectionConfigXML(site_name, coll_name);
+    this.site_name = this.router.getSiteName();
+    this.coll_name = this.cluster_name;
     
     logger.info("Configuring OAIPMH...");
-    // this call passes the indexStem in of ServiceRack element in buildConfig.xml to the super class.
+
     this.config_info = info;
     
-    // the index stem is either specified in the buildConfig.xml file or uses the collection name
-    Element index_stem_elem = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_STEM_ELEM);
-    String index_stem = null;
-    if (index_stem_elem != null) {
-      index_stem = index_stem_elem.getAttribute(GSXML.NAME_ATT);
-    }
+    // 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) {
+      
+      Element index_stem_elem = (Element) GSXML.getNamedElement(metadata_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, "indexStem");
+      
+      if (index_stem_elem != null) {
+    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);
+      }
+
+    }
+
     if (index_stem == null || index_stem.equals("")) {
       index_stem = this.cluster_name;
     }
-  
-    // find out what kind of database we have
-    Element database_type_elem = (Element) GSXML.getChildByTagName(info, GSXML.DATABASE_TYPE_ELEM);
-    String database_type = null;
-    if (database_type_elem != null) {
-      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 (infodb_type == null || infodb_type.equals("")) {
+      infodb_type = "gdbm"; // the default
+    }
+
+    coll_db = new SimpleCollectionDatabase(infodb_type);
     if (coll_db == null) {
-      logger.error("Couldn't create the collection database of type "+database_type);
+      logger.error("Couldn't create the collection database of type "+infodb_type);
       return false;
     }
     
     // Open database for querying
-    String coll_db_file = GSFile.collectionDatabaseFile(this.site_home, this.cluster_name, index_stem, database_type);
+    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!");
@@ -395 +401 @@
       return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, ""));
     }
-// Another way of doing the same job!    
-//    HashMap prefix_map = OAIXML.getChildrenMapByTagName(coll_config_xml, OAIXML.METADATA_PREFIX);
-//    if(!prefix_map.contains(prefix)) {
-//      logger.error("metadata prefix is not supported.");
-//      return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, ""));
-//    }
     
     //get a list of identifiers (it contains a list of strings)
@@ -452 +452 @@
    */
   private Element getMetadataFormatElement(String prefix) {
-    Element oai = (Element)GSXML.getChildByTagName(this.coll_config_xml, OAIXML.OAI);
-    Element list_meta_format = (Element)GSXML.getChildByTagName(oai, OAIXML.LIST_METADATA_FORMATS);
+    Element list_meta_format = (Element)GSXML.getChildByTagName(this.config_info, OAIXML.LIST_METADATA_FORMATS);
     Element metadata_format = GSXML.getNamedElement(list_meta_format, OAIXML.METADATA_FORMAT, OAIXML.METADATA_PREFIX, prefix);
     return metadata_format;
@@ -537 +536 @@
     }
     
-    NodeList meta_list = getMetadataFormatList(this.coll_config_xml);
+    NodeList meta_list = getMetadataFormatList();
     if (meta_list == null || meta_list.getLength() == 0) {
       logger.error("No metadata format is present in collectionConfig.xml");
@@ -569 +568 @@
    *  Currently, it will only contain one metadata format: oai_dc
    */
-  protected NodeList getMetadataFormatList(Element coll_config_xml) {
-    Element oai_elem = (Element)GSXML.getChildByTagName(coll_config_xml, OAIXML.OAI);
-    Element list_meta_formats = (Element)GSXML.getChildByTagName(oai_elem, OAIXML.LIST_METADATA_FORMATS);
+  protected NodeList getMetadataFormatList() {
+    Element list_meta_formats = (Element)GSXML.getChildByTagName(this.config_info, OAIXML.LIST_METADATA_FORMATS);
     return GSXML.getChildrenByTagName(list_meta_formats, OAIXML.METADATA_FORMAT);
   }
@@ -684 +682 @@
       }
       if(key.equals(second_name)) {
-        String meta_value = info.getInfo(key);
+    String meta_value = info.getInfo(key);
         name_value[0] = first_name;
-        name_value[1] = meta_value;
-        return name_value;
+    name_value[1] = meta_value;
+    return name_value;
       }
     }
@@ -698 +696 @@
     for(int i=0; i<metadata_names.length; i++) {
       String[] name_value = getMetadata(info, metadata_names[i]);
-      if(name_value != null) {
+      if(name_value != null) { 
         map.put(name_value[0], name_value[1]);
         empty_map = false;