Changeset 27306 for main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.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/GreenstoneXMLPlugin.pm (modified) (4 diffs)

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

@@ -36 +36 @@
 
 use ReadXMLFile;
+use util;
+use FileUtils;
 
 use strict;
@@ -118 +120 @@
 
         my $dirname = dirname($filename_full_path);
-        my $full_gsdl_assoc_filename = &util::filename_cat($dirname,$gsdl_assoc_file);
+        my $full_gsdl_assoc_filename = &FileUtils::filenameConcatenate($dirname,$gsdl_assoc_file);
         if ($self->{'verbosity'}>2) {
             print $outhandle "  Storing block list item: $full_gsdl_assoc_filename\n";
@@ -316 +318 @@
           {
             # And if not, append it so as to make this absolute
-            $assoc_filepath = &util::filename_cat($self->{'base_dir'}, $assoc_filepath);
+            $assoc_filepath = &FileUtils::filenameConcatenate($self->{'base_dir'}, $assoc_filepath);
           }
       }
@@ -331 +333 @@
         #rint STDERR "mime_type: $mime_type\n";
         #rint STDERR "dir: $dir\n";
-    my $real_dir = &util::filename_cat($assoc_filepath, $assoc_file),
+    my $real_dir = &FileUtils::filenameConcatenate($assoc_filepath, $assoc_file),
     my $assoc_dir = (defined $dir && $dir ne "") 
-        ? &util::filename_cat($dir, $assoc_file) : $assoc_file;
+        ? &FileUtils::filenameConcatenate($dir, $assoc_file) : $assoc_file;
     $self->{'doc_obj'}->associate_file($real_dir, $assoc_dir, $mime_type);
         #rint STDERR "According to me the real assoc_filepath is: $real_dir\n";