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

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

@@ -452 +452 @@
             if(docNode.hasNoText()) { //NoText field is 1, meaning it's an img
                 // now display the image
-                this.htmlPane.setText(
-                        Displays.getImgUrlEnclosedInHtml(docNode.getImgURL()));
+                this.htmlPane.setText(Displays.getImgUrlEnclosedInHtml(client.getBaseURL(), docNode.getImgURL()));
             } else { // it has text 
                 // Java's htmlpane does not recognise justified alignment.
@@ -464 +463 @@
                 String docContent = docNode.getContent().replaceAll(
                         "ALIGN=\"JUSTIFY\"", "ALIGN=\"LEFT\"");
-                String baseURL = client.getBaseURL();
+            String baseURL = client.getBaseURL();
+                            
                 // TODO: make the docNode itself work out its URL by passing
                 // baseURL to the docNode?
@@ -477 +477 @@
                         = (HTMLDocument)this.htmlPane.getDocument();
                     try{
+                    
+                    switch(client.getActiveDL()) {
+                    
+                    case GS3JavaClient.GREENSTONE:
+                    doc.setBase(new URL(baseURL));
+                    break;
+                    case GS3JavaClient.FEDORA:                  
                         URL url = new URL(baseURL+docNode.getRoot().nodeID+"/");
                         //System.err.println("url: " + url.toString());
@@ -482 +489 @@
                         //docContent = docContent.replaceAll("_httpdocimg_/", "");
                         LOG.debug(docContent);
+                    break;
+                    default:
+                    break;
+                    }
+                    
                     }catch(MalformedURLException mex) {
                         ; //nothing to be done, leave the base as it is
                     }
-                }
+            }
                 this.htmlPane.setText(docContent);
             }
@@ -498 +510 @@
         c.setCursor(Cursor.getDefaultCursor()); // set the cursor back to normal
     }
-    
+
     /** Inner class (not static, as it needs access to outerclass' this object.
      * This class represents a button that encapsulates a ClassifierData