Changeset 29076

Show
Ignore:
Timestamp:
22.05.2014 10:10:23 (6 years ago)
Author:
kjdon
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/WEB-INF/cgi/file-download.pl

    r28193 r29076  
    4444        my $collect_dir = $gsdl_cgi->get_collection_dir($site); 
    4545         
    46         my $dir = &util::filename_cat($collect_dir,$c,"index/assoc"); 
     46        my $dir = &util::filename_cat($collect_dir,$c,"index","assoc"); 
    4747         
    48         my $download_file = "$dir\\$assoc\\$filename"; 
     48        my $download_file = &util::filename_cat($dir,$assoc,$filename); 
    4949 
    50         open(DOWNLOAD_FILE, "<$download_file") or die "$!"; 
     50        open(DOWNLOAD_FILE, "<$download_file") or die "Failed to open file $download_file\n $!"; 
    5151        binmode DOWNLOAD_FILE; 
    5252        @fileholder = <DOWNLOAD_FILE>;