Changeset 29063 for main/trunk

Timestamp:

2014-05-19T13:19:11+12:00 (10 years ago)

Author:

kjdon

Message:

getMetadataPrefixElement code was all oai_dc specific. New string META_FORMAT_DC for 'oai_dc'

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java

@@ -100 +100 @@
   public static final String SCHEMA = "schema";
   public static final String METADATA_NAMESPACE = "metadataNamespace";
-  public static final String OAI_DC = "oai_dc";
-  public static final String DC = "dc";
+  public static final String META_FORMAT_DC = "oai_dc";
 
   // record response data
@@ -509 +508 @@
     return oai;
   }
+
   public static Element getMetadataPrefixElement(Document doc, String prefix, String version) {
-    //examples of tag_name: dc, oai_dc:dc, etc.
-    String tag_name = getMetadataTagName(prefix, version);
-    Element oai = doc.createElement(tag_name);
-    if (version.equals(OAI_VERSION2)) {
-      oai.setAttribute("xmlns:oai_dc", "http://www.openarchives.org/OAI/2.0/oai_dc/");
-      oai.setAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
-      oai.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-      oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/2.0/oai_dc/ \n http://www.openarchives.org/OAI/2.0/oai_dc.xsd");
-    } else {
-      oai.setAttribute("xmlns", "http://www.openarchives.com/OAI/1.1/");
-      oai.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-      oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/1.1/" + tag_name + ".xsd");        
-    }
-      
-    return oai;
-  }
+    if (prefix.equals(META_FORMAT_DC)) {
+      //examples of tag_name: dc, oai_dc:dc, etc.
+      String tag_name = getMetadataTagName(prefix, version);
+      Element oai = doc.createElement(tag_name);
+      if (version.equals(OAI_VERSION2)) {
+    oai.setAttribute("xmlns:oai_dc", "http://www.openarchives.org/OAI/2.0/oai_dc/");
+    oai.setAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+    oai.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+    oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/2.0/oai_dc/ \n http://www.openarchives.org/OAI/2.0/oai_dc.xsd");
+      } else {
+    oai.setAttribute("xmlns", "http://www.openarchives.com/OAI/1.1/");
+    oai.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+    oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/1.1/" + tag_name + ".xsd");        
+      }
+      return oai;
+    }
+    return null;
+    
+  }
+
   public static String getMetadataTagName(String prefix, String oai_version) {
-    if (prefix.equals("oai_dc")) {
+    if (prefix.equals(META_FORMAT_DC)) {
       if (oai_version.equals(OAI_VERSION2)) {
     return "oai_dc:dc";