Changeset 5076

Timestamp:

2003-08-01T14:46:01+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed problem with import directory argument that was passed to perl ending with an escape character under windows - changes to line no. 711-715, 723, 730

File:

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

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

@@ -107 +107 @@
 
     /** The name of the standard lock file. */
-    static final public String LOCK_FILE = "gatherer.lck";
+    static final public String LOCK_FILE = "gli.lck";
     static final public int NO_SPECIAL_CASE = -1;
     static final public int SPECIAL_DLS = 0;
@@ -709 +709 @@
     else {
         importing = true;
+        // Remove erroneous file windows file separator as it causes problems when running import.pl
+        String collection_import = getCollectionImport();
+        if(collection_import.length() > 2 && collection_import.endsWith("\\")) {
+        collection_import = collection_import.substring(0, collection_import.length() - 1);
+        }
         String args[];
         if(Utility.isWindows()) {
@@ -716 +721 @@
         args[2] = Gatherer.config.getScriptPath() + "import.pl";
         args[3] = "-importdir";
-        args[4] = getCollectionImport();
+        args[4] = collection_import;
         args[5] = collection.getName();
         }
@@ -723 +728 @@
         args[0] = Gatherer.config.getScriptPath() + "import.pl";
         args[1] = "-importdir";
-        args[2] = getCollectionImport();
+        args[2] = collection_import;
         args[3] = collection.getName();
         }
+        collection_import = null;
         args = ArrayTools.add(args, collection.build_options.getImportValues());
         GShell shell = new GShell(args, GShell.IMPORT, Message.BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);