Changeset 10252 for trunk/gsdl

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.

File:

• trunk/gsdl/cgi-bin/upload (modified) (4 diffs)

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");
     }
 }