From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 3 Feb 2009 19:53:18 +0000 (+0000)
Subject: ebl  Add purged and recycle volume to loading procedure when expired=on
X-Git-Tag: Release-3.0.0~263
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22bfb7c0691623749d3fdf09ea0bb3982c658a39;p=bacula%2Fbacula

ebl  Add purged and recycle volume to loading procedure when expired=on



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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index aef9a87d9b..feda60e30d 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2176,10 +2176,16 @@ sub help_intern_compute
     my ($sql, undef) = $self->get_param('pools', 'locations', 'mediatypes');
 
     if (CGI::param('expired')) {
+        # we take only expired volumes or purged/recycle ones
 	$sql = "
-AND (    $self->{sql}->{UNIX_TIMESTAMP}(Media.LastWritten) 
-       + $self->{sql}->{TO_SEC}(Media.VolRetention)
+AND (
+ (  ($self->{sql}->{UNIX_TIMESTAMP}(Media.LastWritten) 
+      + $self->{sql}->{TO_SEC}(Media.VolRetention)
     ) < NOW()
+ ) OR ( 
+  Media.VolStatus IN ('Purged', 'Recycle')
+ )
+)
  " . $sql ;
     }
 
diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0
index 94a4e958e7..9f758d2177 100644
--- a/gui/bweb/technotes-3.0
+++ b/gui/bweb/technotes-3.0
@@ -1,5 +1,6 @@
 03Feb09
 ebl  Add pool parameter to label barcode process
+ebl  Add purged and recycle volume to loading procedure when expired=on
 20Jan09
 ebl  Use default age in missing job view
 19Jan09