Changeset 9894

Timestamp:

2005-05-17T13:14:52+12:00 (19 years ago)

Author:

davidb

Message:

Code was hardwired to work only in "collect/" directory. This restriction
has been removed.

Location:

trunk/gli/src/org/greenstone/gatherer/util

Files:

• Utility.java (modified) (2 diffs)
• Zipup.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -818 +818 @@
     static public boolean zipup(String col_dir, String col_name, String dir_or_file, GShell source, String accept_expr, String reject_expr)
     {
+    if (!col_dir.endsWith(File.separator)) {
+        col_dir += File.separator;
+    }
+
     int prefix_strip = col_dir.length();
     boolean encountered_file = false;
@@ -872 +876 @@
     static public void unzip(String col_dir, String col_name)
     {
+    if (!col_dir.endsWith(File.separator)) {
+        col_dir += File.separator;
+    }
+
     String zip_fname = col_dir + col_name + ".zip";
     int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;

trunk/gli/src/org/greenstone/gatherer/util/Zipup.java

@@ -62 +62 @@
     
     boolean metadata_only = false;
-    String gsdl_home = args[0];
+    String base_dir = args[0];
     String collection = args[1];
     String directory = args[2];
@@ -88 +88 @@
         }
     }     
-           
-    Utility.zipup(gsdl_home + "collect/", collection, directory, null, accept_expr, reject_expr);
+
+    Utility.zipup(base_dir, collection, directory, null, accept_expr, reject_expr);
     }
 }