From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 26 Feb 2019 09:53:47 +0000 (+0100)
Subject: added delete/cancel job
X-Git-Url: http://git.rot13.org/?p=safeq;a=commitdiff_plain;h=1a7003fa980a568b1f68bc173ec638a1070be56b

added delete/cancel job
---

diff --git a/README b/README
index 5cf03fc..4c3602d 100644
--- a/README
+++ b/README
@@ -31,3 +31,9 @@ IP          id        Job Name   Owner       Status         Type     Quantity
 You can delete job using:
 
 dpavlin@t42:~/safeq$ curl -XPOST -d OPR=CANCEL -d JOBS=00015c32/ http://10.60.3.35/JOBCTRL.cmd
+
+or use d[elete] or c[ancel] aruguments and job id:
+
+dpavlin@t42:~/safeq$ ./xwc-jobs 10.60.3.35 d 00015c41
+10.60.3.35  00015c41  CANCEL  REQUEST: ACCEPTED
+
diff --git a/xwc-jobs.pl b/xwc-jobs.pl
index 86ce4c9..3d13b07 100755
--- a/xwc-jobs.pl
+++ b/xwc-jobs.pl
@@ -11,10 +11,21 @@ my $sep = $ENV{SEP} || "\t";
 my $op = shift @ARGV || 'list';
 
 my $url = 'jblist.htm';
-if ( $op eq 'list' ) {
+if ( $op =~ m/^l/i ) { # list
 	$url = 'jblist.htm';
-} elsif ( $op eq 'hist' ) {
+} elsif ( $op =~ m/^h/i ) { # history
 	$url = 'jbhist.htm';
+} elsif ( $op =~ m/^(d|c)/i ) { # delete/cancel
+	my $job_id = shift @ARGV || die "expected job_id missing";
+	open(my $curl, '-|', "curl --silent -XPOST -d OPR=CANCEL -d JOBS=$job_id/ http://$ip/JOBCTRL.cmd");
+	while (<$curl>) {
+		if ( m/<title>/i ) {
+			chomp;
+			s/<[^>]*>//g;
+			print join($sep, $ip, $job_id, 'CANCEL', $_),"\n";
+		}
+	}
+	exit 0;
 } else {
 	die "UNKNOWN op [$op]\n";
 }