Changeset 15155

Timestamp:

2008-03-29T18:12:44+13:00 (16 years ago)

Author:

ak19

Message:

When calling mkcol to create a new collection, no longer add empty string argument if -gs3mode not applicable. Empty string argument will cause problems when using Java's Process.exec with multi-arguments.

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1119 +1119 @@
     }
     command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "mkcol.pl");
-    command_parts_list.add((Gatherer.GS3) ? Utility.GS3MODE_ARGUMENT : "");// add '-gs3mode' 
+    if(Gatherer.GS3) {
+        command_parts_list.add(Utility.GS3MODE_ARGUMENT); // add '-gs3mode' 
+    }
 
     command_parts_list.add("-collectdir");
@@ -1136 +1138 @@
     // Run the mkcol.pl command
     String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+    //for(int i = 0; i < command_parts.length; i++) {
+    ///ystem.err.println("\""+command_parts[i]+"\"");
+    //}
     
     GShell process = new GShell(command_parts, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);