Changeset 26181 for other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/SearchResultsDisplay.java

Timestamp:

2012-09-12T20:00:21+12:00 (12 years ago)

Author:

ak19

Message:

Related to previous commit: needed to update Search display to display images again, since in the last commit only Browse had been updated. Previous commit 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/SearchResultsDisplay.java (modified) (3 diffs)

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

@@ -323 +323 @@
             String docContent = docNode.getContent();
             if(docContent != null) {
+            try {
                 docContent = docContent.replaceAll(
                     "ALIGN=\"JUSTIFY\"", "ALIGN=\"LEFT\"");
+            HTMLDocument doc = (HTMLDocument)this.docContentEditPane.getDocument();
+            doc.setBase(new URL(client.getBaseURL()));
+            } catch(MalformedURLException mex) {
+            mex.printStackTrace(); //nothing to be done, leave the base as it is
+            }
             }
 
@@ -379 +385 @@
                         = (HTMLDocument)this.docContentEditPane.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());
@@ -384 +396 @@
                         //docContent = docContent.replaceAll("_httpdocimg_/", "");
                         LOG.debug(docContent);
+                    break;
+                    default:
+                    break;
+                    }
                     }catch(MalformedURLException mex) {
                         ; //nothing to be done, leave the base as it is