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

gs2-extensions/parallel-building/trunk/src/perllib/plugins/ReadTextFile.pm

@@ -39 +39 @@
 use ghtml;
 use gsprintf 'gsprintf';
+use util;
+use FileUtils;
 
 use AutoExtractMetadata;
@@ -140 +142 @@
     # this should look at the plugin option too...
     $doc_obj->add_utf8_metadata($top_section, "Plugin", "$self->{'plugin_type'}");
-    $doc_obj->add_utf8_metadata($top_section, "FileSize", &util::file_size($filename_full_path));
+    $doc_obj->add_utf8_metadata($top_section, "FileSize", &FileUtils::fileSize($filename_full_path));
 
     my $plugin_filename_encoding = $self->{'filename_encoding'};
@@ -202 +204 @@
     my ($filename, $encoding, $language, $textref) = @_;
 
-    if (!&util::file_canread($filename))
+    if (!&FileUtils::canRead($filename))
     {
     my $outhandle = $self->{'outhandle'};
@@ -213 +215 @@
     # use the util::file_* functions to provide some extra smarts to the open
     # command in order to support protocols like http: or hdfs:
-    if (!open (FILE, &util::file_openfdcommand($filename, '<')))
+    my $fh;
+    if (!&FileUtils::openFileHandle($filename, '<', \$fh))
     {
       gsprintf(STDERR, "ReadTextFile::read_file {ReadTextFile.could_not_open_for_reading} ($!)\n", $filename);
@@ -222 +225 @@
     {
       # fast file 'slurp' implementation
-      sysread(FILE, $$textref, &util::file_size($filename));
+      sysread($fh, $$textref, &FileUtils::fileSize($filename));
       # the old slow way of reading in a file
       #undef $/;
@@ -231 +234 @@
     {
       my $reader = new multiread();
-      $reader->set_handle ('ReadTextFile::FILE');
+      $reader->set_handle ($fh);
       $reader->set_encoding ($encoding);
       $reader->read_file ($textref);
@@ -243 +246 @@
     $$textref = decode("utf8", $$textref);
 
-    close FILE;
+    &FileUtils::closeFileHandle($filename, \$fh);
 }
 
@@ -368 +371 @@
     my $best_language = "";
     my $best_encoding = "";
-    
 
     # read in file
-    if (!open (FILE, &util::file_openfdcommand($filename, '<'))) {
-    gsprintf(STDERR, "ReadTextFile::get_language_encoding {ReadTextFile.could_not_open_for_reading} ($!)\n", $filename);
-    # this is a pretty bad error, but try to continue anyway
-    return ($self->{'default_language'}, $self->{'input_encoding'});
+    my $fh;
+    if (!&FileUtils::openFileHandle($filename, '<', \$fh))
+    {
+      gsprintf(STDERR, "ReadTextFile::get_language_encoding {ReadTextFile.could_not_open_for_reading} ($!)\n", $filename);
+      # this is a pretty bad error, but try to continue anyway
+      return ($self->{'default_language'}, $self->{'input_encoding'});
     }
     my $text;
-    sysread(FILE, $text, &util::file_size($filename));
+    sysread($fh, $text, &FileUtils::fileSize($filename));
     #undef $/;
     #my $text = <FILE>;
     #$/ = "\n";
-    close FILE;
+    close $fh;
 
     # check if first few bytes have a Byte Order Marker