From: dpvc v. a. <we...@ma...> - 2005-09-20 23:42:09
|
Log Message: ----------- Fixed a problem with reporting the directories where files with given types should be uploaded. Modified Files: -------------- webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor: FileManager.pm Revision Data ------------- Index: FileManager.pm =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -Llib/WeBWorK/ContentGenerator/Instructor/FileManager.pm -Llib/WeBWorK/ContentGenerator/Instructor/FileManager.pm -u -r1.14 -r1.15 --- lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm +++ lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm @@ -1047,11 +1047,12 @@ sub checkFileLocation { my $self = shift; my $extension = shift; $extension =~ s/.*\.//; - my $dir = shift; - return unless defined($uploadDir{$extension}); - return if $dir =~ m/^$uploadDir{$extension}$/; - $dir = $uploadDir{$extension}; $dir =~ s!/\.\*!!; - $self->addbadmessage("Files with extension '.$extension' usually belong in '$dir'"); + my $dir = shift; my $location = $uploadDir{$extension}; + return unless defined($location); + return if $dir =~ m/^$location$/; + $location =~ s!/\.\*!!; + return if $dir =~ m/^$location$/; + $self->addbadmessage("Files with extension '.$extension' usually belong in '$location'"); } ################################################## |