ebl Rename JobStat table, fix couple of warning

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

diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index 6389b1c2f273f9d9679fc0c7d099eac3299b3d44..180663376f32e2ba30f04ce3232b07bbc672ae0e 100755 (executable)
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -55,9 +55,9 @@ my $debug = $bweb->{debug};
 
 # Job table keep use Media or Job retention, so it's quite enought
 # for good statistics
-# CREATE TABLE job_old (LIKE Job);
-# INSERT INTO job_old
-#    (SELECT * FROM Job WHERE JobId NOT IN (SELECT JobId FROM job_old) );
+# CREATE TABLE JobHistory (LIKE Job);
+# INSERT INTO JobHistory
+#    (SELECT * FROM Job WHERE JobId NOT IN (SELECT JobId FROM JobHistory) );
 my $jobt = $bweb->get_stat_table();
 
 my $graph = CGI::param('graph') || 'job_size';

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 7d201d1219d923d541df0d60268fb788ab05e2b9..7fb7b057816e631547e8b39ceaf9756e756d9aaf 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -1876,7 +1876,7 @@ sub get_form
     }
 
     if ($what{storage_cmd}) {
-       if (!grep {/^$ret{storage_cmd}$/} ('mount', 'umount', 'release','status')) {
+       if (!grep {/^\Q$ret{storage_cmd}$/} ('mount', 'umount', 'release','status')) {
            delete $ret{storage_cmd};
        }
     }
@@ -1890,7 +1890,7 @@ sub get_form
     }
 
     if ($what{since}) {
-        my $age = $ret{age} || $opt_i{age};
+        my $age = $ret{age} || human_sec_unit($opt_i{age});
         my $since = CGI::param('since') || strftime('%F %T', localtime(time - $age));
         if ($since =~ /^(\d{4}-\d{2}-\d{2}( \d{2}:\d{2}:\d{2})?)$/) {
             $ret{since} = $1;

diff --git a/gui/bweb/script/bweb-postgresql.sql b/gui/bweb/script/bweb-postgresql.sql
index d06820c3427c006a3dc1d5a3c396ca8ce09b915b..9c20d7b110420ad295bba99b7ece04465c1b4120 100644 (file)
--- a/gui/bweb/script/bweb-postgresql.sql
+++ b/gui/bweb/script/bweb-postgresql.sql
@@ -1,3 +1,6 @@
+-- Require > 7.4, else use createlang command
+CREATE PROCEDURAL LANGUAGE plpgsql;
+
 -- --------------------------------------------------
 -- Upgrade from 2.2
 -- --------------------------------------------------
@@ -210,7 +213,6 @@ COMMIT;
 --   
 --   
 
-CREATE PROCEDURAL LANGUAGE plpgsql;
 BEGIN;
 
 CREATE FUNCTION SEC_TO_TIME(timestamp with time zone)

diff --git a/gui/bweb/script/update_job_old.sql b/gui/bweb/script/update_job_old.sql
index a922246a4b2a8d5d5e6273fe0f27e51f354036e7..7a81af2621c495bc148ea3fca2cb1c6f3000fca3 100644 (file)
--- a/gui/bweb/script/update_job_old.sql
+++ b/gui/bweb/script/update_job_old.sql
@@ -1,8 +1,8 @@
--- First, create job_old table
--- CREATE TABLE job_old (LIKE Job);
+-- First, create JobHistory table
+-- CREATE TABLE JobHistory (LIKE Job);
 -- 
 -- then put this on your crontab
 -- */20 * * * * psql -f /opt/bacula/etc/update_job_old.sql > /home/bacula/update_job_old.log
-INSERT INTO job_old
-  (SELECT * FROM Job WHERE JobStatus in ('T', 'f', 'A') AND JobId NOT IN (SELECT JobId FROM job_old) );
+INSERT INTO JobHistory
+  (SELECT * FROM Job WHERE JobStatus in ('T', 'f', 'A') AND JobId NOT IN (SELECT JobId FROM JobHistory) );
 

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 1480f5abf3deba5247bc2021fbd0cd9d6970eaa6..12058b5b7e6fa7bdb08a349dc284ad6d7f6591ba 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,6 @@
+20Oct08
+ebl  Rename job_old to JobHistory
+
 07Oct08
 ebl  Add base64_decode_lstat() function to Mysql