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

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

@@ -181 +181 @@
 
     # replace -d with function in util library
-    return undef unless (&util::dir_exists($dirname));
+    return undef unless (&FileUtils::directoryExists($dirname));
 
     return 0 if ($self->{'block_exp'} ne "" && $dirname =~ /$self->{'block_exp'}/);
@@ -308 +308 @@
     $block_hash->{'shared_fileroot'} = {} unless defined $block_hash->{'shared_fileroot'};
 
-     # Recur over directory contents.
-    my (@dir, $subfile);
-    #my $count = 0;
-    
+    # Recur over directory contents.
     print $outhandle "DirectoryPlugin block: getting directory $dirname\n" if ($verbosity > 2);
-    
+
     # find all the files in the directory
-    my $dir_read = &util::file_readdir($dirname, \@dir);
-    if (!$dir_read) {
-    if ($gli) {
-        print STDERR "<ProcessingError n='$file' r='Could not read directory $dirname'>\n";
-    }
-    print $outhandle "DirectoryPlugin: WARNING - couldn't read directory $dirname\n";
-    return -1; # error in processing
+    my @dir = @{&FileUtils::readDirectory($dirname)};
+    if (scalar(@dir) == 0)
+    {
+      if ($gli)
+      {
+        print STDERR "<ProcessingError n='$file' r='Could not read directory $dirname'>\n";
+      }
+      print $outhandle "DirectoryPlugin: WARNING - couldn't read directory $dirname\n";
+      return -1; # error in processing
     }
 
@@ -394 +393 @@
 
     # Recur over directory contents.
-    my (@dir, $subfile);
     print $outhandle "DirectoryPlugin read: getting directory $dirname\n" if ($verbosity > 2);
 
     # find all the files in the directory
-    my $dir_read = &util::file_readdir($dirname, \@dir);
-    if (!$dir_read)
+    my @dir = @{&FileUtils::readDirectory($dirname)};
+    if (scalar(@dir) == 0)
     {
       if ($gli)