ebl Add support for volume that contains . and - (VOL.001 or VOL-001)

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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index a50453b93fbe9acf0c91d3ae7a3a360368a31986..b81346e126488ad3b3b0ea40d2f42f799b39f724 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -630,7 +630,7 @@ sub status
 
         #          Storage Element 7:Empty
         #          Storage Element 2:Full :VolumeTag=000002
-       if ($l =~ /Storage Element (\d+):(Empty|Full)(\s+:VolumeTag=([\w\d]+))?/){
+       if ($l =~ /Storage Element (\d+):(Empty|Full)(\s+:VolumeTag=([\w\d.-]+))?/){
 
            if ($2 eq 'Empty') {
                $self->set_empty_slot($1);
@@ -638,7 +638,7 @@ sub status
                $self->set_slot($1, $4);
            }
 
-       } elsif ($l =~ /Data Transfer.+(\d+):(Full|Empty)(\s+.Storage Element (\d+) Loaded.(:VolumeTag = ([\w\d]+))?)?/) {
+       } elsif ($l =~ /Data Transfer.+(\d+):(Full|Empty)(\s+.Storage Element (\d+) Loaded.(:VolumeTag = ([\w\d.-]+))?)?/) {
 
            if ($2 eq 'Empty') {
                $self->set_empty_drive($1);
@@ -646,7 +646,7 @@ sub status
                $self->set_drive($1, $4, $6);
            }
 
-       } elsif ($l =~ /Storage Element (\d+).+IMPORT\/EXPORT:(Empty|Full)( :VolumeTag=([\d\w]+))?/) 
+       } elsif ($l =~ /Storage Element (\d+).+IMPORT\/EXPORT:(Empty|Full)( :VolumeTag=([\d\w.-]+))?/) 
        {
            if ($2 eq 'Empty') {
                $self->set_empty_io($1);

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index f4485e8c96c6ab5de396ea5b17e74dfaa1609bce..0257192605df9fe2780ed8fcad8ab49443bfc82a 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,7 @@
+29Oct08
+ebl  Add support for volume that contains - and .
+     in autochanger
+
 21Oct08
 ebl  Fix lot of small bugs