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

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -36 +36 @@
 use printusage;
 use parse2;
-
+use util;
+use FileUtils;
 
 # suppress the annoying "subroutine redefined" warning that various
@@ -509 +510 @@
         my $output_dir = $self->get_output_dir();
         &util::mk_all_dir ($output_dir) unless -e $output_dir;
-        my $doc_file = &util::filename_cat ($output_dir, $doc_dir, "doc.xml");
-        my $short_doc_file = &util::filename_cat ($doc_dir, "doc.xml");
+        my $doc_file = &FileUtils::filenameConcatenate($output_dir, $doc_dir, "doc.xml");
+        my $short_doc_file = &FileUtils::filenameConcatenate($doc_dir, "doc.xml");
         
         if ($gs_count>0)
@@ -590 +591 @@
 
     if (!defined $self->{'group'} || !$self->{'group'}){
-    &util::mk_all_dir (&util::filename_cat ($working_dir, $doc_dir));
+    &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir));
     }
 
@@ -619 +620 @@
        }
    } while ($doc_dir_rest ne "" && 
-        ((-d &util::filename_cat ($working_dir, "$doc_dir.dir")) || 
+        ((-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) || 
          ($working_info->size() >= 1024 && $doc_dir_num < 2)));
    my $i = 1;
    my $doc_dir_base = $doc_dir;
-   while (-d &util::filename_cat ($working_dir, "$doc_dir.dir")) {
+   while (-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) {
        $doc_dir = "$doc_dir_base-$i";
        $i++;
@@ -642 +643 @@
     &util::mk_all_dir ($output_dir) unless -e $output_dir;
       
-    my $working_dir = &util::filename_cat($output_dir, $doc_dir);
+    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
     &util::mk_all_dir ($working_dir) unless -e $working_dir;
 
@@ -662 +663 @@
      
     if ($source_filename !~ /^$dirsep_regexp/) {
-        $source_filename = &util::filename_cat($collect_dir, $source_filename);
+        $source_filename = &FileUtils::filenameConcatenate($collect_dir, $source_filename);
     }
     }
@@ -686 +687 @@
     if (-e $real_filename) {
 
-        $filename = &util::filename_cat($working_dir, $afile);
-
-        &util::hard_link ($real_filename, $filename, $self->{'verbosity'});
-        
+        $filename = &FileUtils::filenameConcatenate($working_dir, $afile);
+
+            &FileUtils::hardLink($real_filename, $filename, $self->{'verbosity'});
+
         $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),
                      "gsdlassocfile",
@@ -815 +816 @@
     }
 
-    my $rss_filename = &util::filename_cat($output_dir,"rss-items.rdf");
+    my $rss_filename = &FileUtils::filenameConcatenate($output_dir,"rss-items.rdf");
     if (open(RSSOUT,">>$rss_filename")) {
         print RSSOUT "<item>\n";
@@ -875 +876 @@
     return unless defined $xslt_file and $xslt_file ne "" and -e $xslt_file;
     
-    my $java_class_path =  &util::filename_cat ($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar");
+    my $java_class_path =  &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar");
 
     my $mapping_file_path = "";
 
     if ($ENV{'GSDLOS'} eq "windows"){
-    $java_class_path .=";".&util::filename_cat ($ENV{'GSDLHOME'},"bin","java","xalan.jar");
+    $java_class_path .=";".&FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","xalan.jar");
     # this file:/// bit didn't work for me on windows XP
     #$xslt_file = "\"file:///".$xslt_file."\"";
@@ -886 +887 @@
     }
     else{
-    $java_class_path .=":".&util::filename_cat ($ENV{'GSDLHOME'},"bin","java","xalan.jar");
+    $java_class_path .=":".&FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","xalan.jar");
     }