oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename global sort variables

Browse source
This commit is contained in:
Colin Kuskie 2005-11-08 17:11:53 +00:00
parent c76d4b91e2
commit 8aec38fffe
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/WebGUI/Storage.pm
View file

@ -153,19 +153,19 @@ sub addFileFromFilesystem {
if (-d $pathToFile) { if (-d $pathToFile) {
WebGUI::ErrorHandler::error($pathToFile." is a directory, not a file."); WebGUI::ErrorHandler::error($pathToFile." is a directory, not a file.");
} else { } else {
$a = FileHandle->new($pathToFile,"r"); my $source = FileHandle->new($pathToFile,"r");
if (defined $a) { if (defined $source) {
binmode($a); binmode($source);
$b = FileHandle->new(">".$self->getPath($filename)); $dest = FileHandle->new(">".$self->getPath($filename));
if (defined $b) { if (defined $dest) {
binmode($b); binmode($dest);
cp($a,$b) or $self->_addError("Couldn't copy $pathToFile to ".$self->getPath($filename).": $!"); cp($source,$dest) or $self->_addError("Couldn't copy $pathToFile to ".$self->getPath($filename).": $!");
$b->close; $dest->close;
} else { } else {
$self->_addError("Couldn't open file ".$self->getPath($filename)." for writing due to error: ".$!); $self->_addError("Couldn't open file ".$self->getPath($filename)." for writing due to error: ".$!);
$filename = undef; $filename = undef;
} }
$a->close; $source->close;
} else { } else {
$self->_addError("Couldn't open file ".$pathToFile." for reading due to error: ".$!); $self->_addError("Couldn't open file ".$pathToFile." for reading due to error: ".$!);
$filename = undef; $filename = undef;
@ -300,16 +300,16 @@ sub copy {
my $newStorage = WebGUI::Storage->create; my $newStorage = WebGUI::Storage->create;
my $filelist = $self->getFiles; my $filelist = $self->getFiles;
foreach my $file (@{$filelist}) { foreach my $file (@{$filelist}) {
$a = FileHandle->new($self->getPath($file),"r"); $source = FileHandle->new($self->getPath($file),"r");
if (defined $a) { if (defined $source) {
binmode($a); binmode($source);
$b = FileHandle->new(">".$newStorage->getPath($file)); $dest = FileHandle->new(">".$newStorage->getPath($file));
if (defined $b) { if (defined $dest) {
binmode($b); binmode($dest);
cp($a,$b) or $self->_addError("Couldn't copy file ".$self->getPath($file)." to ".$newStorage->getPath($file)." because ".$!); cp($source,$dest) or $self->_addError("Couldn't copy file ".$self->getPath($file)." to ".$newStorage->getPath($file)." because ".$!);
$b->close; $dest->close;
} }
$a->close; $source->close;
} }
} }
return $newStorage; return $newStorage;