]> 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 e85efe96bac207051ab50650108619d56d35a2cb..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";
@@ -349,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:i:s", $start_date );
-                       $end_date   = date( "Y-m-d H:i: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:i:s", $start_date );
-                       $end_date   = date( "Y-m-d H:i: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()
@@ -450,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                  = "";
@@ -479,7 +478,7 @@ class Bweb extends DB {
                                        $total_elapsed += $time['elapsed'];
                                }
                                // Verify if elapsed time is more than 1 day
-                               if ( $total_elapsed > 86400 ) {
+                               if ( $total_elapsed > LAST_DAY ) {
                                        return date("%d days H:i:s", $total_elapsed );
                                }else {
                                        return date("H:i:s", $total_elapsed );
@@ -514,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' ";