Changeset 30353

Timestamp:

2015-12-16T15:46:58+13:00 (8 years ago)

Author:

jmt12

Message:

Replacing old file util calls with new FileUtil ones - including changing how directories are read (for instances where direct directory reading isn't possible ala HDFS). Commenting out debug statements.

File:

• gs2-extensions/parallel-building/trunk/src/perllib/plugins/DirectoryPlugin.pm (modified) (7 diffs)

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

@@ -83 +83 @@
     my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
 
-    print STDERR "INFO: This DirectoryPlugin supports version 2 manifest files\n";
-
     if ($self->{'info_only'}) {
     # don't worry about any options or initialisations etc
@@ -117 +115 @@
     $self->{'failhandle'} = $failhandle;
 
+    if ($self->{'verbosity'} > 2) {
+    print "[INFO] This DirectoryPlugin supports version 2 manifest files\n";
+    }
 }
 
@@ -184 +185 @@
     my $self = shift(@_);
     my ($dirname) = @_;
-    
-    return undef unless (-d $dirname);
+
+    #return undef unless (-d $dirname);
+    return undef unless (&FileUtils::directoryExists($dirname));
 
     return 0 if ($self->{'block_exp'} ne "" && $dirname =~ /$self->{'block_exp'}/);
@@ -318 +320 @@
     
     # find all the files in the directory
-    if (!opendir (DIR, $dirname)) {
+    my $rvalue = &FileUtils::readDirectory($dirname);
+    if (!defined $rvalue) {
     if ($gli) {
         print STDERR "<ProcessingError n='$file' r='Could not read directory $dirname'>\n";
@@ -325 +328 @@
     return -1; # error in processing
     }
-    @dir = sort readdir (DIR);
-    closedir (DIR);
-    
+    @dir = sort @{$rvalue};
+    #}
+    #else
+    #{
+    #if (!opendir (DIR, $dirname)) {
+#   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
+ #   }
+  #  @dir = sort readdir (DIR);
+   # closedir (DIR);
+ #   }
+
+    ###print "===== Dir contents =====\n";
+    ###use Devel::Peek;
+    ###Dump(@dir);
+    ###print "\n=====              =====\n";
+
     for (my $i = 0; $i < scalar(@dir); $i++) {
     my $raw_subfile = $dir[$i];
@@ -400 +420 @@
     my @dir;
     
-    print $outhandle "DirectoryPlugin read: getting directory $dirname\n" if ($verbosity > 2);
+    print $outhandle "DirectoryPlugin processing $dirname\n";
     
     # find all the files in the directory
@@ -574 +594 @@
         next;
     }
-    print STDERR "** DirectoryPlugin processing $raw_full_filename\n";
+    ###rint STDERR "** DirectoryPlugin processing $raw_full_filename\n";
     # Follow Windows shortcuts
     if ($raw_subfile =~ m/(?i)\.lnk$/ && (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))) {