Changeset 32213

Timestamp:

2018-06-26T13:38:37+12:00 (6 years ago)

Author:

kjdon

Message:

OAI: don't have hardcoded custom outputting for dc.identifier anymore. we do it via mapping in siteConfig, using special keywords gsflink.source, gsflink.document. User can choose to have links to gs.OAIResourceURL, srclink or link, or all or any combination of these. Prompted by diego wanting the srclink and link urls as dc.identifier

File:

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

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

@@ -692 +692 @@
     String[] names = name_list.split(",");
     for (int i=0; i<names.length; i++) {
-      Vector<String> values = info.getMultiInfo(names[i]);
+      Vector<String> values;
+      // some special words
+      if (names[i].startsWith(OAIXML.GSF_LINK_PREFIX)) {
+    values = new Vector<String>();
+    String base_url = OAIXML.getBaseURL(); // e.g. e.g. http://host:port/greenstone3/oaiserver
+    String link_url = null;
+    if (names[i].equals(OAIXML.GSF_LINK_PREFIX+OAIXML.LINK_TYPE_DOCUMENT)) {
+      link_url =  base_url.replace("oaiserver", "library") + "/collection/" + this.coll_name + "/document/" + info.getInfo("Identifier");
+    } else if (names[i].equals(OAIXML.GSF_LINK_PREFIX+OAIXML.LINK_TYPE_SOURCE)) {
+      String srcfile = info.getInfo("srclinkFile");
+      if (!srcfile.equals("")) {
+        link_url = base_url.replace("oaiserver", "") + "sites/"
+             + this.site_name 
+             + "/collect/" + this.coll_name + "/index/assoc/" 
+             + info.getInfo("assocfilepath") + "/" + srcfile;
+      }
+    }
+    if (link_url !=null) {
+      values.add(link_url);
+    }
+      } else {
+    values = info.getMultiInfo(names[i]);
+      }
       if (values == null || values.size()==0) {
     continue;
@@ -710 +732 @@
   
   // specific metadata formats might need to do some custom metadata that is not
-  //just a standard mapping. eg oai_dc outputting an identifier that is a link
+  //just a standard mapping.
   protected void addCustomMetadata(Element meta_list_elem, String prefix, DBInfo info) {
     
-    if (prefix.equals(OAIXML.META_FORMAT_DC)) {
-      // we want to add in another dc:identifier element with a link to the resource if possible
-      // try gs.OAIResourceURL first, then srclinkFile, then GS version of documnet
-      String gsURL = info.getInfo(OAIXML.GS_OAI_RESOURCE_URL);
-      if (gsURL.equals("")) {
-    String base_url = OAIXML.getBaseURL(); // e.g. e.g. http://host:port/greenstone3/oaiserver
-    // try srclinkFile
-    gsURL = info.getInfo("srclinkFile");
-    if (!gsURL.equals("")) {
-      // make up the link to the file
-      gsURL = base_url.replace("oaiserver", "") + "sites/" + this.site_name 
-        + "/collect/" + this.coll_name + "/index/assoc/" 
-        + info.getInfo("assocfilepath") + "/" + gsURL; 
-    } else {
-      // no srclink file, lets provide a link to the greenstone doc
-      gsURL = base_url.replace("oaiserver", "library") + "/collection/" + this.coll_name + "/document/" + info.getInfo("Identifier");
-    }
-      }
-      // now we have the url link, add as metadata
-      addMetadataElement(meta_list_elem, "dc:identifier", gsURL);
-    }
-  }
-
+
+  }
+  
   /** create the actual metadata element for the list */
   protected void addMetadataElement(Element meta_list_elem, String name, String value) {