Merge branch 't42'

[safeq] / xwc-jobs.pl

diff --git a/xwc-jobs.pl b/xwc-jobs.pl
index d3eb07a..3fd0f95 100755 (executable)
--- a/xwc-jobs.pl
+++ b/xwc-jobs.pl
@@ -22,6 +22,12 @@ if ( $op =~ m/^l/i ) { # list
 } elsif ( $op =~ m/^s/i ) { # status
        $url = 'stgen.htm';
        $var_re = '(lbls|spcs|adrslbl)';
+} elsif ( $op =~ m/^t/i ) { # tray
+       $url = 'sttray.htm';
+       $var_re = '(hdrIn|infoIn|hdrOut|infoOut|stsIn)';
+} elsif ( $op =~ m/^e/i ) { # error
+       $url = 'sperr.htm';
+       $var_re = '(lHdr|errLog)';
 } elsif ( $op =~ m/^(d|c)/i ) { # delete/cancel
        my $job_id = join('/', @ARGV) || die "expected job_id(s) missing";
        open(my $curl, '-|', "curl --silent -XPOST -d OPR=CANCEL -d JOBS=$job_id/ http://$ip/JOBCTRL.cmd");
@@ -64,7 +70,30 @@ if ( exists $info->{spcs} ) {
        print join($sep, @s),"\n";
 
        exit 0;
-}
+
+} elsif ( exists $info->{errLog} ) {
+       print join($sep, 'IP', @{ $info->{lHdr} }),"\n";
+       foreach my $error ( @{ $info->{errLog} } ) {
+               print join($sep, $ip, @{ $error }),"\n";
+       }
+       exit 0;
+
+} elsif ( exists $info->{infoIn} ) {
+       print join($sep, 'IP', @{ $info->{hdrIn} }),"\n";
+       foreach my $row ( @{ $info->{infoIn} } ) {
+               $row->[1] .= ':' . $info->{stsIn}->[$row->[1]];
+               print join($sep, $ip, @$row),"\n";
+       }
+
+       print join($sep, 'IP', @{ $info->{hdrOut} }),"\n";
+       foreach my $row ( @{ $info->{infoOut} } ) {
+               $row->[1] .= ':' . $info->{stsIn}->[$row->[1]];
+               print join($sep, $ip, @$row),"\n";
+       }
+       exit 0;
+} 
+
+exit 1 if ! defined $info->{hdrs}; # we didn't get expected output
 
 my @headers = @{ $info->{hdrs} };
 unshift @headers, 'id' if $op eq 'list';