Changeset 9165

Timestamp:

2005-02-24T13:25:34+13:00 (19 years ago)

Author:

mdewsnip

Message:

Now takes accept and reject regular expressions when zipping files, by Matthew Whyte.

File:

• trunk/gsdl/cgi-bin/download (modified) (3 diffs)

trunk/gsdl/cgi-bin/download

@@ -6 +6 @@
 {
     my $gsdl_cgi = new gsdlCGI("+cmdline");
-
 
     my $gsdlhome = $gsdl_cgi->get_config_info("gsdlhome");
@@ -16 +15 @@
 
     my $dir = $gsdl_cgi->clean_param("dir");
-    $dir = "" if ((!defined $dir) || ($dir eq "."));
+    $dir = "\"\"" if ((!defined $dir) || ($dir eq "."));
+
+    my $accept_expr = $gsdl_cgi->clean_param("a");
+    if(($accept_expr eq "") || (!defined $accept_expr)) {
+    $accept_expr = "";
+    print "not using accept";
+    }
+    else {
+    $accept_expr = "-accept " . $accept_expr;
+    }
+
+    my $reject_expr = $gsdl_cgi->clean_param("r");
+    if(($reject_expr eq "") || (!defined $reject_expr)) {
+    $reject_expr = "";
+    print "not using reject";
+    }
+    else {
+    $reject_expr = "-reject " . $reject_expr;
+    }
 
     if ($col =~ m/^\//) { 
@@ -26 +43 @@
     $gsdl_cgi->checked_chdir("$gsdlhome/collect");
     }
-
-    # Change this to Java zip??
-    my $zip_cmd = "zip -r $col.zip $col/$dir";
-    $gsdl_cgi->unix_cmd($zip_cmd);
-
-
+    
+    `java -classpath $gsdlhome/bin/java/SignedGatherer.jar org.greenstone.gatherer.util.Zipup $gsdlhome/ $col $dir $accept_expr $reject_expr`;
+    
     my $pipe_cmd = "cat $col.zip"; # Unix specific
+    
 
     if (open(PIN,"$pipe_cmd |")) {