tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source
This commit is contained in:
Andre Lorbach 2008-07-24 12:01:11 +02:00
commit 22763dc5d0
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/classes/logstreampdo.class.php
View File

@ -627,12 +627,12 @@ class LogStreamPDO extends LogStream {
{ {
// Get SQL Statement // Get SQL Statement
$szSql = $this->CreateSQLStatement($uID); $szSql = $this->CreateSQLStatement($uID);
// Perform Database Query // Perform Database Query
$this->_myDBQuery = $this->_dbhandle->query($szSql); $this->_myDBQuery = $this->_dbhandle->query($szSql);
if ( !$this->_myDBQuery ) if ( !$this->_myDBQuery )
{ {
$this->PrintDebugError("Invalid SQL: ".$szSql); $this->PrintDebugError( "Invalid SQL: ".$szSql . "<br><br>Errorcode: " . $this->_dbhandle->errorCode() );
return ERROR_DB_QUERYFAILED; return ERROR_DB_QUERYFAILED;
} }
@ -672,19 +672,23 @@ class LogStreamPDO extends LogStream {
// return error if there was one! // return error if there was one!
if ( ($res = $this->CreateMainSQLQuery($uID)) != SUCCESS ) if ( ($res = $this->CreateMainSQLQuery($uID)) != SUCCESS )
return $res; return $res;
// return specially with NO RECORDS when 0 records are returned! Otherwise it will be -1
if ( $this->_myDBQuery->rowCount() == 0 )
return ERROR_NOMORERECORDS;
} }
// Copy rows into the buffer! // Copy rows into the buffer!
$iBegin = $this->_currentRecordNum; $iBegin = $this->_currentRecordNum;
$iCount = 0; $iCount = 0;
while( $this->_logStreamConfigObj->RecordsPerQuery > $iCount ) while( $this->_logStreamConfigObj->RecordsPerQuery > $iCount)
{ {
//Obtain next record //Obtain next record
$myRow = $this->_myDBQuery->fetch(PDO::FETCH_ASSOC); $myRow = $this->_myDBQuery->fetch(PDO::FETCH_ASSOC);
// Check if result was successfull! // Check if result was successfull!
if ( $myRow === FALSE ) if ( $myRow === FALSE || !$myRow )
break; break;
$this->bufferedRecords[$iBegin] = $myRow; $this->bufferedRecords[$iBegin] = $myRow;
@ -694,16 +698,6 @@ class LogStreamPDO extends LogStream {
$iCount++; $iCount++;
} }
/*
// Only obtain count if enabled and not done before
if ( $this->_logStreamConfigObj->DBEnableRowCounting && $this->_totalRecordCount == -1 )
{
$this->_totalRecordCount = $this->GetRowCountFromTable();
// if ( $this->_totalRecordCount <= 0 )
// return ERROR_NOMORERECORDS;
}
*/
// return success state if reached this point! // return success state if reached this point!
return SUCCESS; return SUCCESS;
} }