Changeset 27916 for main/trunk/greenstone2/perllib/plugins/ZIPPlugin.pm

Timestamp:

2013-07-22T15:07:19+12:00 (11 years ago)

Author:

ak19

Message:

1. Reference to undefined variable. 2. Using FileUtils:: subroutines in place of deprecated utils:: ones.

File:

• main/trunk/greenstone2/perllib/plugins/ZIPPlugin.pm (modified) (9 diffs)

main/trunk/greenstone2/perllib/plugins/ZIPPlugin.pm

@@ -49 +49 @@
 use plugin;
 use util;
+use FileUtils;
 use Cwd;
 
@@ -131 +132 @@
     $tmpdir =~ s/\.[^\.]*//;
     $tmpdir = &util::rename_file($tmpdir, $self->{'file_rename_method'});
-    $tmpdir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp", $tmpdir);
-    &util::mk_all_dir ($tmpdir);
+    $tmpdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp", $tmpdir);
+    &FileUtils::makeAllDirectories() ($tmpdir);
     
     print $outhandle "ZIPPlugin: extracting $filename_no_path to $tmpdir\n"
@@ -140 +141 @@
     my $cwd = cwd();
     chdir ($tmpdir) || die "Unable to change to $tmpdir";
-    &util::cp ($filename_full_path, $tmpdir);
+    &FileUtils::copyFiles ($filename_full_path, $tmpdir);
     
     if ($file =~ /\.bz$/i) {
@@ -173 +174 @@
     &metadatautil::combine_metadata_structures($this_metadata, $metadata);
     my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $block_hash, $this_metadata, $processor, $maxdocs, $total_count, $gli);
-    &util::rm_r ($tmpdir);
+    &FileUtils::removeFilesRecursive ($tmpdir);
     
     $self->{'num_archives'} ++;
@@ -187 +188 @@
     if (system ("bunzip \"$file\"")!=0)
     {
-    &util::rm ($file);
+    &FileUtils::removeFiles ($file);
     }
 }
@@ -197 +198 @@
     if (system ("bunzip2 \"$file\"")!=0)
     {
-    &util::rm ($file);
+    &FileUtils::removeFiles ($file);
     }
 }
@@ -206 +207 @@
 
     system ("unzip \"$file\"");
-    &util::rm ($file) if -e $file;
+    &FileUtils::removeFiles ($file) if -e $file;
 }
 
@@ -214 +215 @@
 
     system ("tar xf \"$file\"");
-    &util::rm ($file) if -e $file;
+    &FileUtils::removeFiles ($file) if -e $file;
 }
 
@@ -223 +224 @@
     if (system ("gunzip \"$file\"")!=0)
     {
-    &util::rm ($file);
+    &FileUtils::removeFiles ($file);
     };
 }