Changeset 35225

Timestamp:

2021-07-06T14:32:20+12:00 (3 years ago)

Author:

kjdon

Message:

OAI identifiers should be (I think??) oai:repository_id:coll_name:doc_id. So I have updated the code to use this instead of just coll_name:doc_id

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• core/OAIReceptionist.java (modified) (3 diffs)
• service/OAIPMH.java (modified) (3 diffs)
• util/OAIXML.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -945 +945 @@
       
     identifier = param.getAttribute(GSXML.VALUE_ATT);
-    // the identifier is in the form: <coll_name>:<OID>
+    // the identifier is in the form: oai:<repository_id>:<coll_name>:<OID>
     // so it must contain at least one ':' characters 
     // (the oid itself may contain : chars)
-    String[] strs = identifier.split(":", 2);
-    if(strs.length != 2) {
-      logger.error("identifier is not in the form coll:id" + identifier);
+    String[] strs = identifier.split(":", 4);
+    if(strs.length != 4) {
+      logger.error("identifier is not in the form oai:repository_id:coll:id" + identifier);
       return OAIXML.createErrorMessage(OAIXML.ID_DOES_NOT_EXIST, "");
     }
@@ -956 +956 @@
     // send request to message router
     // get the names
-    String coll_name = strs[0];
-    String oid = strs[1];
+    String coll_name = strs[2];
+    String oid = strs[3];
 
     Document msg_doc = XMLConverter.newDOM();
@@ -1098 +1098 @@
 
     // get the names
-    String[] strs = identifier.split(":", 2);
-    if(strs == null || strs.length < 2) {
-      logger.error("identifier is not in the form coll:id" + identifier);
+    String[] strs = identifier.split(":", 4);
+    if(strs == null || strs.length < 4) {
+      logger.error("identifier is not in the form oai:repository_id:coll:id" + identifier);
       return OAIXML.createErrorMessage(OAIXML.ID_DOES_NOT_EXIST, "");
     }    
     //String name_of_site = strs[0];
-    String coll_name = strs[0];
-    String oid = strs[1];
+    String coll_name = strs[2];
+    String oid = strs[3];
     
     //re-organize the request element

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

@@ -59 +59 @@
   protected SimpleCollectionDatabase coll_db = null;
   protected SimpleCollectionDatabase oaiinf_db = null;
-  
+
+  protected String repository_id = "";
   protected String site_name = "";
   protected String coll_name = "";
@@ -174 +175 @@
     this.format_elements_map = new HashMap<String, HashSet<String>>();
     this.format_meta_elem_map = new HashMap<String, Element>();
+
+    // get the reposityIdentifier
+    Element ri = (Element)GSXML.getChildByTagName(oai_config_elem, OAIXML.REPOSITORY_IDENTIFIER);
+    if (ri != null) { 
+      this.repository_id = GSXML.getNodeText(ri);
+    } else {
+      this.repository_id = "";
+    }
 
     // for now, all we want is the metadata prefix description and the mapping list
@@ -774 +783 @@
     
         Element identifier = doc.createElement(OAIXML.IDENTIFIER);
-    GSXML.setNodeText(identifier, coll_name + ":" + oid);
+    GSXML.setNodeText(identifier, OAIXML.createOAIIdentifier(repository_id,coll_name,oid));
         header.appendChild(identifier);
         Element set_spec = doc.createElement(OAIXML.SET_SPEC);

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

@@ -647 +647 @@
     return map;
   }
-    
+
+  public static String createOAIIdentifier(String repository_id, String collection, String doc_id) {
+    return "oai:"+repository_id+":"+collection+":"+doc_id;
+  }
+  
   public static Element createOAIIdentifierXML(Document doc, String repository_id, String sample_collection, String sample_doc_id) {
-    String xml = "<oai-identifier xmlns=\"http://www.openarchives.org/OAI/2.0/oai-identifier\"\n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai-identifier\n http://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n <scheme>oai</scheme>\n<repositoryIdentifier>" + repository_id + "</repositoryIdentifier>\n<delimiter>:</delimiter>\n<sampleIdentifier>oai:"+repository_id+":"+sample_collection+":"+sample_doc_id+"</sampleIdentifier>\n</oai-identifier>";
+    String sample_id = createOAIIdentifier(repository_id,sample_collection,sample_doc_id);
+    String xml = "<oai-identifier xmlns=\"http://www.openarchives.org/OAI/2.0/oai-identifier\"\n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai-identifier\n http://www.openarchives.org/OAI/2.0/oai-identifier.xsd\">\n <scheme>oai</scheme>\n<repositoryIdentifier>" + repository_id + "</repositoryIdentifier>\n<delimiter>:</delimiter>\n<sampleIdentifier>"+sample_id+"</sampleIdentifier>\n</oai-identifier>";
 
     Document xml_doc = converter.getDOM(xml);