From 091df062d012bc4c7bd41643899d25ce11177210 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 2 Jan 2008 13:45:15 +0000 Subject: [PATCH] ebl Fix bugs with btime git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6177 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bweb/cgi/btime.pl | 8 ++++---- gui/bweb/technotes-2.3 | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gui/bweb/cgi/btime.pl b/gui/bweb/cgi/btime.pl index ca52f834c0..352db935d1 100755 --- a/gui/bweb/cgi/btime.pl +++ b/gui/bweb/cgi/btime.pl @@ -104,7 +104,7 @@ my $filter = join(" OR ", my $query = " SELECT " . $bweb->dbh_strcat('Job.Name', "'_'", 'Job.Level') . ", $sec, - substring(Log.LogText from 1 for 65), + substring(Log.LogText from 8 for 70), Job.JobId, Pool.Name @@ -125,7 +125,7 @@ ORDER BY Job.JobId,Log.Time "; -print STDERR $query if ($conf->{debug}) +print STDERR $query if ($conf->{debug}); my $all = $bweb->dbh_selectall_arrayref($query); my $lastid = 0; @@ -148,7 +148,7 @@ foreach my $elt (@$all) $lastspool=0; } - if ($elt->[2] =~ /$regs{start_job}/) { + if ($elt->[2] =~ /$regs{end_job}/) { push @$data, { type => "commit", begin => $begin, @@ -221,7 +221,7 @@ foreach my $elt (@$all) end => $elt->[1], }; - } elsif ($elt->[2] =~ /$regs{end_job}/) { + } elsif ($elt->[2] =~ /$regs{start_job}/) { 1; } else { next; diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3 index 085764f4ba..7bed6547e9 100644 --- a/gui/bweb/technotes-2.3 +++ b/gui/bweb/technotes-2.3 @@ -1,3 +1,6 @@ +02Jan08 +ebl Fix a couple of bug in btime module + 31Dec07 ebl Add new r_view_group role to view group content -- 2.39.5