Changeset 33967

Timestamp:

2020-02-25T13:36:08+13:00 (4 years ago)

Author:

kjdon

Message:

you might want to change the oaiserver url, eg if you have 2 oai servers, so instead of replacing 'oaiserver' with 'library', as it might not be oaiserver, lets remove the last piece of the url and add library on.

File:

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

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

@@ -709 +709 @@
     values = new Vector<String>();
     String base_url = OAIXML.getBaseURL(); // e.g. e.g. http://host:port/greenstone3/oaiserver
+    base_url = base_url.substring(0, base_url.lastIndexOf("/")+1);
     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");
+      link_url =  base_url + "library/collection/" + this.coll_name + "/document/" + info.getInfo("Identifier");
     } else if (names[i].equals(OAIXML.GSF_LINK_PREFIX+OAIXML.LINK_TYPE_PRINT)) {
-      link_url =  base_url.replace("oaiserver", "library") + "/collection/" + this.coll_name + "/document/" + info.getInfo("Identifier")+"/print";
+      link_url =  base_url + "library/collection/" + this.coll_name + "/document/" + info.getInfo("Identifier")+"/print";
     } 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/"
+        link_url = base_url + "library/sites/"
              + this.site_name 
              + "/collect/" + this.coll_name + "/index/assoc/"