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

Fixed some filtering issues

Browse Source
This commit is contained in:
Andre Lorbach 2012-04-05 12:52:23 +02:00
parent 8ca3e0db1e
commit 0e12ccf409
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/classes/logstreammongodb.class.php
View File

@ -1456,7 +1456,6 @@ TODO!!!
{
$szMongoPropID = $dbmapping[$szTableType]['DBMAPPINGS'][$propertyname];
print_r ( $myfilter );
switch( $myfilter[FILTER_TYPE] )
{
case FILTER_TYPE_STRING:
@ -1500,10 +1499,10 @@ TODO!!!
{
if ( $propertyname == SYSLOG_MESSAGE )
// If we filter for Syslog MSG, we use $ALL to match all values
$this->_myMongoQuery[ $szMongoPropID ]['$all'][] = $myfilter[FILTER_VALUE];
$this->_myMongoQuery[ $szMongoPropID ]['$regex'][] = $myfilter[FILTER_VALUE]; // Using REGEX for now!
else
// We use $in by default to get results for each value
$this->_myMongoQuery[ $szMongoPropID ]['$in'][] = $myfilter[FILTER_VALUE];
$this->_myMongoQuery[ $szMongoPropID ]['$regex'][] = $myfilter[FILTER_VALUE]; // Using REGEX for now!
}
else
// $ne equals NOT EQUAL
@ -1587,7 +1586,6 @@ TODO!!!
}
}
}
}
//print_r ( array('x' => array( '$gt' => 5, '$lt' => 20 )) );
@ -1866,12 +1864,11 @@ TODO!!!
$myCursor = $myCursor->sort(array("_id" => -1));
// Copy rows into the buffer!
$iBegin = $this->_currentRecordNum;
// while ($myCursor->hasNext() && $myRow = $myCursor->getNext())
foreach ($myCursor as $myRow)
foreach ($myCursor as $mongoid => $myRow)
{
// Check if result was successfull!
if ( $myRow === FALSE || !$myRow )
// Check if result was successfull! Compare the queried uID and the MONGOID to abort processing if the same ID was returned! Otherwise we have dupplicated results at the end
if ( $myRow === FALSE || !$myRow || $uID == base_convert($mongoid, 16, 10) )
break;
// Convert ID from HEX back to DEC