- Timestamp:
- 2008-08-25T20:42:08+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/GathererApplet.java
r13599 r17000 115 115 Gatherer.isApplet = true; 116 116 String library_url_string = fullLibraryURL(getParameter("gwcgi")); 117 String gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver.pl"; 117 118 String gs3 = getParameter("gsdl3"); 119 boolean isGS3 = (gs3 == null || !gs3.equals("true")) ? false : true; 120 121 String gliserver_url_string; 122 if(!isGS3) { 123 gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver.pl"; 124 } else { 125 gliserver_url_string = library_url_string + "/cgi-bin/gliserver.pl"; 126 } 118 127 119 128 // String debug_param = getParameter("debug"); … … 122 131 // } 123 132 124 String[] args = { "-use_remote_greenstone", 125 "-gliserver_url", gliserver_url_string, 126 "-library_url", library_url_string, 127 // "-debug", 128 }; 129 133 String[] args; 134 if(!isGS3) { 135 String[] gs2_args = { 136 "-use_remote_greenstone", 137 "-gliserver_url", gliserver_url_string, 138 "-library_url", library_url_string, 139 // "-debug", 140 }; 141 args = gs2_args; 142 } else { // >= GS3 143 String[] gs3_args = { 144 "-use_remote_greenstone", 145 "-gliserver_url", gliserver_url_string, 146 "-library_url", library_url_string, 147 "-gsdl3", 148 //"-debug", 149 }; 150 args = gs3_args; 151 } 152 130 153 File collect_directory = new File(Gatherer.getCollectDirectoryPath()); 131 154 if (!collect_directory.exists()) { … … 178 201 System.err.println("Destroy called"); 179 202 gatherer.exit(); 203 gatherer = null; 180 204 System.err.println("Done gatherer exit."); 181 205 }
Note:
See TracChangeset
for help on using the changeset viewer.