Changeset 27377 for gs2-extensions/parallel-building/trunk/src/perllib/plugouts/BasePlugout.pm

Timestamp:

2013-05-21T14:46:55+12:00 (11 years ago)

Author:

jmt12

Message:

Updating calls to intermediate util functions to the new FileUtils functions

File:

• gs2-extensions/parallel-building/trunk/src/perllib/plugouts/BasePlugout.pm (modified) (14 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/plugouts/BasePlugout.pm

@@ -3 +3 @@
 # BasePlugout.pm -- base class for all the plugout modules
 # A component of the Greenstone digital library software
-# from the New Zealand Digital Library Project at the 
+# from the New Zealand Digital Library Project at the
 # University of Waikato, New Zealand.
 #
@@ -36 +36 @@
 use printusage;
 use parse2;
+use util;
+use FileUtils;
 
 
@@ -349 +351 @@
 
     my ($output_file_name) = @_;
-     
-    open(*OUTPUT, ">$output_file_name") or die "Can not open a file handler for  $output_file_name\n";
-
-    return *OUTPUT;            
+    my $fh;
+    &FileUtils::openFileHandle($output_file_name, '>', \$fh) or die "Can not open a file handler for  $output_file_name\n";
+    return $fh;
 }
 
@@ -508 +509 @@
             # only if opening new file
         my $output_dir = $self->get_output_dir();
-        &util::mk_all_dir ($output_dir) unless &util::dir_exists($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");
+        &FileUtils::makeAllDirectories ($output_dir) unless &FileUtils::directoryExists($output_dir);
+        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 @@
        $doc_dir_num++;
        }
-   } while ($doc_dir_rest ne "" && ((&util::dir_exists(&util::filename_cat($working_dir, "$doc_dir.dir"))) || ($working_info->size() >= 1024 && $doc_dir_num < 2)));
+   } while ($doc_dir_rest ne "" && ((&FileUtils::directoryExists(&FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir"))) || ($working_info->size() >= 1024 && $doc_dir_num < 2)));
    my $i = 1;
    my $doc_dir_base = $doc_dir;
    #rint "!! - ensure path is unique by adding numeric suffix if necessary\n";
-   while (&util::dir_exists(&util::filename_cat($working_dir, "$doc_dir.dir"))) {
+   while (&FileUtils::directoryExists(&FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir"))) {
        $doc_dir = "$doc_dir_base-$i";
        $i++;
@@ -640 +641 @@
     return if (!defined $output_dir);
 
-    &util::mk_all_dir ($output_dir) unless &util::dir_exists($output_dir);
+    &FileUtils::makeAllDirectories($output_dir) unless &FileUtils::directoryExists($output_dir);
       
-    my $working_dir = &util::filename_cat($output_dir, $doc_dir);
-    &util::mk_all_dir ($working_dir) unless &util::dir_exists($working_dir);
+    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
+    &FileUtils::makeAllDirectories($working_dir) unless &FileUtils::directoryExists($working_dir);
 
     my @assoc_files = ();
@@ -662 +663 @@
      
     if ($source_filename !~ /^$dirsep_regexp/) {
-        $source_filename = &util::filename_cat($collect_dir, $source_filename);
+        $source_filename = &FileUtils::filenameConcatenate($collect_dir, $source_filename);
     }
     }
@@ -684 +685 @@
     $real_filename = &util::downgrade_if_dos_filename($real_filename);
 
-    if (&util::file_exists($real_filename)) {
-
-        $filename = &util::filename_cat($working_dir, $afile);
-
-        &util::hard_link ($real_filename, $filename, $self->{'verbosity'});
+    if (&FileUtils::fileExists($real_filename)) {
+
+        $filename = &FileUtils::filenameConcatenate($working_dir, $afile);
+
+        &FileUtils::hardLink($real_filename, $filename, $self->{'verbosity'});
         
         $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),
@@ -731 +732 @@
     my $raw_filename = &util::downgrade_if_dos_filename($real_filename);
 
-    if (&util::file_exists($raw_filename)) {
+    if (&FileUtils::fileExists($raw_filename)) {
 
 #       if (defined $collect_dir) {
@@ -819 +820 @@
         $dc_title .= " (Updated)";
       }
-      my $rss_filename = &util::filename_cat($output_dir,"rss-items.rdf");
-      if (open(RSSOUT, &util::file_openfdcommand($rss_filename, '>>')))
+      my $rss_filename = &FileUtils::filenameConcatenate($output_dir,"rss-items.rdf");
+      my $rssout_fh;
+      
+      if (&FileUtils::openFileHandle($rss_filename, '>>', \$rssout_fh))
       {
-        print RSSOUT "<item>\n";
-        print RSSOUT "   <title>" . $dc_title . "</title>\n";
-        print RSSOUT "   <link>_httpdomain__httpcollection_/document/" . $doc_obj->get_OID() . "</link>\n";
-        print RSSOUT "</item>\n";
-        close(RSSOUT);
+        print $rssout_fh "<item>\n";
+        print $rssout_fh "   <title>" . $dc_title . "</title>\n";
+        print $rssout_fh "   <link>_httpdomain__httpcollection_/document/" . $doc_obj->get_OID() . "</link>\n";
+        print $rssout_fh "</item>\n";
+        &FileUtils::closeFileHandle($rss_filename, $rssout_fh);
       }
       else
@@ -887 +890 @@
     my ($output_file_name, $xslt_file)=@_;
 
-    return unless defined $xslt_file and $xslt_file ne "" and &util::file_exists($xslt_file);
-    
-    my $java_class_path =  &util::filename_cat ($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar");
+    return unless defined $xslt_file and $xslt_file ne "" and &FileUtils::fileExists($xslt_file);
+    
+    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."\"";
@@ -900 +903 @@
     }
     else{
-    $java_class_path .=":".&util::filename_cat ($ENV{'GSDLHOME'},"bin","java","xalan.jar");
+    $java_class_path .=":".&FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","xalan.jar");
     }
 
@@ -961 +964 @@
     $doc_file .= ".gz";
     $short_doc_file .= ".gz";
-    if (!&util::file_exists($doc_file)) {
+    if (!&FileUtils::fileExists($doc_file)) {
          my $outhandle = $self->{'output_handle'};
         print $outhandle "error while gzipping: $doc_file doesn't exist\n";