Changeset 31966

Timestamp:

2017-09-14T14:28:36+12:00 (7 years ago)

Author:

kjdon

Message:

metadata prefix elements don't change, so don't need to create it each time we are asked for metadata. Create them initially and store in a map with prefix, then just use it.

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

@@ -69 +69 @@
   protected HashMap<String, HashSet<String>> format_elements_map = null;
   protected HashMap<String, Element> format_response_map = null;
+  protected HashMap<String, Element> format_meta_elem_map = null;
+  
   /** constructor */
   public OAIPMH() {
@@ -192 +194 @@
     this.format_response_map = new HashMap<String, Element>();
     this.format_elements_map = new HashMap<String, HashSet<String>>();
+    this.format_meta_elem_map = new HashMap<String, Element>();
 
     // for now, all we want is the metadata prefix description and the mapping list
@@ -204 +207 @@
       return false;
     }
+    
     boolean found_meta_format = false;
     for(int i=0; i<meta_formats_list.getLength(); i++) {
@@ -218 +222 @@
     continue;
       }
+      
       // copy the format definition into our stored Element
       Element collection_version_format = (Element) this.desc_doc.importNode(meta_format, true);
@@ -228 +233 @@
       // now set up a list of all collection elements for reverse lookup of the mapping
       format_elements_map.put(prefix, getAllCollectionElements(collection_version_format));
+      format_meta_elem_map.put(prefix, OAIXML.getMetadataPrefixElement(this.desc_doc, prefix, collection_version_format));
       
     }
@@ -650 +656 @@
     Element metadata = doc.createElement(OAIXML.METADATA);
     // the <oai:dc namespace...> element
-    Element prfx_str_elem = OAIXML.getMetadataPrefixElement(doc, prefix, OAIXML.oai_version);
+    Element prfx_str_elem = (Element)doc.importNode(this.format_meta_elem_map.get(prefix), true); 
     metadata.appendChild(prfx_str_elem);
-
+    
     Element meta_format_element = GSXML.getNamedElement(this.meta_formats_definition, OAIXML.METADATA_FORMAT, GSXML.NAME_ATT, prefix);
     NodeList elements = meta_format_element.getElementsByTagName(OAIXML.ELEMENT);