Changeset 10874 for branches/gsdl-2_62-distribution-branch/gsdl/cgi-bin/upload

Timestamp:

2005-11-09T14:09:09+13:00 (18 years ago)

Author:

kjdon

Message:

upload now unzips everything in the collect directory - when the zip files are created, they contain eg collname/etc/collect.cfg

File:

• branches/gsdl-2_62-distribution-branch/gsdl/cgi-bin/upload (modified) (5 diffs)

branches/gsdl-2_62-distribution-branch/gsdl/cgi-bin/upload

@@ -24 +24 @@
     }
 
+    my $collect_dir = &util::filename_cat($gsdlhome,"collect");
     my $full_col = &util::filename_cat($gsdlhome,"collect",$col);
-
     #If the collection dir on the server somehow got erased, create it.
     if(!-e $full_col) {
@@ -35 +35 @@
     $gsdl_cgi->generate_error("No directory name specified");
     }
-
     my $delete = $gsdl_cgi->clean_param("del");
     $delete = "all" if((!defined $delete) || ($delete eq ""));
@@ -52 +51 @@
     my $col_dir = &util::filename_cat($col,$dir);
     my $full_col_dir = &util::filename_cat($full_col,$dir);
-
     if($delete eq "all") {
     $gsdl_cgi->local_rm_r($col_dir);
@@ -72 +70 @@
 
     my $zip_file_name = $col . ".zip";
-    my $zip_file_path = &util::filename_cat($full_col_dir, $zip_file_name);
+    #my $zip_file_path = &util::filename_cat($full_col_dir, $zip_file_name);
+    my $zip_file_path = &util::filename_cat($collect_dir, $zip_file_name);
     if (open(ZOUT, ">$zip_file_path")) {
     binmode(ZOUT);
@@ -95 +94 @@
                         "SignedGatherer.jar");
 
-    my $java_cmd = "$java -classpath \"$classpath\" org.greenstone.gatherer.util.Unzip \"$zip_file_path\" \"$full_col_dir\"";
+    #my $java_cmd = "$java -classpath \"$classpath\" org.greenstone.gatherer.util.Unzip \"$zip_file_path\" \"$full_col_dir\"";
+    my $java_cmd = "$java -classpath \"$classpath\" org.greenstone.gatherer.util.Unzip \"$zip_file_path\" \"$collect_dir\"";
     $gsdl_cgi->generate_ok_message("Command: $java_cmd\n");