Changeset 17000

Timestamp:

2008-08-25T20:42:08+12:00 (16 years ago)

Author:

ak19

Message:

Merged GathererApplet.java and GathererApplet4gs3.java

File:

• gli/trunk/src/org/greenstone/gatherer/GathererApplet.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/GathererApplet.java

@@ -115 +115 @@
     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 +131 @@
         // }
 
-    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 +201 @@
     System.err.println("Destroy called");
     gatherer.exit();
+    gatherer = null;
     System.err.println("Done gatherer exit.");
     }