Changeset 25539 for main/trunk

Timestamp:

2012-05-08T09:51:17+12:00 (12 years ago)

Author:

sjm84

Message:

Updated the import command to include the ability to add a manifest file

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -24 +24 @@
 public class GS2PerlConstructor extends CollectionConstructor
 {
-
     public static final int NEW = 0;
     public static final int IMPORT = 1;
@@ -120 +119 @@
             break;
         }
-
     }
 
@@ -147 +145 @@
     {
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: import collection."));
-        Vector command = new Vector();
-        command.add("import.pl");
+        Vector<String> command = new Vector<String>();
+        command.add(GlobalProperties.getProperty("perl.path", "perl"));
+        command.add("-S");
+        command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "import.pl");
+        if (this.manifest_file != null)
+        {
+            command.add("-keepold");
+            command.add("-manifest");
+            command.add(this.manifest_file);
+        }
+        command.add("-site");
+        command.add(this.site_name);
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
@@ -166 +174 @@
     {
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: build collection."));
-        Vector command = new Vector();
+        Vector<String> command = new Vector<String>();
         command.add(GlobalProperties.getProperty("perl.path", "perl"));
         command.add("-S");