Changeset 18363 for gli/branches/rtl-gli/src/org/greenstone/gatherer/GathererApplet.java

Timestamp:

2009-01-12T11:19:54+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/GathererApplet.java (modified) (5 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -87 +87 @@
     // Ensure platform specific LAF
     try {
-        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        //UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
     }
     catch (Exception exception) {
@@ -115 +116 @@
     Gatherer.isApplet = true;
     String library_url_string = fullLibraryURL(getParameter("gwcgi"));
-    String gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver.pl";
+
+    String gs3 = getParameter("gsdl3");
+    boolean isGS3 = (gs3 == null || !gs3.equals("true")) ? false : true;
+
+    String gliserver_url_string;
+    if(!isGS3) {
+        gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver.pl";
+    } else {
+        gliserver_url_string = library_url_string + "/cgi-bin/gliserver.pl";
+    }
 
         // String debug_param = getParameter("debug");
@@ -122 +132 @@
         // }
 
-    String[] args = { "-use_remote_greenstone",
-              "-gliserver_url", gliserver_url_string,
-              "-library_url", library_url_string,
-              // "-debug",
-                    };
-
+    String[] args;
+    if(!isGS3) {
+        String[] gs2_args = { 
+        "-use_remote_greenstone",
+        "-gliserver_url", gliserver_url_string,
+        "-library_url", library_url_string,
+        // "-debug",
+        };
+        args = gs2_args;
+    } else { // >= GS3
+        String[] gs3_args = {
+        "-use_remote_greenstone",
+        "-gliserver_url", gliserver_url_string,
+        "-library_url", library_url_string,
+        "-gsdl3",
+        //"-debug",
+        };
+        args = gs3_args;
+    }
+    
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
     if (!collect_directory.exists()) {
@@ -178 +202 @@
     System.err.println("Destroy called");
     gatherer.exit();
+    gatherer = null;
     System.err.println("Done gatherer exit.");
     }
@@ -189 +214 @@
 
     /** 
-     * Method which unzips a given metadata resoure.
+     * Method which unzips a given metadata resource.
      * @param jar_zip_fname The name of the jar file as a <strong>String</strong>.
      * @param dst_dir The destination directory for unzipping, also as a <strong>String</strong>.