ebl Fix bugs with btime

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6177 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/cgi/btime.pl b/gui/bweb/cgi/btime.pl
index ca52f834c01d93de87089594ce616b1d372290fb..352db935d165033ba40f7650785fd68c94b6164f 100755 (executable)
--- 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 085764f4bacba388edab0692b55eb09bd7b065fb..7bed6547e9f4f65c1cf1a78dca2acb06cd960218 100644 (file)
--- 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