Skip to content

- fix "Zend exception" when using Zend > 1.11.12 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- fix "Zend exception" when using Zend > 1.11.12 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions application/models/Job.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function getTerminatedJobs()
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)',
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)'),
'Reviewed'
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong'=>'JobStatusLong'));
Expand All @@ -142,7 +142,7 @@ function getTerminatedJobs()
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => '(EndTime - StartTime)',
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)'),
'Reviewed'
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong'=>'JobStatusLong'));
Expand Down Expand Up @@ -254,7 +254,7 @@ function getRunningJobs()
'StartTime' => "j.StartTime", 'EndTime' => "j.EndTime",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(NOW(), StartTime)'
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(NOW(), StartTime)')
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
$select->joinLeft(array('c' => 'Client'), 'j.ClientId = c.ClientId', array('ClientName' => 'Name'));
Expand All @@ -272,7 +272,7 @@ function getRunningJobs()
'StartTime' => "j.StartTime", 'EndTime' => "j.EndTime",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(NOW() - StartTime)'
'DurationTime' => new Zend_Db_Expr('(NOW() - StartTime)')
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
$select->joinLeft(array('c' => 'Client'), 'j.ClientId = c.ClientId', array('ClientName' => 'Name'));
Expand Down Expand Up @@ -597,7 +597,7 @@ function getProblemJobs($last_days)
array('JobId', 'JobName' => 'Name', 'Level', 'ClientId', 'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong'=>'JobStatusLong'));
break;
Expand All @@ -607,7 +607,7 @@ function getProblemJobs($last_days)
array('JobId', 'JobName' => 'Name', 'Level', 'ClientId', 'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => '(EndTime - StartTime)'
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong'=>'JobStatusLong'));
break;
Expand Down Expand Up @@ -747,7 +747,7 @@ function getSelectFilteredJob($date_begin, $time_begin, $date_end, $time_end,
'EndTime' => "DATE_FORMAT(j.EndTime, '%y-%b-%d %H:%i')",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'));
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')));
break;
case 'PDO_PGSQL':
// PostgreSQL
Expand All @@ -757,7 +757,7 @@ function getSelectFilteredJob($date_begin, $time_begin, $date_end, $time_end,
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)'));
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')));
break;
case 'PDO_SQLITE':
// SQLite3 Documentation
Expand Down Expand Up @@ -856,7 +856,7 @@ function getByJobId($jobid)
'StartTimeRaw' => 'j.StartTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'));
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')));
break;
case 'PDO_PGSQL':
// PostgreSQL
Expand All @@ -866,7 +866,7 @@ function getByJobId($jobid)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)'));
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')));
break;
case 'PDO_SQLITE':
// SQLite3 Documentation
Expand Down Expand Up @@ -917,7 +917,7 @@ function getByJobName($jobname)
'StartTimeRaw' => 'j.StartTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'));
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')));
break;
case 'PDO_PGSQL':
// PostgreSQL
Expand All @@ -927,7 +927,7 @@ function getByJobName($jobname)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)'));
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')));
break;
case 'PDO_SQLITE':
// SQLite3 Documentation
Expand Down Expand Up @@ -972,7 +972,7 @@ function getByVolumeName($volname)
'EndTime' => "DATE_FORMAT(j.EndTime, '%y-%b-%d %H:%i')",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)' ));
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)' )));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
break;
case 'PDO_PGSQL':
Expand All @@ -983,7 +983,7 @@ function getByVolumeName($volname)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)' ));
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)' )));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
break;
case 'PDO_SQLITE':
Expand Down Expand Up @@ -1032,7 +1032,7 @@ function getDetailByJobId($jobid)
'SchedTime' => "DATE_FORMAT(j.SchedTime, '%y-%b-%d %H:%i')",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)', 'PriorJobId',
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)'), 'PriorJobId',
'Reviewed', 'Comment'
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
Expand All @@ -1045,7 +1045,7 @@ function getDetailByJobId($jobid)
'StartTime', 'EndTime', 'SchedTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus', 'Type',
'DurationTime' => '(EndTime - StartTime)', 'PriorJobId',
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)'), 'PriorJobId',
'Reviewed', 'Comment'
));
$select->joinLeft(array('s' => 'Status'), 'j.JobStatus = s.JobStatus', array('JobStatusLong' => 'JobStatusLong'));
Expand Down Expand Up @@ -1129,7 +1129,7 @@ function getLastJobRun($numjob)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')
));
$select->joinLeft(array('c' => 'Client'), 'j.ClientId = c.ClientId', array('ClientName' => 'Name'));
$select->joinLeft(array('p' => 'Pool'), 'j.PoolId = p.PoolId', array('PoolName' => 'Name'));
Expand All @@ -1145,7 +1145,7 @@ function getLastJobRun($numjob)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)'
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')
));
$select->joinLeft(array('c' => 'Client'), 'j.ClientId = c.ClientId', array('ClientName' => 'Name'));
$select->joinLeft(array('p' => 'Pool'), 'j.PoolId = p.PoolId', array('PoolName' => 'Name'));
Expand Down Expand Up @@ -1252,7 +1252,7 @@ function getByFileName($path, $namefile, $client, $limit, $type_search)
'EndTime' => "DATE_FORMAT(j.EndTime, '%y-%b-%d %H:%i')",
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => 'TIMEDIFF(EndTime, StartTime)'));
'DurationTime' => new Zend_Db_Expr('TIMEDIFF(EndTime, StartTime)')));
$select->joinLeft('File', 'j.JobId = File.JobId', array('File.JobId', 'File.FileId'));
$select->joinLeft('Filename', 'File.FilenameId = Filename.FilenameId', array('FileName' => 'Filename.Name'));
$select->joinLeft('Path', 'File.PathId = Path.PathId', array('Path' => 'Path.Path'));
Expand All @@ -1270,7 +1270,7 @@ function getByFileName($path, $namefile, $client, $limit, $type_search)
'StartTime', 'EndTime',
'VolSessionId', 'VolSessionTime', 'JobFiles', 'JobBytes', 'JobErrors', 'Reviewed', 'PoolId',
'FileSetId', 'PurgedFiles', 'JobStatus',
'DurationTime' => '(EndTime - StartTime)'));
'DurationTime' => new Zend_Db_Expr('(EndTime - StartTime)')));
$select->joinLeft('File', 'j.JobId = File.JobId', array('File.JobId', 'File.FileId'));
$select->joinLeft('Filename', 'File.FilenameId = Filename.FilenameId', array('FileName' => 'Filename.Name'));
$select->joinLeft('Path', 'File.PathId = Path.PathId', array('Path' => 'Path.Path'));
Expand Down