From 657f97bbcfd5c778aee1f1c1d82c48f4e0bc286f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Sep 2001 04:44:58 +0000
Subject: web queue view

---
 httemplate/browse/queue.cgi | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100755 httemplate/browse/queue.cgi

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
new file mode 100755
index 000000000..86d4a20f1
--- /dev/null
+++ b/httemplate/browse/queue.cgi
@@ -0,0 +1,56 @@
+<%
+#<!-- $Id: queue.cgi,v 1.1 2001-09-11 04:44:58 ivan Exp $ -->
+
+use strict;
+use vars qw( $cgi $p ); # $part_referral );
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
+use Date::Format;
+use FS::UID qw(cgisuidsetup);
+use FS::Record qw(qsearch);
+use FS::CGI qw(header menubar popurl table);
+use FS::queue;
+
+$cgi = new CGI;
+
+&cgisuidsetup($cgi);
+
+$p = popurl(2);
+
+print $cgi->header( '-expires' => 'now' ), header("Job Queue", menubar(
+  'Main Menu' => $p,
+#  'Add new referral' => "../edit/part_referral.cgi",
+)), &table(), <<END;
+      <TR>
+        <TH COLSPAN=2>Job</TH>
+        <TH>Args</TH>
+        <TH>Date</TH>
+        <TH>Status</TH>
+      </TR>
+END
+
+foreach my $queue ( sort { 
+  $a->getfield('jobnum') <=> $b->getfield('jobnum')
+} qsearch('queue',{}) ) {
+  my($hashref)=$queue->hashref;
+  my $args = join(' ', $queue->args);
+  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+  print <<END;
+      <TR>
+        <TD>$hashref->{jobnum}</TD>
+        <TD>$hashref->{job}</TD>
+        <TD>$args</TD>
+        <TD>$date</TD>
+        <TD>$hashref->{status}</TD>
+      </TR>
+END
+
+}
+
+print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
+%>
-- 
cgit v1.2.1


From 87b5424ee8f16f824865cd7dbf1efde8da3bd429 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Oct 2001 15:26:22 +0000
Subject: add (as yet inactive) retry & remove links

---
 httemplate/browse/queue.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 86d4a20f1..7a55cf3cf 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.1 2001-09-11 04:44:58 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.2 2001-10-12 15:26:22 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -35,13 +35,19 @@ foreach my $queue ( sort {
   my($hashref)=$queue->hashref;
   my $args = join(' ', $queue->args);
   my $date = time2str( "%a %b %e %T %Y", $queue->_date );
+  my $status = $hashref->{status};
+  if ( $status eq 'failed' || $status eq 'locked' ) {
+    $status .=
+      qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
+      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )';
+  }
   print <<END;
       <TR>
         <TD>$hashref->{jobnum}</TD>
         <TD>$hashref->{job}</TD>
         <TD>$args</TD>
         <TD>$date</TD>
-        <TD>$hashref->{status}</TD>
+        <TD>$status</TD>
       </TR>
 END
 
-- 
cgit v1.2.1


From 40927c9cd9472719a3720270256f4300b81ebc98 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 00:59:56 +0000
Subject: Can't find string terminator "!" anywhere before EOF at queue.cgi
 line 42

---
 httemplate/browse/queue.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 7a55cf3cf..76eed136d 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.2 2001-10-12 15:26:22 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.3 2001-10-24 00:59:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -39,7 +39,7 @@ foreach my $queue ( sort {
   if ( $status eq 'failed' || $status eq 'locked' ) {
     $status .=
       qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )';
+      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )!;
   }
   print <<END;
       <TR>
-- 
cgit v1.2.1


From 91387f8f489e561deaf1de052d80ef800a4970a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Oct 2001 10:24:56 +0000
Subject: cache foo *sigh*

---
 httemplate/browse/queue.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 76eed136d..ba695738b 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.3 2001-10-24 00:59:56 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( '-expires' => 'now' ), header("Job Queue", menubar(
+print $cgi->header( @FS::CGI::header ), header("Job Queue", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), &table(), <<END;
-- 
cgit v1.2.1


From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:54:07 +0000
Subject: get rid of header foo in individual templates

---
 httemplate/browse/queue.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index ba695738b..72643eb47 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Job Queue", menubar(
+print header("Job Queue", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), &table(), <<END;
-- 
cgit v1.2.1


From 38d9d1a9023f3b52f7c88eb0e9b8ef43e6d54a19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 31 Oct 2001 16:52:42 +0000
Subject: queue display works again, even if those links don't

---
 httemplate/browse/queue.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 72643eb47..6b5237240 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.6 2001-10-31 16:52:42 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -33,6 +33,7 @@ foreach my $queue ( sort {
   $a->getfield('jobnum') <=> $b->getfield('jobnum')
 } qsearch('queue',{}) ) {
   my($hashref)=$queue->hashref;
+  my $jobnum = $hashref->{jobnum};
   my $args = join(' ', $queue->args);
   my $date = time2str( "%a %b %e %T %Y", $queue->_date );
   my $status = $hashref->{status};
@@ -43,7 +44,7 @@ foreach my $queue ( sort {
   }
   print <<END;
       <TR>
-        <TD>$hashref->{jobnum}</TD>
+        <TD>$jobnum</TD>
         <TD>$hashref->{job}</TD>
         <TD>$args</TD>
         <TD>$date</TD>
-- 
cgit v1.2.1


From 1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 30 Jan 2002 14:18:09 +0000
Subject: remove   use Module; and   $cgi = new CGI;   &cgisuidsetup(); from
 all templates.  should work better under Mason.

---
 httemplate/browse/queue.cgi | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 6b5237240..af8989b82 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,21 +1,5 @@
+<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: queue.cgi,v 1.6 2001-10-31 16:52:42 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p ); # $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::queue;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Job Queue", menubar(
   'Main Menu' => $p,
-- 
cgit v1.2.1


From 22a35047ecdffff80110e06cc08fc84f9ddba9b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 13:21:31 +0000
Subject: removed <!-- $Id$ --> from all files to fix any redirects, whew

Mason handler.pl overrides CGI::redirect

fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi
---
 httemplate/browse/queue.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index af8989b82..e38e40ba3 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Job Queue", menubar(
-- 
cgit v1.2.1


From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:05:22 +0000
Subject: *finally* seems to be working under Mason.  sheesh. *finally* seems
 to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh.

---
 httemplate/browse/queue.cgi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index e38e40ba3..7fce1f5df 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 print header("Job Queue", menubar(
-- 
cgit v1.2.1


From 8f42b751aebda2e7dce2c363bed6f1e15b411b1d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2002 01:03:10 +0000
Subject: use Net::SSH::ssh_cmd for all job queueing rather than local
 duplicated ssh subs

queue daemon updates: retry & remove links work, bubble up error message
to webinterface, link to svcnum & have job listings on view/svc_* pages,
closes: Bug#280

s/option/optionname/ schema change, dumb mysql, closes: Bug#334
---
 httemplate/browse/queue.cgi | 44 ++------------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'httemplate/browse/queue.cgi')

diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 7fce1f5df..b53c1402d 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,47 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header("Job Queue", menubar(
-  'Main Menu' => $p,
-#  'Add new referral' => "../edit/part_referral.cgi",
-)), &table(), <<END;
-      <TR>
-        <TH COLSPAN=2>Job</TH>
-        <TH>Args</TH>
-        <TH>Date</TH>
-        <TH>Status</TH>
-      </TR>
-END
-
-foreach my $queue ( sort { 
-  $a->getfield('jobnum') <=> $b->getfield('jobnum')
-} qsearch('queue',{}) ) {
-  my($hashref)=$queue->hashref;
-  my $jobnum = $hashref->{jobnum};
-  my $args = join(' ', $queue->args);
-  my $date = time2str( "%a %b %e %T %Y", $queue->_date );
-  my $status = $hashref->{status};
-  if ( $status eq 'failed' || $status eq 'locked' ) {
-    $status .=
-      qq! ( <A HREF="$p/edit/queue.cgi?jobnum=$jobnum&action=new">retry</A> |!.
-      qq! <A HREF="$p/edit/queue.cgi?jobnum$jobnum&action=del">remove </A> )!;
-  }
-  print <<END;
-      <TR>
-        <TD>$jobnum</TD>
-        <TD>$hashref->{job}</TD>
-        <TD>$args</TD>
-        <TD>$date</TD>
-        <TD>$status</TD>
-      </TR>
-END
-
-}
-
-print <<END;
-    </TABLE>
-  </BODY>
-</HTML>
-END
+print header("Job Queue", menubar( 'Main Menu' => $p, )).
+      joblisting({}). '</BODY></HTML>';
 
 %>
-- 
cgit v1.2.1