Changeset 9203

Timestamp:

2005-02-28T11:45:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

More changes to GLI applet, by Matthew Whyte.

File:

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

trunk/gsdl/cgi-bin/upload

@@ -7 +7 @@
 sub main
 {
+
     my $gsdl_cgi = new gsdlCGI();
     my $gsdlhome = $gsdl_cgi->get_config_info("gsdlhome");
@@ -19 +20 @@
     $gsdl_cgi->generate_error("No directory name specified");
     }
+
+    my $delete = $gsdl_cgi->clean_param("del");
+    $delete = "all" if((!defined $delete) || ($delete eq ""));
 
     $dir = "" if (($dir eq ".") || ($dir =~ m/^\.\./));
@@ -35 +39 @@
 
     my $col_dir = "$col/$dir"; # Unix specific
-    $gsdl_cgi->rm_rf($col_dir);
+
+    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 {} \;`;
+    }
+    elsif($delete eq "metadata") {
+    `cd $gsdlhome/$col_dir ; find -name "metadata.xml" -exec rm {} \;`;
+    }
+
     if (!-e $col_dir) {
     my $mkdir_cmd = "mkdir $col_dir";
     $gsdl_cgi->unix_cmd($mkdir_cmd);
     }
-
+    
     if (open(ZOUT,"> $zip_fname")) {
     
@@ -57 +71 @@
     close(ZOUT);
 
-
-##  print STDERR "**** Debug as /tmp/XXX.zip\n";
-##  `cp $zip_fname /tmp/XXX.zip`;
-
     `java -classpath $gsdlhome/bin/java/SignedGatherer.jar org.greenstone.gatherer.util.Unzip $gsdlhome/ $zip_fname`;
 
@@ -73 +83 @@
 
 &main();
-