Changeset 38885 for main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DownloadUrls.java

Timestamp:

2024-03-28T00:03:56+13:00 (3 months ago)

Author:

anupama

Message:

1. Simplified collage applet parameters for GS3. TODO: Just noticed I can remove sitename as it's now only used for href_musthave, which I can set as an official collage applet parameter, so moving that out of the Java code will also reduce my unncessary code additions. 2. Got the status bar working at last, which was a great pain, as it mattered when it was added and where in the code to get the sizing right without overlapping with the collage display (or being obscured entirely by it). It had to be added in main. TODO: a param to hide the status bar as my new code to the collage applet may be the only one to use it, and I only added the showStatus messages to test it works.

File:

• main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DownloadUrls.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DownloadUrls.java

@@ -22 +22 @@
 public class DownloadUrls extends Thread {
     // for GS3    
-    String gs3CollImgPath = null;
     String baseURL = null;
     
@@ -106 +105 @@
                "image_ignore_ "+  image_ignore+"\n"+
                "image_type_ "+ image_type+"\n"+
-               "document root "+ document_root_
+               "document_root_ "+ document_root_
                    );
 
@@ -114 +113 @@
     }
 
-    public void setupForGS3(String gs3CollImgPath, String baseURL)
-    {
-    this.gs3CollImgPath = gs3CollImgPath;
-    this.baseURL = baseURL;
-    }
-  
     /** Determines whether or not a url has already been examined
      *
@@ -431 +424 @@
 
     // connect to the url
-    CURL curl = (app_.gsdlversion == 3) ? new CURL(new_url, this.baseURL) : new CURL(new_url);
+    CURL curl = (app_.gsdlversion == 3) ? new CURL(new_url, app_.baseURL) : new CURL(new_url);
 
     if (curl.connected_ok())