bconsole => qr!^(.+)?$!,
syslog_file => qr!^(.+)?$!,
log_dir => qr!^(.+)?$!,
- ach_list => qr!^(.+)?$!,
);
=head1 FUNCTION
{
return $self->error("$self->{config_file} : $!");
}
+ my $f=''; my $tmpbuffer;
+ while(read FP,$tmpbuffer,4096)
+ {
+ $f .= $tmpbuffer;
+ }
+ close(FP);
+
+ my $VAR1;
+
+ no strict; # I have no idea of the contents of the file
+ eval "$f" ;
+ use strict;
+
+ if ($f and $@) {
+ $self->load_old();
+ $self->save();
+ return $self->error("If you update from an old bweb install, your must reload this page and if it's fail again, you have to configure bweb again...") ;
+ }
+
+ foreach my $k (keys %$VAR1) {
+ $self->{$k} = $VAR1->{$k};
+ }
+
+ return 1;
+}
+
+=head1 FUNCTION
+
+ load_old - load old configuration format
+
+=cut
- while (my $line = <FP>)
+sub load_old
+{
+ my ($self) = @_ ;
+
+ unless (open(FP, $self->{config_file}))
+ {
+ return $self->error("$self->{config_file} : $!");
+ }
+
+ while (my $line = <FP>)
{
chomp($line);
my ($k, $v) = split(/\s*=\s*/, $line, 2);
- $self->{$k} = $v;
+ if ($k_re{$k}) {
+ $self->{$k} = $v;
+ }
}
close(FP);
{
my ($self) = @_ ;
- unless (open(FP, ">$self->{config_file}"))
- {
- return $self->error("$self->{config_file} : $!");
+ if ($self->{ach_list}) {
+ # shortcut for display_begin
+ $self->{achs} = [ map {{ name => $_ }}
+ keys %{$self->{ach_list}}
+ ];
}
-
- foreach my $k (keys %$self)
+
+ unless (open(FP, ">$self->{config_file}"))
{
- next unless (exists $k_re{$k}) ;
- print FP "$k = $self->{$k}\n";
+ return $self->error("$self->{config_file} : $!\n" .
+ "You must add this to your config file\n"
+ . Data::Dumper::Dumper($self));
}
+ print FP Data::Dumper::Dumper($self);
+
close(FP);
return 1;
}
sub view
{
my ($self) = @_ ;
-
- $self->display($self, "config_view.tpl");
+ $self->display($self, "config_view.tpl");
}
sub modify
}
}
- $self->display($self, "config_view.tpl");
+ $self->view();
if ($self->{error}) { # an error as occured
$self->display($self, 'error.tpl');
=cut
-# TODO : get autochanger definition from config/dump file
-my $ach_list ;
-
-sub get
-{
- my ($name, $bweb) = @_;
-
- unless ($name) {
- return $bweb->error("Can't get your autochanger name ach");
- }
-
- unless ($ach_list) {
- unless (get_defined_ach($bweb)) {
- return undef;
- }
- }
-
- my $a = $ach_list->{$name};
-
- unless ($a) {
- $bweb->error("Can't get your autochanger $name from your ach_list");
- return undef;
- }
-
- $a->{bweb} = $bweb;
-
- return $a;
-}
-
-sub get_defined_ach
-{
- my ($bweb) = @_;
- if (defined $bweb->{info}->{ach_list}) {
- if (open(FP, "<$bweb->{info}->{ach_list}")) {
- my $f=''; my $tmpbuffer;
- while(read FP,$tmpbuffer,4096)
- {
- $f .= $tmpbuffer;
- }
- close(FP);
- no strict; # I have no idea of the contents of the file
- eval '$ach_list = ' . $f ;
- use strict;
- } else {
- return $bweb->error("Can't open $bweb->{info}->{ach_list} $!");
- }
- } else {
- return $bweb->error("Can't find your ach_list file in your configuration");
- }
-
- $bweb->debug($ach_list);
-
- return 1;
-}
-
-sub register
-{
- my ($ach, $bweb) = @_;
- my $err;
-
- if (defined $bweb->{info}->{ach_list})
- {
- unless ($ach_list) {
- get_defined_ach($bweb) ;
- }
-
- $ach_list->{$ach->{name}} = $ach;
-
- if (open(FP, ">$bweb->{info}->{ach_list}")) {
- print FP Data::Dumper::Dumper($ach_list);
- close(FP);
- } else {
- $err = $!;
- $err .= "\nCan you put this in $bweb->{info}->{ach_list}\n";
- $err .= Data::Dumper::Dumper($ach_list);
- }
- } else {
- $err = "ach_list isn't defined";
- }
-
- if ($err) {
- return $bweb->error("Can't find to your ach_list (see bweb configuration) $err");
- }
-
- return 1;
-}
-
sub new
{
my ($class, %arg) = @_;
TO_SEC => " interval '1 second' * ",
SEC_TO_INT => "SEC_TO_INT",
SEC_TO_TIME => '',
+ MATCH => " ~ ",
},
mysql => {
UNIX_TIMESTAMP => 'UNIX_TIMESTAMP',
SEC_TO_INT => '',
TO_SEC => '',
SEC_TO_TIME => 'SEC_TO_TIME',
+ MATCH => " REGEXP ",
},
);
{
my ($self) = @_;
+ my $where='';
+ my $arg = $self->get_form("client", "qre_client");
+
+ if ($arg->{qre_client}) {
+ $where = "WHERE Name $self->{sql}->{MATCH} $arg->{qre_client} ";
+ } elsif ($arg->{client}) {
+ $where = "WHERE Name = '$arg->{client}' ";
+ }
+
my $query = "
SELECT Name AS name,
Uname AS uname,
AutoPrune AS autoprune,
FileRetention AS fileretention,
JobRetention AS jobretention
-
FROM Client
+$where
";
my $all = $self->dbh_selectall_hashref($query, 'name') ;
$_->{jobretention} = human_sec($_->{jobretention});
}
- my $arg = { ID => $cur_id++,
+ my $dsp = { ID => $cur_id++,
clients => [ values %$all] };
- $self->display($arg, "client_list.tpl") ;
+ $self->display($dsp, "client_list.tpl") ;
}
sub get_limit
precmd => 1,
device => 1,
);
-
+
foreach my $i (@what) {
if (exists $opt_i{$i}) {# integer param
my $value = CGI::param($i) || $opt_i{$i} ;
if ($value =~ /^([\w\d\.-]+)$/) {
$ret{$i} = $1;
}
+
} elsif ($i =~ /^j(\w+)s$/) { # quote join args
my @value = CGI::param($1) ;
if (@value) {
Job LEFT JOIN Pool ON (Job.PoolId = Pool.PoolId)
LEFT JOIN FileSet ON (Job.FileSetId = FileSet.FileSetId)
WHERE Client.ClientId=Job.ClientId
+ AND Job.JobStatus != 'R'
$where
$limit
";
my ($where, %elt) = $self->get_param('pool',
'location');
- my $arg = $self->get_form('jmedias');
+ my $arg = $self->get_form('jmedias', 'qre_media');
if ($arg->{jmedias}) {
$where = "AND Media.VolumeName IN ($arg->{jmedias}) $where";
}
+ if ($arg->{qre_media}) {
+ $where = "AND Media.VolumeName $self->{sql}->{MATCH} $arg->{qre_media} $where";
+ }
my $query="
SELECT Media.VolumeName AS volumename,
(SELECT VolStatus FROM Media WHERE VolumeName = '$media')
)
";
-
+ $self->dbh_do($query);
$self->debug($query);
}
return $self->error("Can't get media selection");
}
- my $a = Bweb::Autochanger::get($arg->{ach}, $self);
+ my $a = $self->ach_get($arg->{ach});
unless ($a) {
return 0;
}
# TODO : make this internal to not eject tape ?
use Bconsole;
+
+sub ach_get
+{
+ my ($self, $name) = @_;
+
+ unless ($name) {
+ return $self->error("Can't get your autochanger name ach");
+ }
+
+ unless ($self->{info}->{ach_list}) {
+ return $self->error("Could not find any autochanger");
+ }
+
+ my $a = $self->{info}->{ach_list}->{$name};
+
+ unless ($a) {
+ $self->error("Can't get your autochanger $name from your ach_list");
+ return undef;
+ }
+
+ $a->{bweb} = $self;
+
+ return $a;
+}
+
+sub ach_register
+{
+ my ($self, $ach) = @_;
+
+ $self->{info}->{ach_list}->{$ach->{name}} = $ach;
+
+ $self->{info}->save();
+
+ return 1;
+}
+
+sub ach_edit
+{
+ my ($self) = @_;
+ my $arg = $self->get_form('ach');
+ if (!$arg->{ach}
+ or !$self->{info}->{ach_list}
+ or !$self->{info}->{ach_list}->{$arg->{ach}})
+ {
+ return $self->error("Can't get autochanger name");
+ }
+
+ my $ach = $self->{info}->{ach_list}->{$arg->{ach}};
+
+ my $i=0;
+ $ach->{drives} =
+ [ map { { name => $_, index => $i++ } } @{$ach->{drive_name}} ] ;
+
+ my $b = new Bconsole(pref => $self->{info});
+ my @storages = $b->list_storage() ;
+
+ $ach->{devices} = [ map { { name => $_ } } @storages ];
+
+ $self->display($ach, "ach_add.tpl");
+ delete $ach->{drives};
+ delete $ach->{devices};
+ return 1;
+}
+
+sub ach_del
+{
+ my ($self) = @_;
+ my $arg = $self->get_form('ach');
+
+ if (!$arg->{ach}
+ or !$self->{info}->{ach_list}
+ or !$self->{info}->{ach_list}->{$arg->{ach}})
+ {
+ return $self->error("Can't get autochanger name");
+ }
+
+ delete $self->{info}->{ach_list}->{$arg->{ach}} ;
+
+ $self->{info}->save();
+ $self->{info}->view();
+}
+
sub ach_add
{
my ($self) = @_;
}
my @drives ;
- foreach my $drive (CGI::param('drive'))
+ foreach my $drive (CGI::param('drives'))
{
unless (grep(/^$drive$/,@storages)) {
return $self->error("Can't find $drive in storage list");
device => $arg->{device},
mtxcmd => $arg->{mtxcmd});
- return Bweb::Autochanger::register($a, $self) ;
+ $self->ach_register($a) ;
+
+ $self->{info}->view();
}
sub delete
unless ($row) {
return $self->error("Can't find $arg->{jobid} in catalog");
}
-
$query = "
SELECT Time AS time, LogText AS log
projects / bacula / bacula / blobdiff