From d5f065b1c7c93d6d5c15e1c5f80af088f5d71ca5 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sat, 15 Aug 2009 16:31:22 +0200 Subject: [PATCH] Add fullname parameter to btime in order to debug regress script. --- gui/bweb/cgi/btime.pl | 8 +++++--- gui/bweb/technotes-3.0 | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gui/bweb/cgi/btime.pl b/gui/bweb/cgi/btime.pl index e4d77e43ee..215632bb13 100755 --- a/gui/bweb/cgi/btime.pl +++ b/gui/bweb/cgi/btime.pl @@ -52,7 +52,7 @@ $bweb->can_do('r_view_stat'); my $arg = $bweb->get_form(qw/qnocache qiso_begin qiso_end qusage qpools qpoolusage qnojob jclient_groups qbypool - db_client_groups qclient_groups/); + qfullname db_client_groups qclient_groups/); my ($filter1, undef) = $bweb->get_param('pool'); if (!$arg->{qiso_begin}) { @@ -124,11 +124,13 @@ my %regs_fr = ( end_spool2 => ': Transfert des donn', ); +my $name = ($arg->{qfullname}) ? 'Job' : 'Name'; + my $filter = join(" OR ", map { "Log.LogText $bweb->{sql}->{MATCH} '$_'" } values %regs); my $query = " -SELECT " . $bweb->dbh_strcat('Job.Name', "'_'", 'Job.Level') . ", +SELECT " . $bweb->dbh_strcat("Job.$name", "'_'", 'Job.Level') . ", $sec, substring(Log.LogText from 8 for 70), Job.JobId, @@ -206,7 +208,7 @@ foreach my $elt (@$all) # on connait le temps de despool my $t = $1*60*60+ $2*60 + $3; - if ($t > 10) { # en dessous de 10s on affiche pas + if ($t > 3) { # en dessous de 3s on affiche pas push @$data, { # temps d'attente du drive # l => $elt->[2], type => "waiting", diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0 index 5043e19adf..c0903fb44b 100644 --- a/gui/bweb/technotes-3.0 +++ b/gui/bweb/technotes-3.0 @@ -1,3 +1,6 @@ +15Aug09 +ebl Add fullname parameter to btime in order to debug + regress script. 04Aug09 ebl Document bweb+lighttpd that should permit to use bweb in 2 lines of shell. -- 2.39.5