]> git.sur5r.net Git - bacula/bacula/blobdiff - gui/bacula-web/bweb.inc.php
bacula-web: New function Get_ElapsedTime in bweb.inc.php
[bacula/bacula] / gui / bacula-web / bweb.inc.php
index cab8ed40f7dd4cd60e7230efc1ccf0cb8bd44a58..51f46aed0f66e60344a47b80637634a48d46f4b3 100644 (file)
 | GNU General Public License for more details.                            |
 +-------------------------------------------------------------------------+ 
 */
-// Last Err: 11
-define('CONFIG_DIR', "configs");
-define('CONFIG_FILE', "bacula.conf");
-define('BACULA_TYPE_BYTES_FILES', 1);
-define('BACULA_TYPE_FILES_JOBID', 2);
-define('BACULA_TYPE_BYTES_ENDTIME_ALLJOBS', 69);
-
 require_once "paths.php";
 require_once "DB.php";                                                                                                                  // Pear DB
 require_once "config.inc.php";
@@ -180,26 +173,39 @@ class Bweb extends DB {
                 $this->EndDate=$EndDateYear."-".$EndDateMonth."-".$EndDateDay." 23:59:59";  // last day full
                 
         }//end function
-               function human_file_size( $size, $decimal = 2 )
+               
+               // Return humanized size with default unit of GB
+               // if auto provide for unit argument, automaticaly decide which unit
+               function human_file_size( $size, $decimal = 2, $unit = 'auto' )
                {
                        $unit_id = 0;
                        $lisible = false;
                        $units = array('B','KB','MB','GB','TB');
                        $hsize = $size;
+
+                       switch( $unit )
+                       {
+                               case 'auto';
+                                       while( !$lisible ) {
+                                               if ( $hsize >= 1024 ) {
+                                                       $hsize    = $hsize / 1024;
+                                                       $unit_id += 1;
+                                               }        
+                                               else {
+                                                       $lisible = true;
+                                               } 
+                                       }
+                               break;
                                
-                       while( !$lisible ) {
-                               if ( $hsize >= 1024 ) {
-                                       $hsize    = $hsize / 1024;
-                                       $unit_id += 1;
-                               } 
-                               else {
-                                       $lisible = true;
-                               } 
-                       } 
-                       // Format human size
+                               default:
+                                       $p = array_search( $unit, $units);
+                                       $hsize = $hsize / pow(1024,$p);
+                               break;
+                       } // end switch
+                       
                        $hsize = sprintf("%." . $decimal . "f", $hsize);
-                       return $hsize . ' ' . $units[$unit_id];
+                       $hsize = $hsize . ' ' . $units[$unit_id];
+                       return $hsize;
                } // end function
 
                
@@ -336,69 +342,54 @@ class Bweb extends DB {
                                return $volumes;
         } // end function GetVolumeList()
                
-               public function GetLastJobs( $delay = LAST_DAY )
+               public function CountJobs( $delay = LAST_DAY, $status = 'any' )
                {
-                       $query          = "";
-                       $start_date = "";
-                       $end_date       = "";
+                       $query                  = "SELECT COUNT(JobId) AS job_nb FROM Job ";
+                       $where_delay    = "";
+                       $where_status   = "";
                        
-                       // Interval calculation
-                       $end_date   = mktime();
-                       $start_date = $end_date - $delay;
+                       // Interval condition for SQL query
+                       if( $delay != ALL ) {
+                               $end_date    = mktime();
+                               $start_date  = $end_date - $delay;
                        
-                       $start_date = date( "Y-m-d H:m:s", $start_date );
-                       $end_date   = date( "Y-m-d H:m:s", $end_date );
+                               $start_date  = date( "Y-m-d H:i:s", $start_date );
+                               $end_date    = date( "Y-m-d H:i:s", $end_date );
                        
-                       switch( $this->driver )
-                       {
-                               case 'mysql':
-                                       $query  = 'SELECT COUNT(JobId) AS completed_jobs ';
-                                       $query .= 'FROM Job ';
-                                       $query .= "WHERE EndTime BETWEEN '$start_date' AND '$end_date' ";
-                                       $query .= "AND JobStatus = 'T'";
-                               break;
+                               $where_delay = "WHERE EndTime BETWEEN '$start_date' AND '$end_date' ";
                        }
-               
+                       
+                       if( $status != 'any' ) {
+                               switch( $status )
+                               {
+                                       case 'completed':
+                                               $where_status = "JobStatus = 'T' ";
+                                       break;
+                                       case 'failed':
+                                               $where_status = "JobStatus = 'f' ";
+                                       break;
+                                       case 'canceled':
+                                               $where_status = "JobStatus = 'A' ";
+                                       break;
+                               } // end switch
+                       }
+                       
+                       if( !empty($where_delay) )
+                               $query = $query . $where_delay . 'AND ' . $where_status;
+                       else {
+                               if( !empty($where_status) )
+                                       $query = $query . 'WHERE ' . $where_status;
+                       }
+                               
                        $jobs = $this->db_link->query( $query );
                
                        if (PEAR::isError( $jobs ) ) {
-                               die( "Unable to get last completed jobs status from catalog<br />" . $status->getMessage() );
+                               die( "Unable to get last $status jobs number from catalog <br />" . $jobs->getMessage() );
                        }else {
-                               return $jobs->fetchRow( DB_FETCHMODE_ASSOC );
+                               $jobs = $jobs->fetchRow( DB_FETCHMODE_ASSOC ); 
+                               return $jobs['job_nb'];
                        }
-               } // end function GetLastJobStatus()
-               
-               public function GetLastErrorJobs( $delay = LAST_DAY )
-               {
-                       $query          = "";
-                       
-                       // Interval calculation
-                       $end_date   = mktime();
-                       $start_date = $end_date - $delay;
-                       
-                       $start_date = date( "Y-m-d H:m:s", $start_date );
-                       $end_date   = date( "Y-m-d H:m:s", $end_date );
-                       
-                       //echo "start date: $start_date <br />";
-                       //echo "end date: $end_date <br />";
-                       
-                       switch( $this->driver )
-                       {
-                               default:
-                                       $query  = 'SELECT COUNT(JobId) AS failed_jobs ';
-                                       $query .= 'FROM Job ';
-                                       $query .= "WHERE EndTime BETWEEN '$start_date' AND '$end_date' ";
-                                       $query .= "AND JobStatus = 'f'";
-                               break;
-                       }                               
-                       $result = $this->db_link->query( $query );
-                       
-                       if (PEAR::isError( $result ) ) {
-                               die( "Unable to get last failed jobs status from catalog<br />query = $query <br />" . $result->getMessage() );
-                       }else {
-                               return $result->fetchRow( DB_FETCHMODE_ASSOC );
-                       } // end if else
-               } // end function GetLastErrorJobs
+               }
                
                // Return the list of Pools in a array
                public function Get_Pools_List()
@@ -437,6 +428,27 @@ class Bweb extends DB {
                        }
                }
                
+               // Return elasped time string for a job
+               function Get_ElapsedTime( $start_time, $end_time ) 
+               { 
+                       $diff = $end_time - $start_time;
+                       
+                       $daysDiff = sprintf("%02d", floor($diff/60/60/24) );
+                       $diff -= $daysDiff*60*60*24;
+                       
+                       $hrsDiff = sprintf("%02d", floor($diff/60/60) );
+                       $diff -= $hrsDiff*60*60;
+                       
+                       $minsDiff = sprintf("%02d", floor($diff/60) );
+                       $diff -= $minsDiff*60;
+                       $secsDiff = sprintf("%02d", $diff );
+                       
+                       if( $daysDiff > 0 )
+                               return $daysDiff . 'day(s) ' . $hrsDiff.':' . $minsDiff . ':' . $secsDiff;
+                       else
+                               return $hrsDiff . ':' . $minsDiff . ':' . $secsDiff;
+               }
+               
                public function Get_ElapsedTime_Job( $delay = LAST_DAY )
                {
                        $query                  = "";
@@ -446,8 +458,8 @@ class Bweb extends DB {
                        $end_date   = mktime();
                        $start_date = $end_date - $delay;
                        
-                       $start_date = date( "Y-m-d H:m:s", $start_date );
-                       $end_date   = date( "Y-m-d H:m:s", $end_date );
+                       $start_date = date( "Y-m-d H:i:s", $start_date );
+                       $end_date   = date( "Y-m-d H:i:s", $end_date );
                        
                        switch( $this->driver )
                        {
@@ -466,10 +478,10 @@ class Bweb extends DB {
                                        $total_elapsed += $time['elapsed'];
                                }
                                // Verify if elapsed time is more than 1 day
-                               if ( $total_elapsed > 86400 ) {
-                                       return gmstrftime("%d days %H:%M:%S", $total_elapsed );
+                               if ( $total_elapsed > LAST_DAY ) {
+                                       return date("%d days H:i:s", $total_elapsed );
                                }else {
-                                       return gmstrftime("%H:%M:%S", $total_elapsed );
+                                       return date("H:i:s", $total_elapsed );
                                }
                        }
                }
@@ -491,8 +503,8 @@ class Bweb extends DB {
                        $end_date   = mktime();
                        $start_date = $end_date - $delay;
                        
-                       $start_date = date( "Y-m-d H:m:s", $start_date );
-                       $end_date   = date( "Y-m-d H:m:s", $end_date );
+                       $start_date = date( "Y-m-d H:i:s", $start_date );
+                       $end_date   = date( "Y-m-d H:i:s", $end_date );
                        
                        // Job status
                        switch( $type )
@@ -501,9 +513,9 @@ class Bweb extends DB {
                                        $where = "AND JobStatus = 'T' ";
                                        $label = "Completed";
                                break;
-                               case 'completed_errors':
-                                       $where = "AND JobStatus = 'E' ";
-                                       $label = "Completed with errors";
+                               case 'terminated_errors':
+                                       $where = $interval_where . "JobStatus = 'E' ";
+                                       $label = "Terminated with errors";
                                break;
                                case 'failed':
                                        $where = "AND JobStatus = 'f' ";
@@ -560,6 +572,21 @@ class Bweb extends DB {
                        }
                }
                
+               public function GetStoredFiles()
+               {
+                       $nbfiles = 0;
+                       $query = "SELECT COUNT(FilenameId) AS nbfiles FROM Filename";
+                       $result = $this->db_link->query( $query );
+                       
+                       if( !PEAR::isError($result) ) {
+                               $nbfiles = $result->fetchRow(DB_FETCHMODE_ASSOC);
+                               $nbfiles = $nbfiles['nbfiles'];
+                       }else{
+                               die("Unable to get protected files from catalog");
+                       }
+                       return $nbfiles;
+               }
+               
                public function GetStoredBytes( $delay = LAST_DAY )
                {
                        $query = "SELECT SUM(JobBytes) as stored_bytes FROM Job ";
@@ -568,8 +595,8 @@ class Bweb extends DB {
                        $end_date   = mktime();
                        $start_date = $end_date - $delay;
                        
-                       $start_date = date( "Y-m-d H:m:s", $start_date );
-                       $end_date   = date( "Y-m-d H:m:s", $end_date );
+                       $start_date = date( "Y-m-d H:i:s", $start_date );
+                       $end_date   = date( "Y-m-d H:i:s", $end_date );
                        
                        if( $delay != ALL ) {
                                $query .= "WHERE EndTime BETWEEN '$start_date' AND '$end_date'";
@@ -596,10 +623,10 @@ class Bweb extends DB {
                                $stored_bytes = 0;
                                $tmp = $result->fetchRow( DB_FETCHMODE_ASSOC );
                                
-                               $day = date( "d/m", strtotime($end_date) );
+                               $day = date( "D d", strtotime($end_date) );
                                
                                if( isset( $tmp['stored_bytes'] ) ) {
-                                       $hbytes = $this->human_file_size( $tmp['stored_bytes'], 3);
+                                       $hbytes = $this->human_file_size( $tmp['stored_bytes'], 3, 'GB');
                                        $hbytes = explode( " ", $hbytes );
                                        $stored_bytes = $hbytes[0];
                                }