ebl rename rwhere to regexwhere

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

diff --git a/gui/brestore/brestore.pl b/gui/brestore/brestore.pl
index 8b964da743e78f3ae75dd21702802976fc2eb2f3..8fc3c9f9cfab880eab7176b5d198d41fa593d336 100755 (executable)
--- a/gui/brestore/brestore.pl
+++ b/gui/brestore/brestore.pl
@@ -708,7 +708,7 @@ sub get_where
        # using regexp
        if ($self->{glade}->get_widget('chk_use_regexp')->get_active()) {
 
-           return ('rwhere', 
+           return ('regexwhere', 
                    $self->{glade}->get_widget('entry_rwhere')->get_active());
        }
            
@@ -731,7 +731,7 @@ sub get_where
            push @ret,"!([^/])\$!\$1$add_suffix!";
        }
 
-       return ('rwhere', join(',', @ret));
+       return ('regexwhere', join(',', @ret));
 
     } else { # using where
        return ('where', 
@@ -3205,7 +3205,7 @@ sub run
                                storage => $arg{storage} || '',
                                fileset => $arg{fileset} || '',
                                where   => $arg{where}   || '',
-                               rwhere  => $arg{rwhere}  || '',
+                               regexwhere  => $arg{regexwhere}  || '',
                                priority=> $arg{prio}    || '',
                                replace => $arg{replace},
                                action  => 'run',

diff --git a/gui/bweb/cgi/bconsole.pl b/gui/bweb/cgi/bconsole.pl
index 8444151c17d76cc022c379b5a4b9a9b4783ce341..a169dd730c62da2a05079a3493259fb774d229ef 100755 (executable)
--- a/gui/bweb/cgi/bconsole.pl
+++ b/gui/bweb/cgi/bconsole.pl
@@ -85,7 +85,7 @@ for my $a (@action)
     } elsif ($a eq 'run' and $have_run==0) {
        $have_run=1;
 
-       my $arg = $bweb->get_form(qw/job client storage fileset rwhere
+       my $arg = $bweb->get_form(qw/job client storage fileset regexwhere
                                     where replace priority/);
 
        my $bootstrap = CGI::param('bootstrap');
@@ -107,7 +107,7 @@ for my $a (@action)
                                   storage   => $arg->{storage},
                                   fileset   => $arg->{fileset},
                                   where     => $arg->{where},
-                                  rwhere    => $arg->{rwhere},
+                                  regexwhere => $arg->{regexwhere},
                                   replace   => $arg->{replace},
                                   priority  => $arg->{priority},
                                   bootstrap => $filename);

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 722d0c417b06571be5410a9175e18fa65fd8c8a7..507ef03e07b1c09cb147cb6abd7d4376bb990641 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1401,7 +1401,7 @@ sub get_form
                 device => 1,
                 where  => 1,
                 );
-    my %opt_r = (rwhere => 1);
+    my %opt_r = (regexwhere => 1);
 
     my %opt_d = (              # option with date
                 voluseduration=> 1,

diff --git a/gui/debian/changelog b/gui/debian/changelog
index 7628267f371acdfc09e1c3c08d1fe8b875a7614f..3c9b15418a13b08b35f1535c90c6c55f817f2e0e 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,12 +1,12 @@
-bweb (2.0.3-4) stable; urgency=high
+bweb (2.0.3-4) stable; urgency=low
 
    * fix a important bug about directory displayed 2 times
    => YOU MUST RESET YOUR brestore_xxx tables
 
-       DROP TABLES brestore_missing_path;
-       DROP TABLES brestore_pathvisibility;
-       DROP TABLES brestore_pathhierarchy;
-       DROP TABLES brestore_knownjobid;
+   *   DROP TABLES brestore_missing_path;
+   *   DROP TABLES brestore_pathvisibility;
+   *   DROP TABLES brestore_pathhierarchy;
+   *   DROP TABLES brestore_knownjobid;
 
    => DONT USE dbcheck to cleanup Path