Changeset 26180 for other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/GS3ServicesAPIA.java

Timestamp:

2012-09-12T19:37:39+12:00 (12 years ago)

Author:

ak19

Message:

1. Fixed the democlient to work with the new GS3 again: lots of small things had got broken (such as image display, since the metadata being stored was different). 2. Updating the jar files and democlient distribution zip files with the latest working version of this.

File:

• other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/GS3ServicesAPIA.java (modified) (3 diffs)

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/GS3ServicesAPIA.java

@@ -57 +57 @@
     static Logger LOG = Logger.getLogger(GS3ServicesAPIA.class);
     
+    /** Storing the baseURL, worked out from wsdlURL */
+    protected String baseURL;
+
     /** Storing language settings for requests and responses*/
     protected String language;
@@ -82 +85 @@
         // this case, it is set to "" (which Greenstone takes as English).
         this.language = ""; 
+
+    // work out the baseURL from the wsdlURL, which is just the domain prefix 
+    // (e.g. http://localhost:8383)
+    String url = wsdlURLName;
+    int index = url.indexOf("://") + "://".length();
+    index = url.indexOf('/', index);
+    url = url.substring(0, index); // everything upto the first / separator
+    this.baseURL = url;
+    
     }
 
@@ -164 +176 @@
      * do not contain relative paths, or otherwise deal with the resolution of
      * relative urls themselves, then return "" from here. */
-    public String getAssocFileBaseURL() { return ""; }
+    public String getAssocFileBaseURL() { 
+        return baseURL; // return ""; // for old GS3
+    }
     
     /** Part of the GS3 Java-Client's DigitalLibraryServicesAPIA interface