Changeset 8096

Timestamp:

2004-09-02T14:35:08+12:00 (20 years ago)

Author:

davidb

Message:

Special case code added for a collection name of "/tmp" (or any collection
name beginning with a slash). This is interpreted to mean the top level
gsdl folder, not within 'collect'.

Location:

trunk/gsdl/cgi-bin

Files:

• download (modified) (1 diff)
• upload (modified) (1 diff)

trunk/gsdl/cgi-bin/download

@@ -18 +18 @@
     $dir = "" if ((!defined $dir) || ($dir eq "."));
 
-
-    $gsdl_cgi->checked_chdir("$gsdlhome/collect");
+    if ($col =~ m/^\//) { 
+    # leading / at start denotes special "cols" such as "/tmp"
+    $gsdl_cgi->checked_chdir("$gsdlhome");
+    $col =~ s/^\///;
+    }
+    else {
+    $gsdl_cgi->checked_chdir("$gsdlhome/collect");
+    }
 
     # Change this to Java zip??

trunk/gsdl/cgi-bin/upload

@@ -25 +25 @@
     my $zip_fname = "$col.zip";
 
-    $gsdl_cgi->checked_chdir("$gsdlhome/collect/");
+    if ($col =~ m/^\//) { 
+    # leading / at start denotes special "cols" such as "/tmp"
+    $gsdl_cgi->checked_chdir("$gsdlhome");
+    $col =~ s/^\///;
+    }
+    else {
+    $gsdl_cgi->checked_chdir("$gsdlhome/collect");
+    }
+
     my $col_dir = "$col/$dir"; # Unix specific
     $gsdl_cgi->rm_rf($col_dir);