Changeset 27306 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2013-05-06T15:29:38+12:00 (11 years ago)

Author:

jmt12

Message:

Moving the critical file-related functions (copy, rm, etc) out of util.pm into their own proper class FileUtils. Use of the old functions in util.pm will prompt deprecated warning messages. There may be further functions that could be moved across in the future, but these are the critical ones when considering supporting other filesystems (HTTP, HDFS, WebDav, etc). Updated some key files to use the new functions so now deprecated messages thrown when importing/building demo collection 'out of the box'

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (8 diffs)

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

@@ -34 +34 @@
 use plugin;
 use util;
+use FileUtils;
 use metadatautil;
 
@@ -294 +295 @@
     # that it is not explicitly blocked.
     my $dirname = $file;
-    $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+    $dirname = &FileUtils::filenameConcatenate($base_dir, $file) if $base_dir =~ /\w/;
 
     my $directory_ok = $self->check_directory_path($dirname);
@@ -329 +330 @@
 
     my $this_file_base_dir = $base_dir;
-    my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
+    my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile);
 
     # Recursively read each $raw_subfile
@@ -381 +382 @@
     } else {
     $dirname = $file;
-    $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+    $dirname = &FileUtils::filenameConcatenate($base_dir, $file) if $base_dir =~ /\w/;
     }
     
@@ -412 +413 @@
     # Re-order the files in the list so any directories ending with .all are moved to the end
     for (my $i = scalar(@dir) - 1; $i >= 0; $i--) {
-    if (-d &util::filename_cat($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {
+    if (-d &FileUtils::filenameConcatenate($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {
         push(@dir, splice(@dir, $i, 1));
     }
@@ -461 +462 @@
     my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
 
-    my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
-    my $raw_full_filename = &util::filename_cat($this_file_base_dir, $raw_file_subfile);
+    my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile);
+    my $raw_full_filename = &FileUtils::filenameConcatenate($this_file_base_dir, $raw_file_subfile);
 
     if ($self->file_is_blocked($block_hash,$raw_full_filename)) {
@@ -542 +543 @@
     my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
 
-    my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
+    my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile);
     my $raw_full_filename 
-        = &util::filename_cat($this_file_base_dir,$raw_file_subfile);
+        = &FileUtils::filenameConcatenate($this_file_base_dir,$raw_file_subfile);
 
     if ($self->file_is_blocked($block_hash,$raw_full_filename)) {
@@ -554 +555 @@
     if ($raw_subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {
         require Win32::Shortcut;
-        my $shortcut = new Win32::Shortcut(&util::filename_cat($dirname, $raw_subfile));
+        my $shortcut = new Win32::Shortcut(&FileUtils::filenameConcatenate($dirname, $raw_subfile));
         if ($shortcut) {
         # The file to be processed is now the target of the shortcut