Changeset 20924 for gli/trunk/src/org/greenstone/gatherer/gui

Timestamp:

2009-11-10T20:49:48+13:00 (14 years ago)

Author:

oranfry

Message:

Since we can now have a Perl installation inside Greenstone on linux as well, GLI code for Linux also launches perl with the -S flag.

Location:

gli/trunk/src/org/greenstone/gatherer/gui

Files:

• DownloadPane.java (modified) (1 diff)
• ExplodeMetadataDatabasePrompt.java (modified) (1 diff)
• ExportAsPrompt.java (modified) (1 diff)
• OpenCollectionDialog.java (modified) (1 diff)
• ReplaceSrcDocWithHtmlPrompt.java (modified) (1 diff)
• WriteCDImagePrompt.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -238 +238 @@
         ArrayList args_list = new ArrayList();
         String args[] = null;
-        if(Utility.isWindows()) {
-            if(Configuration.perl_path != null) {
-            args_list.add(Configuration.perl_path);
-            }
-            else {
-            args_list.add("Perl.exe");
-            }
-        }
+        if(Configuration.perl_path != null) {
+            args_list.add(Configuration.perl_path);
+        } else if(Utility.isWindows()) {
+            args_list.add("Perl.exe");
+        } else {
+            args_list.add("perl");
+        }
+        args_list.add("-S");
         args_list.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadinfo.pl");
         args_list.add("-xml");

gli/trunk/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -258 +258 @@
     // Generate the explode_metadata_database.pl command
     ArrayList command_parts_list = new ArrayList();
-    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+    if (!Gatherer.isGsdlRemote) {
         command_parts_list.add(Configuration.perl_path);
         command_parts_list.add("-S");

gli/trunk/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

@@ -440 +440 @@
     // Generate the export.pl command
     ArrayList command_parts_list = new ArrayList();
-    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+    if (!Gatherer.isGsdlRemote) {
         command_parts_list.add(Configuration.perl_path);
         command_parts_list.add("-S");

gli/trunk/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -352 +352 @@
         // Generate the convert_coll_from_gs2.pl command
         ArrayList command_parts_list = new ArrayList();
-        if ((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+        if (!Gatherer.isGsdlRemote) {
             command_parts_list.add(Configuration.perl_path);
             command_parts_list.add("-S");

gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

@@ -260 +260 @@
     // Generate the replace_srcdoc_with_html.pl command
     ArrayList command_parts_list = new ArrayList();
-    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+    if (!Gatherer.isGsdlRemote) {
         command_parts_list.add(Configuration.perl_path);
         command_parts_list.add("-S");

gli/trunk/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

@@ -345 +345 @@
     // Generate the exportcol.pl command
     ArrayList command_parts_list = new ArrayList();
-    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+    if (!Gatherer.isGsdlRemote) {
         command_parts_list.add(Configuration.perl_path);
         command_parts_list.add("-S");