Changeset 27377 for gs2-extensions/parallel-building/trunk/src/perllib/plugouts/GreenstoneXMLPlugout.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/GreenstoneXMLPlugout.pm (modified) (7 diffs)

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

@@ -32 +32 @@
 eval {require bytes};
 use util;
+use FileUtils;
 use BasePlugout;
 use docprint;
@@ -73 +74 @@
   {
     my $output_dir = $self->get_output_dir();
-    my $working_dir = &util::filename_cat($output_dir, $doc_dir);
-    if (!&util::dir_exists($working_dir))
+    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
+    if (!&FileUtils::directoryExists($working_dir))
     {
-      &util::mk_all_dir($working_dir);
+      &FileUtils::makeAllDirectories($working_dir);
     }
     $self->process_assoc_files ($doc_obj, $doc_dir, '');
     $self->process_metafiles_metadata ($doc_obj);
-    my $output_file = &util::filename_cat($working_dir, "doc.xml");
+    my $output_file = &FileUtils::filenameConcatenate($working_dir, "doc.xml");
     $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
     if (defined $self->{'xslt_writer'})
@@ -110 +111 @@
     }
 
-    $self->{'short_doc_file'} = util::filename_cat($doc_dir, "doc.xml");
+    $self->{'short_doc_file'} = FileUtils::filenameConcatenate($doc_dir, "doc.xml");
 
     $self->store_output_info_reference($doc_obj);
@@ -116 +117 @@
 }
 # /** saveas() **/
-
-# Overriden for HDFS support
-sub get_output_handler
-{
-  my $self = shift (@_);
-  my ($output_file_name) = @_;
-  if (&util::isHDFS($output_file_name))
-  {
-    open(*OUTPUT, &util::file_openfdcommand($output_file_name, '>'));
-    return *OUTPUT;
-  }
-  else
-  {
-    return $self->SUPER::get_output_handler($output_file_name);
-  }
-}
 
 sub get_new_doc_dir
@@ -159 +144 @@
       $doc_dir_num++;
     }
-    ###rint "!! - testing Path: " . $doc_dir . "\n";
-    $created_directory = &util::mk_all_dir(&util::filename_cat($working_dir, $doc_dir . '.dir'));
-    ###rint "-> result: |" . $created_directory . "|\n";
+    #rint "!! - testing Path: " . $doc_dir . "\n";
+    $created_directory = &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir'));
+    #rint "-> result: |" . $created_directory . "|\n";
   }
   while ($doc_dir_rest ne "" && $doc_dir_num < 32 && !$created_directory);
@@ -170 +155 @@
     $i++;
     $doc_dir = $doc_dir_base . '-' . $i;
-    ###rint "!! - testing Path: " . $doc_dir . "\n";
-    $created_directory = &util::mk_all_dir(&util::filename_cat($working_dir, $doc_dir . '.dir'));
-    ###rint "-> result: |" . $created_directory . "|\n";
+    #rint "!! - testing Path: " . $doc_dir . "\n";
+    $created_directory = &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir'));
+    #rint "-> result: |" . $created_directory . "|\n";
   }
   if (!$created_directory)
@@ -178 +163 @@
     die("Error! Failed to create directory for document: " . $doc_dir_base . "\n");
   }
-  ###rint "!! Final Path: " . $doc_dir . ".dir\n";
+  #rint "!! Final Path: " . $doc_dir . ".dir\n";
   return $doc_dir . '.dir';
 }