ebl Add role checks for media

[bacula/bacula] / gui / bweb / lib / Bconsole.pm

diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm
index b8304a6c6798dc1529d1abdf3461f7a873b3f840..45ec5d4183c0ce8c5952a92985d0ad2643c7aea0 100644 (file)
--- a/gui/bweb/lib/Bconsole.pm
+++ b/gui/bweb/lib/Bconsole.pm
@@ -2,22 +2,34 @@ use strict;
 
 =head1 LICENSE
 
-    Copyright (C) 2006 Eric Bollengier
-        All rights reserved.
+   Bweb - A Bacula web interface
+   Bacula® - The Network Backup Solution
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    any later version.
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   The main author of Bweb is Eric Bollengier.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zurich,
+   Switzerland, email:ftf@fsfeurope.org.
 
 =head1 VERSION
 
@@ -93,8 +105,7 @@ sub expect_it
 {
     my ($self, @what) = @_;
     unless ($self->{bconsole}->expect($self->{timeout}, @what)) {
-       $self->{error} = $!;
-       return 0;
+       return $self->error($self->{bconsole}->error());
     }
     return 1;
 }
@@ -110,6 +121,16 @@ sub log_stdout
     $self->{log_stdout} = $how;
 }
 
+sub error
+{
+    my ($self, $error) = @_;
+    $self->{error} = $error;
+    if ($error) {
+       print STDERR "E: bconsole (", $self->{pref}->{bconsole}, ") $! $error\n";
+    }
+    return 0;
+}
+
 sub connect
 {
     my ($self) = @_;
@@ -121,8 +142,7 @@ sub connect
     unless ($self->{bconsole}) {
        my @cmd = split(/\s+/, $self->{pref}->{bconsole}) ;
        unless (@cmd) {
-           $self->{error} = "bconsole string not found";
-           return 0;
+           return $self->error("bconsole string not found");
        }
        $self->{bconsole} = new Expect;
        $self->{bconsole}->raw_pty(0);
@@ -135,13 +155,16 @@ sub connect
        { 
            my $sav = $SIG{__DIE__};
            $SIG{__DIE__} = sub {  _exit 1 ;};
+            my $old = $ENV{COLUMNS};
+            $ENV{COLUMNS} = 300;
            $ret = $self->{bconsole}->spawn(@cmd) ;
+           delete $ENV{COLUMNS};
+           $ENV{COLUMNS} = $old if ($old) ;
            $SIG{__DIE__} = $sav;
        }
 
        unless ($ret) {
-           $self->{error} = $!;
-           return 0;
+           return $self->error($self->{bconsole}->error());
        }
        
        # TODO : we must verify that expect return the good value
@@ -216,7 +239,7 @@ sub label_barcodes
     }
 
     $self->send("$cmd\n");
-    $self->expect_it('-re', '[?].+\)\s*:');
+    $self->expect_it('-re', '[?].+\).*:');
     my $res = $self->before();
     $self->send("yes\n");
     $self->expect_it("yes");
@@ -337,7 +360,7 @@ sub _get_volume
            $sel .= " volume=$1";
 
        } else {
-           $self->{error} = "Sorry media is bad";
+           $self->error("Sorry media is bad");
            return '';
        }
     }
@@ -347,9 +370,9 @@ sub _get_volume
 
 sub purge_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("purge $sel");
@@ -361,9 +384,9 @@ sub purge_volume
 
 sub prune_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("prune $sel yes");
@@ -385,8 +408,7 @@ sub purge_job
            $sel .= " jobid=$1";
 
        } else {
-           $self->{error} = "Sorry jobid is bad";
-           return 0;
+           return $self->error("Sorry jobid is bad");
        }
     }