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

main/trunk/greenstone2/perllib/doc.pm

@@ -37 +37 @@
 use unicode;
 use util;
+use FileUtils;
 use ghtml;
 use File::stat;
@@ -89 +90 @@
     $self->{'terse_source_path'} = $source_filename;
 
+        # Use the FileUtil library methods as they are aware of more special
+        # cases such as HDFS [jmt12]
+    ##if (&util::file_exists($source_filename)) {
     if (-e $source_filename) {
         # See if we can do better for Windows with a filename
@@ -241 +245 @@
 #    print STDERR "-> $srcfilename -> ";
 #    $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method);
-#    $source_filename = &util::filename_cat($dirname, $srcfilename);
+#    $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename);
 #    print STDERR "$source_filename\n";
     
@@ -257 +261 @@
 #    print STDERR "-> $srcfilename -> ";
     $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method);
-    $source_filename = &util::filename_cat($dirname, $srcfilename);
+    $source_filename = &FileUtils::filenameConcatenate($dirname, $srcfilename);
 
     return $source_filename;
@@ -304 +308 @@
     }
 
-    if (!&util::filename_is_absolute($filename)) {
-    $filename = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);
+    if (!&FileUtils::isFilenameAbsolute($filename)) {
+    $filename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$filename);
     }
 
@@ -367 +371 @@
     my $osexe = &util::get_os_exe();
 
-    my $hashfile_exe = &util::filename_cat($ENV{'GSDLHOME'},"bin",
+    my $hashfile_exe = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin",
                        $ENV{'GSDLOS'},"hashfile$osexe");