--- Bweb.pm.orig	2011-04-08 14:51:25.000000000 +0200
+++ Bweb.pm	2011-04-08 14:53:14.000000000 +0200
@@ -1786,6 +1786,7 @@
     my %opt_ss =(               # string with space
                  job     => 1,
                  storage => 1,
+                 poolrecycle => 1,
                  );
     my %opt_s = (               # default to ''
                  ach    => 1,
@@ -1801,7 +1802,6 @@
                  graph  => 1,
                  gtype  => 1,
                  type   => 1,
-                 poolrecycle => 1,
                  replace => 1,
                  expired => 1,
                  enabled => 1,
@@ -1843,7 +1843,7 @@
             }
         } elsif ($opt_ss{$i}) { # simple string param (with space)
             my $value = CGI::param($i) || '';
-            if ($value =~ /^([\w\d\.\-\s]+)$/) {
+            if ($value =~ /^([\w\d\.\-\s\*]+)$/) {
                 $ret{$i} = $1;
             }
         } elsif ($i =~ /^j(\w+)s$/) { # quote join args "'arg1', 'arg2'"
@@ -1885,6 +1885,9 @@
             }
         }
     }
+    
+    #use Data::Dumper;
+    #Dumper($what);
 
     if ($what{storage_cmd}) {
         if (!grep {/^\Q$ret{storage_cmd}\E$/} ('mount', 'umount', 'release','status')) {
@@ -1997,6 +2000,15 @@
         $ret{db_pools} = [ sort { $a->{name} cmp $b->{name} } values %$all ];
     }
 
+    if ($what{db_recyclepools}) {
+        my $query = "SELECT Name as name FROM Pool";
+
+        my $all = $self->dbh_selectall_hashref($query, 'name') ;
+        $ret{db_recyclepools} = [ sort { $a->{name} cmp $b->{name} } values %$all ];
+        
+        unshift(@{$ret{db_recyclepools}}, {name => "*None*"});
+    }    
+
     if ($what{db_filesets}) {
         my $query = "
 SELECT FileSet.FileSet AS fileset 
@@ -3548,8 +3560,11 @@
     $row->{volretention} = human_sec($row->{volretention});
     $row->{voluseduration} = human_sec($row->{voluseduration});
     $row->{enabled} = human_enabled($row->{enabled});
+    
+    #$row->{poolrecycle} = "*None*";
+    if (!defined($row->{poolrecycle})) { $row->{poolrecycle} = "*None*"; }
 
-    my $elt = $self->get_form(qw/db_pools db_locations/);
+    my $elt = $self->get_form(qw/db_pools db_recyclepools db_locations/);
 
     $self->display({
         %$elt,
@@ -4455,7 +4470,15 @@
     }    
 
     if (defined $arg->{poolrecycle}) {
-        $update .= " recyclepool=\"$arg->{poolrecycle}\" " ;
+    
+        if ($arg->{poolrecycle} eq "*None*") {
+        
+            $update .= " recyclepool= ";
+        }
+        else {
+        
+            $update .= " recyclepool=\"$arg->{poolrecycle}\" " ;
+        }
     }        
     
     my $b = $self->get_bconsole();