Changeset 9388

Timestamp:

2005-03-10T17:03:25+13:00 (19 years ago)

Author:

mdewsnip

Message:

Improvements to upload, by Matthew Whyte.

File:

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

trunk/gsdl/cgi-bin/upload

@@ -1 +1 @@
 #!/usr/bin/perl -w
-
 
 use gsdlCGI;
 
-
 sub main
 {
+
     my $gsdl_cgi = new gsdlCGI();
     my $gsdlhome = $gsdl_cgi->get_config_info("gsdlhome");
@@ -13 +12 @@
     if ((!defined $col) || ($col =~ m/^\s*$/)) {
     $gsdl_cgi->generate_error("No collection name specified");
+    }
+
+    #If the collection dir on the server somehow got erased, create it.
+    if(!-e "$gsdlhome/collect/$col") {
+    `mkdir $gsdlhome/collect/$col`;
     }
 
@@ -39 +43 @@
     my $col_dir = "$col/$dir"; # Unix specific
 
+#    if($delete eq "all") {
+#   $gsdl_cgi->rm_rf($col_dir);
+#    }
+#    elsif($delete eq "files") {
+#   `java -classpath $gsdlhome/bin/java/SignedGatherer.jar org.greenstone.gatherer.util.Delete $gsdlhome/collect/$col_dir -reject "metadata\\.xml"`;
+#    }
+#    elsif($delete eq "metadata") {
+#   `java -classpath $gsdlhome/bin/java/SignedGatherer.jar org.greenstone.gatherer.util.Delete $gsdlhome/collect/$col_dir -accept "metadata\\.xml"`;
+#    }
+    
     if($delete eq "all") {
     $gsdl_cgi->rm_rf($col_dir);
     }
     elsif($delete eq "files") {
-    `cd $gsdlhome/$col_dir ; find -not -name "metadata.xml" -exec rm {} \;`;
+    `cd $gsdlhome/collect/$col_dir; find -not -name "metadata.xml" -exec rm {} \\;`;
     }
     elsif($delete eq "metadata") {
-    `cd $gsdlhome/$col_dir ; find -name "metadata.xml" -exec rm {} \;`;
+    `cd $gsdlhome/collect/$col_dir; find -name "metadata.xml" -exec rm {} \\;`;
     }
 
@@ -70 +84 @@
     close(ZOUT);
 
+    #print STDERR "**** Debug as /tmp/$dir.zip\n";
+    #`cp $zip_fname /tmp/mgw5/$dir.zip`;
+
     `java -classpath $gsdlhome/bin/java/SignedGatherer.jar org.greenstone.gatherer.util.Unzip $gsdlhome/ $zip_fname`;