- Timestamp:
- 2013-07-22T15:07:19+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/ZIPPlugin.pm
r25508 r27916 49 49 use plugin; 50 50 use util; 51 use FileUtils; 51 52 use Cwd; 52 53 … … 131 132 $tmpdir =~ s/\.[^\.]*//; 132 133 $tmpdir = &util::rename_file($tmpdir, $self->{'file_rename_method'}); 133 $tmpdir = & util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp", $tmpdir);134 & util::mk_all_dir($tmpdir);134 $tmpdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp", $tmpdir); 135 &FileUtils::makeAllDirectories() ($tmpdir); 135 136 136 137 print $outhandle "ZIPPlugin: extracting $filename_no_path to $tmpdir\n" … … 140 141 my $cwd = cwd(); 141 142 chdir ($tmpdir) || die "Unable to change to $tmpdir"; 142 & util::cp($filename_full_path, $tmpdir);143 &FileUtils::copyFiles ($filename_full_path, $tmpdir); 143 144 144 145 if ($file =~ /\.bz$/i) { … … 173 174 &metadatautil::combine_metadata_structures($this_metadata, $metadata); 174 175 my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $block_hash, $this_metadata, $processor, $maxdocs, $total_count, $gli); 175 & util::rm_r($tmpdir);176 &FileUtils::removeFilesRecursive ($tmpdir); 176 177 177 178 $self->{'num_archives'} ++; … … 187 188 if (system ("bunzip \"$file\"")!=0) 188 189 { 189 & util::rm($file);190 &FileUtils::removeFiles ($file); 190 191 } 191 192 } … … 197 198 if (system ("bunzip2 \"$file\"")!=0) 198 199 { 199 & util::rm($file);200 &FileUtils::removeFiles ($file); 200 201 } 201 202 } … … 206 207 207 208 system ("unzip \"$file\""); 208 & util::rm($file) if -e $file;209 &FileUtils::removeFiles ($file) if -e $file; 209 210 } 210 211 … … 214 215 215 216 system ("tar xf \"$file\""); 216 & util::rm($file) if -e $file;217 &FileUtils::removeFiles ($file) if -e $file; 217 218 } 218 219 … … 223 224 if (system ("gunzip \"$file\"")!=0) 224 225 { 225 & util::rm($file);226 &FileUtils::removeFiles ($file); 226 227 }; 227 228 }
Note:
See TracChangeset
for help on using the changeset viewer.