Changeset 29398 for other-projects/nightly-tasks

Timestamp:

2014-10-21T22:06:53+13:00 (10 years ago)

Author:

ak19

Message:

1. There's always a deprecation warning on the switch statement used in task.pl. Replaced with plain if-else block. 2. The perl version found by diffcol is written out to the xml version of the report (not the html version). This may help in detecting new changes.

Location:

other-projects/nightly-tasks/diffcol/trunk

Files:

• diffcol/diffcol.pl (modified) (1 diff)
• task.pl (modified) (2 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -983 +983 @@
     #----##
 
+# To find out what version of perl we're using
+    if( $strOutputFormat eq "xml" ) {
+        my $perloutput = `perl -v`;
+        $perloutput =~ s@.*\((v\d+(\.\d+)*)\).*@$1@s;
+        $ENV{'PATH'}="$ENV{'PERLPATH'}:$ENV{'PATH'}";       
+        print "<perl-version>Perl version: $perloutput</perl-version>\n"; # die "<error>Perl version: $perloutput</error>\n";
+    }
+
     #--Collection(s) Testing
     foreach $strColName (@ARGV)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -22 +22 @@
 
 use Cwd; 
-use Switch; # for switch(val) { case: ; ...}
+#use Switch; # for switch(val) { case: ; ...}
 use File::Path; # for rmdir and mkdir type functions
 use File::Copy; # for recursive copying of folders but skipping .svn
@@ -140 +140 @@
 
 if(scalar(@ARGV) > 0) {    
-    switch ($ARGV[0]) {
-    case qr/^(-h|--?help|help)$/i { &printusage; exit 0; }
-    case qr/^(setup_greenstone|run_test|summarise|upload|all)$/ { $action=$ARGV[0]; }
-    else { 
-        print STDERR "**** Bad subcommand.\n"; 
-        &printusage; 
-        exit -1;
-    }
+    #switch ($ARGV[0]) {
+    #case qr/^(-h|--?help|help)$/i { &printusage; exit 0; }
+    #case qr/^(setup_greenstone|run_test|summarise|upload|all)$/ { $action=$ARGV[0]; }
+    #else { 
+        #print STDERR "**** Bad subcommand.\n"; 
+        #&printusage; 
+        #exit -1;
+    #}
+    #}
+
+
+    my $switch = $ARGV[0];
+    if($switch =~ m/^(-h|--?help|help)$/i) {
+    &printusage; 
+    exit 0;
+    } elsif ($switch =~ m/^(setup_greenstone|run_test|summarise|upload|all)$/) {
+    $action=$ARGV[0];
+    } else { 
+    print STDERR "**** Bad subcommand.\n"; 
+    &printusage; 
+    exit -1;
     }