Changeset 9755 for trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataPrompt.java

Timestamp:

2005-04-27T11:17:29+12:00 (19 years ago)

Author:

mdewsnip

Message:

Replaced all the nonsense where string arrays were created for running perl scripts with array lists. This removes a lot of duplicated code where the same things were added in different cases, and the silly (and error-prone) "new String[11]"s.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataPrompt.java (modified) (2 diffs)

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

@@ -53 +53 @@
 import org.greenstone.gatherer.shell.GShellEvent;
 import org.greenstone.gatherer.shell.GShellListener;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
@@ -226 +225 @@
     }
 
-    private int explodeMetadata() {
-
-    String [] args;
+    private int explodeMetadata()
+    {
     if (Gatherer.isGsdlRemote) {
         // what here??
         return -1;
     }
-    if(Utility.isWindows()){
-        args = new String[5];
-        args[0] = Configuration.perl_path;
-        args[1] = "-S";
-        args[2] = Configuration.getScriptPath() + "explode_metadata_database.pl";
-        args[3] = "-plugin";
-        args[4] = plugin_name;
-    } else {
-        args = new String[3];
-        args[0] = Configuration.getScriptPath() + "explode_metadata_database.pl";
-        args[1] = "-plugin";
-        args[2] = plugin_name;
-
-    }
-    // add in all the options from the user
-    args = ArrayTools.add(args, options.getValues());
-    // add in the filename
-    args = ArrayTools.add(args, metadata_file.getPath());
-
+
+    // Generate the explode_metadata_database.pl command
+    ArrayList command_parts_list = new ArrayList();
+    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+        command_parts_list.add(Configuration.perl_path);
+        command_parts_list.add("-S");
+    }
+    command_parts_list.add(Configuration.getScriptPath() + "explode_metadata_database.pl");
+    command_parts_list.add("-plugin");
+    command_parts_list.add(plugin_name);
+
+    // Add in all the options from the user
+    String[] explode_options = options.getValues();
+    for (int i = 0; i < explode_options.length; i++) {
+        command_parts_list.add(explode_options[i]);
+    }
+
+    // Add in the filename
+    command_parts_list.add(metadata_file.getPath());
+
+    // Run the explode_metadata_database.pl command
+    String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
     this.error_message = new StringBuffer();
-    GShell process = new GShell(args, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
+    GShell process = new GShell(command_parts, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
     //process.start();
     process.run();