Changeset 26180 for other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/data/DocumentNodeData.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/data/DocumentNodeData.java (modified) (1 diff)

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/data/DocumentNodeData.java

@@ -501 +501 @@
             return ""; // deal with any odd cases
         
-        if(!this.nodeMetadata.containsKey("srclink"))
+        String imgMetaFound = "";
+        String srclinkFile = nodeMetadata.containsKey("srclinkFile") ? (String)((Vector)nodeMetadata.get("srclinkFile")).get(0) : "";
+        String w = nodeMetadata.containsKey("ImageWidth") ? (String)((Vector)nodeMetadata.get("ImageWidth")).get(0) : "";
+        String h = nodeMetadata.containsKey("ImageHeight") ? (String)((Vector)nodeMetadata.get("ImageHeight")).get(0) : "";
+
+        if(this.nodeMetadata.containsKey("srcicon")) {
+            imgMetaFound = "srcicon";
+        }
+        else if(this.nodeMetadata.containsKey("srclink")) { // old Greenstone 3
+            imgMetaFound = "srclink";
+        } 
+        else {
             return "";
-        Vector values = (Vector)this.nodeMetadata.get("srclink");
+        }
+        Vector values = (Vector)this.nodeMetadata.get(imgMetaFound);
         String imgTag = (String)values.get(0);
+
+        if(imgMetaFound.equals("srcicon")) {
+            imgTag = imgTag.replace("[srclinkFile]", srclinkFile);
+            imgTag = imgTag.replace("[ImageWidth]", w);
+            imgTag = imgTag.replace("[ImageHeight]", h);
+            return imgTag;
+        }
+
+        // else deal with srclink in the old Greenstone 3 way:
+
         // now we got <a href="somelink">; extract just the "somelink" portion
         int startindex = imgTag.indexOf('\"');