Changeset 10252

Timestamp:

2005-07-19T10:50:57+12:00 (19 years ago)

Author:

mdewsnip

Message:

Unzip.java now takes the zip file path and the directory to unzip into as arguments. This more general functionality is necessary for the West Yorkshire stuff.

The upload script has been changed accordingly, and tidied up a bit.

Location:

trunk

Files:

• gli/src/org/greenstone/gatherer/util/Unzip.java (modified) (4 diffs)
• gsdl/cgi-bin/upload (modified) (4 diffs)

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

@@ -8 +8 @@
  * <BR><BR>
  *
- * Author: David Bainbridge, Greenstone Digital Library, University of Waikato
+ * Author: David Bainbridge, NZDL Project, University of Waikato
  *
  * <BR><BR>
  *
- * Copyright (C) 1999 New Zealand Digital Library Project
+ * Copyright (C) 2005 New Zealand Digital Library Project
  *
  * <BR><BR>
@@ -59 +59 @@
     }
 
+
     static public void main(String[] args) 
     {
-    Enumeration entries;
-    ZipFile zipFile;
-
-    if(args.length != 2) {
-        System.err.println("Usage: Unzip gsdlhome zipfile");
+    if (args.length != 2) {
+        System.err.println("Usage: Unzip <zip-file> <destination-directory>");
         return;
     }
 
-    String gsdl_home = args[0];
-
-    if (!gsdl_home.endsWith(File.separator)) {
-        gsdl_home += File.separator;
+    String zip_file_path = args[0];
+    // System.err.println("Zip file path: " + zip_file_path);
+    String destination_directory_path = args[1];
+    if (!destination_directory_path.endsWith(File.separator)) {
+        destination_directory_path += File.separator;
     }
-
-    String col_dir = gsdl_home + "collect" + File.separator;
-
-    String zip_fname = args[1];
+    // System.err.println("Destination directory path: " + destination_directory_path);
 
     try {
-        zipFile = new ZipFile(zip_fname);
+        ZipFile zipFile = new ZipFile(zip_file_path);
 
-        entries = zipFile.entries();
+        Enumeration entries = zipFile.entries();
+        while (entries.hasMoreElements()) {
+        ZipEntry entry = (ZipEntry) entries.nextElement();
 
-        while(entries.hasMoreElements()) {
-        ZipEntry entry = (ZipEntry)entries.nextElement();
-
-        if(entry.isDirectory()) {
+        if (entry.isDirectory()) {
             // Assume directories are stored parents first then children.
             // System.err.println("Extracting directory: " + entry.getName());
             // This is not robust, just for demonstration purposes.
             String dir_name = entry.getName();
-            String full_dir_name = col_dir + dir_name;
+            String full_dir_name = destination_directory_path + dir_name;
+            // System.err.println("Full directory name: " + full_dir_name);
             File dirFile = new File(full_dir_name);
             dirFile.mkdir();
@@ -99 +95 @@
             // System.err.println("Extracting file: " + entry.getName());
             String file_name = entry.getName();
-            String full_file_name = col_dir + file_name;
+            String full_file_name = destination_directory_path + file_name;
+            // System.err.println("Full file name: " + full_file_name);
             FileOutputStream fos = new FileOutputStream(full_file_name);
             BufferedOutputStream bos = new BufferedOutputStream(fos);
@@ -108 +105 @@
 
         zipFile.close();
-    } 
+    }
     catch (ZipException error) {
-        System.err.println("Error: Unable to open '"+zip_fname+"'");
-        System.err.println("This maybe caused by the zip file being empty.");
+        System.err.println("Error: Unable to open '" + zip_file_path + "'");
+        System.err.println("This may be caused by the zip file being empty.");
         error.printStackTrace();
     }
-
-    catch (IOException ioe) {
-        System.err.println("Unhandled exception on " + gsdl_home + " " + zip_fname);
-        ioe.printStackTrace();
-        return;
-    }
-
-    catch (Exception error) {
-        error.printStackTrace();
+    catch (Exception exception) {
+        exception.printStackTrace();
     }
     }

trunk/gsdl/cgi-bin/upload

@@ -41 +41 @@
     $dir = "" if (($dir eq ".") || ($dir =~ m/^\.\./));
 
-    my $zip_content = $gsdl_cgi->clean_param("zip");
-    my $zip_fname = "$col.zip";
-
-    if ($col =~ m/^\//) { 
+    if ($col =~ m/^\//) {
     # leading / at start denotes special "cols" such as "/tmp"
     $gsdl_cgi->checked_chdir("$gsdlhome");
@@ -74 +71 @@
     }
 
-    if (open(ZOUT,"> $zip_fname")) {
+    my $zip_file_name = $col . ".zip";
+    my $zip_file_path = &util::filename_cat($full_col_dir, $zip_file_name);
+    if (open(ZOUT, ">$zip_file_path")) {
     binmode(ZOUT);
 
@@ -96 +95 @@
                         "SignedGatherer.jar");
 
-    my $java_cmd = "$java -classpath \"$classpath\" org.greenstone.gatherer.util.Unzip \"$gsdlhome\" \"$zip_fname\"";
+    my $java_cmd = "$java -classpath \"$classpath\" org.greenstone.gatherer.util.Unzip \"$zip_file_path\" \"$full_col_dir\"";
+    $gsdl_cgi->generate_ok_message("Command: $java_cmd\n");
 
     my $java_output = `$java_cmd`;
     
     my $status = $?;
-    unlink "$zip_fname";
+    unlink "$zip_file_path";
 
-    if ($status>0) {
+    if ($status > 0) {
         $status = $status/256;
         my $exit_status = "Exit status: $status\n";
@@ -113 +113 @@
     }
     else {
-    $gsdl_cgi->generate_error("unable to open $zip_fname");
+    $gsdl_cgi->generate_error("unable to open $zip_file_path");
     }
 }