Changeset 14307

Timestamp:

2007-08-06T10:38:11+12:00 (17 years ago)

Author:

qq6

Message:

zip collectionConfig.xml if parameter 'gsdl3' is found

File:

• gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionShell.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionShell.java

@@ -11 +11 @@
     static public void main(String[] args)
     {
-    if (args.length != 3) {
-        System.err.println("Usage: ZipCollectionShell <zip-file> <collect-directory-path> <collection-name>");
+    if ((args.length < 3) || (args.length > 4)) {
+        System.err.println("Usage: ZipCollectionShell <zip-file> <collect-directory-path> <collection-name> [gsdl3]");
         return;
     }
@@ -19 +19 @@
     String collect_directory_path = args[1];
     String collection_name = args[2];
-
+    String run_gsdl3 ="";
+    if (args.length == 4){
+        run_gsdl3 = args[3];
+    }
     if (!collect_directory_path.endsWith(File.separator)) {
         collect_directory_path += File.separator;
@@ -33 +36 @@
         ZipTools.addFileToZip(zos, collect_directory_path, archives_relative_path, collection_archives_zip_filter);
 
-        // Add etc/collect.cfg file
-        String collect_cfg_relative_path = collection_name + File.separator + "etc" + File.separator + "collect.cfg";
-        ZipTools.addFileToZip(zos, collect_directory_path, collect_cfg_relative_path, null_zip_filter);
-
+        // Add /etc/collect.cfg file for 2 GS2
+        if (run_gsdl3.length()==0){
+        String collect_cfg_relative_path = collection_name + File.separator + "etc" + File.separator + "collect.cfg";
+        ZipTools.addFileToZip(zos, collect_directory_path, collect_cfg_relative_path, null_zip_filter);
+        }
+        // Add /etc/collectConfig.xml file for a GS3
+        if (run_gsdl3.equals("gsdl3")){
+        String collectionConfig_xml_relative_path = collection_name + File.separator + "etc" + File.separator + "collectionConfig.xml";
+        ZipTools.addFileToZip(zos, collect_directory_path, collectionConfig_xml_relative_path, null_zip_filter);
+        }
         // Add images directory
         String images_relative_path = collection_name + File.separator + "images";