Changeset 29076 for main/trunk/greenstone3/web/WEB-INF/cgi

Timestamp:

2014-05-22T10:10:23+12:00 (10 years ago)

Author:

kjdon

Message:

these changes were made in the pei-jones site and they look sensible so I am committing them.

File:

• main/trunk/greenstone3/web/WEB-INF/cgi/file-download.pl (modified) (1 diff)

main/trunk/greenstone3/web/WEB-INF/cgi/file-download.pl

@@ -44 +44 @@
         my $collect_dir = $gsdl_cgi->get_collection_dir($site);
         
-        my $dir = &util::filename_cat($collect_dir,$c,"index/assoc");
+        my $dir = &util::filename_cat($collect_dir,$c,"index","assoc");
         
-        my $download_file = "$dir\\$assoc\\$filename";
+        my $download_file = &util::filename_cat($dir,$assoc,$filename);
 
-        open(DOWNLOAD_FILE, "<$download_file") or die "$!";
+        open(DOWNLOAD_FILE, "<$download_file") or die "Failed to open file $download_file\n $!";
         binmode DOWNLOAD_FILE;
         @fileholder = <DOWNLOAD_FILE>;