Changeset 20924
- Timestamp:
- 2009-11-10T20:49:48+13:00 (14 years ago)
- Location:
- gli/trunk/src/org/greenstone/gatherer
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/GetOpt.java
r16464 r20924 222 222 } 223 223 // Parse the path to PERL. If not provided it assumes 224 // perl should be avail ble on the PATH.224 // perl should be available on the PATH. 225 225 else if(argument_name.equals(StaticStrings.PERL_ARGUMENT)) { 226 226 perl_path = argument_value; -
gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java
r19780 r20924 164 164 // Generate the buildcol.pl command 165 165 ArrayList command_parts_list = new ArrayList(); 166 if ( (Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {166 if (!Gatherer.isGsdlRemote) { 167 167 command_parts_list.add(Configuration.perl_path); 168 168 command_parts_list.add("-S"); -
gli/trunk/src/org/greenstone/gatherer/collection/ScriptOptions.java
r19269 r20924 230 230 else { 231 231 String args[]; 232 if(Utility.isWindows()) { 233 args = new String[6]; 234 args[0] = Configuration.perl_path; 235 args[1] = "-S"; 236 args[2] = LocalGreenstone.getBinScriptDirectoryPath() + filename; 237 args[3] = "-xml"; 238 args[4] = "-language"; 239 args[5] = lang; 240 } 241 else { 242 args = new String[4]; 243 args[0] = LocalGreenstone.getBinScriptDirectoryPath() + filename; 244 args[1] = "-xml"; 245 args[2] = "-language"; 246 args[3] = lang; 247 } 232 args = new String[6]; 233 args[0] = Configuration.perl_path; 234 args[1] = "-S"; 235 args[2] = LocalGreenstone.getBinScriptDirectoryPath() + filename; 236 args[3] = "-xml"; 237 args[4] = "-language"; 238 args[5] = lang; 248 239 249 240 -
gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java
r19313 r20924 232 232 233 233 ArrayList command_list = new ArrayList(); 234 if (Utility.isWindows()) { 235 command_list.add(Configuration.perl_path); 236 command_list.add("-S"); 237 } 238 234 239 235 // the following also works for client-gli if downloading is enabled (when there's a gs2build directory inside gli) 236 command_list.add(Configuration.perl_path); 237 command_list.add("-S"); 240 238 command_list.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadfrom.pl"); 241 239 command_list.add("-download_mode"); -
gli/trunk/src/org/greenstone/gatherer/download/ServerInfoDialog.java
r13594 r20924 82 82 { 83 83 ArrayList commands = new ArrayList(); 84 if (Utility.isWindows()) { 85 commands.add(Configuration.perl_path); 86 commands.add("-S"); 87 } 84 commands.add(Configuration.perl_path); 85 commands.add("-S"); 88 86 commands.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadfrom.pl"); 89 87 commands.add("-info"); -
gli/trunk/src/org/greenstone/gatherer/greenstone/Classifiers.java
r17612 r20924 138 138 else { 139 139 ArrayList args = new ArrayList(); 140 if (Utility.isWindows()) { 141 args.add(Configuration.perl_path); 142 args.add("-S"); 143 } 140 args.add(Configuration.perl_path); 141 args.add("-S"); 144 142 args.add(LocalGreenstone.getBinScriptDirectoryPath() + "classinfo.pl"); 145 143 if (collection_specific) { … … 200 198 else { 201 199 ArrayList args = new ArrayList(); 202 if (Utility.isWindows()) { 203 args.add(Configuration.perl_path); 204 args.add("-S"); 205 } 200 args.add(Configuration.perl_path); 201 args.add("-S"); 206 202 args.add(LocalGreenstone.getBinScriptDirectoryPath() + "classinfo.pl"); 207 203 if (collection_name != null) { -
gli/trunk/src/org/greenstone/gatherer/greenstone/Plugins.java
r17612 r20924 139 139 else { 140 140 ArrayList args = new ArrayList(); 141 if (Utility.isWindows()) { 142 args.add(Configuration.perl_path); 143 args.add("-S"); 144 } 141 args.add(Configuration.perl_path); 142 args.add("-S"); 145 143 args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl"); 146 144 if (collection_specific) { … … 203 201 else { 204 202 ArrayList args = new ArrayList(); 205 if (Utility.isWindows()) { 206 args.add(Configuration.perl_path); 207 args.add("-S"); 208 } 203 args.add(Configuration.perl_path); 204 args.add("-S"); 209 205 args.add(LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl"); 210 206 if (collection_name != null) { -
gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java
r19188 r20924 238 238 ArrayList args_list = new ArrayList(); 239 239 String args[] = null; 240 if( Utility.isWindows()) {241 if(Configuration.perl_path != null) {242 args_list.add(Configuration.perl_path);243 }244 245 args_list.add("Perl.exe");246 247 }240 if(Configuration.perl_path != null) { 241 args_list.add(Configuration.perl_path); 242 } else if(Utility.isWindows()) { 243 args_list.add("Perl.exe"); 244 } else { 245 args_list.add("perl"); 246 } 247 args_list.add("-S"); 248 248 args_list.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadinfo.pl"); 249 249 args_list.add("-xml"); -
gli/trunk/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java
r20823 r20924 258 258 // Generate the explode_metadata_database.pl command 259 259 ArrayList command_parts_list = new ArrayList(); 260 if ( Utility.isWindows() && (!Gatherer.isGsdlRemote)) {260 if (!Gatherer.isGsdlRemote) { 261 261 command_parts_list.add(Configuration.perl_path); 262 262 command_parts_list.add("-S"); -
gli/trunk/src/org/greenstone/gatherer/gui/ExportAsPrompt.java
r18412 r20924 440 440 // Generate the export.pl command 441 441 ArrayList command_parts_list = new ArrayList(); 442 if ( Utility.isWindows() && (!Gatherer.isGsdlRemote)) {442 if (!Gatherer.isGsdlRemote) { 443 443 command_parts_list.add(Configuration.perl_path); 444 444 command_parts_list.add("-S"); -
gli/trunk/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java
r19228 r20924 352 352 // Generate the convert_coll_from_gs2.pl command 353 353 ArrayList command_parts_list = new ArrayList(); 354 if ( (Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {354 if (!Gatherer.isGsdlRemote) { 355 355 command_parts_list.add(Configuration.perl_path); 356 356 command_parts_list.add("-S"); -
gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java
r18645 r20924 260 260 // Generate the replace_srcdoc_with_html.pl command 261 261 ArrayList command_parts_list = new ArrayList(); 262 if ( Utility.isWindows() && (!Gatherer.isGsdlRemote)) {262 if (!Gatherer.isGsdlRemote) { 263 263 command_parts_list.add(Configuration.perl_path); 264 264 command_parts_list.add("-S"); -
gli/trunk/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java
r18370 r20924 345 345 // Generate the exportcol.pl command 346 346 ArrayList command_parts_list = new ArrayList(); 347 if ( Utility.isWindows() && (!Gatherer.isGsdlRemote)) {347 if (!Gatherer.isGsdlRemote) { 348 348 command_parts_list.add(Configuration.perl_path); 349 349 command_parts_list.add("-S");
Note:
See TracChangeset
for help on using the changeset viewer.