From 1b1aa88410c8e8f28959d08cbcfcb5b3bcbe818e Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 23 Jul 2009 14:28:40 +0000 Subject: [PATCH] Permit to filter on the directory name as for file git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9092 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bweb/cgi/bresto.pl | 9 ++++++++- gui/bweb/technotes-3.0 | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gui/bweb/cgi/bresto.pl b/gui/bweb/cgi/bresto.pl index a22d0a82e1..c23e349a39 100755 --- a/gui/bweb/cgi/bresto.pl +++ b/gui/bweb/cgi/bresto.pl @@ -453,6 +453,11 @@ sub ls_dirs my $pathid = $self->{cwdid}; my $jobclause = $self->{curjobids}; + my $filter =''; + + if ($self->{pattern}) { + $filter = " AND Path2.Path $self->{sql}->{MATCH} $self->{pattern} "; + } # Let's retrieve the list of the visible dirs in this dir ... # First, I need the empty filenameid to locate efficiently @@ -473,7 +478,9 @@ SELECT PathId, Path, JobId, Lstat FROM ( JOIN brestore_pathvisibility AS brestore_pathvisibility1 ON (brestore_pathhierarchy1.PathId = brestore_pathvisibility1.PathId) WHERE brestore_pathhierarchy1.PPathId = $pathid - AND brestore_pathvisibility1.jobid IN ($jobclause)) AS listpath1 + AND brestore_pathvisibility1.jobid IN ($jobclause) + $limit + ) AS listpath1 JOIN Path AS Path1 ON (listpath1.PathId = Path1.PathId) LEFT JOIN ( -- get attributes if any diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0 index 339870c129..6488330f42 100644 --- a/gui/bweb/technotes-3.0 +++ b/gui/bweb/technotes-3.0 @@ -1,3 +1,5 @@ +23Jul09 +ebl Permit to filter on the directory name as for file 17Jul09 ebl Optimize a bit the running job view ebl Fix bresto relocation box -- 2.39.5