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

Fixed Filtering issues when using multiple filters on the same field.

Browse Source 
The filter handling had to be fixed due earlier filter changes made in the 2.5 beta branch.
Numeric based filters will now work as expected again. This also addresse Bug #108.
This commit is contained in:
Andre Lorbach 2009-03-23 15:59:14 +01:00
parent 5b7eb88b70
commit eeef8ad211
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,9 +292,6 @@ abstract class LogStream {
// Process all filters
if ( $this->_filters != null )
{
// Evaluation default for now is true
$bEval = true;
// Loop through set properties
foreach( $arrProperitesOut as $propertyname => $propertyvalue )
{
@ -305,6 +302,13 @@ abstract class LogStream {
!(is_string($propertyvalue) && strlen($propertyvalue) <= 0) /* Negative because it only matters if the propvalure is a string*/
)
{
// Evaluation default is true
$bEval = true;
// Default for numeric filters is false!
if ( isset($this->_filters[$propertyname][0]) && $this->_filters[$propertyname][0][FILTER_TYPE] == FILTER_TYPE_NUMBER )
$bEval = false;
// Extra var needed for number checks!
$bIsOrFilter = false; // If enabled we need to check for numbereval later
$bOrFilter = false;
@ -462,12 +466,17 @@ abstract class LogStream {
// TODO!
break;
}
}
// If was number filter, we apply it the evaluation.
if ( $bIsOrFilter )
$bEval &= $bOrFilter;
if ( $bIsOrFilter && $bOrFilter)
{
// Fixed binary comparison to | instead of &!
$bEval |= $bOrFilter;
//echo "!" . $bOrFilter . "-" . $bEval . "!<br>";
}
}
// Check if evaluation was successfull
if ( !$bEval )
{
// unmatching filter, reset property array
@ -477,6 +486,7 @@ abstract class LogStream {
// return error!
return ERROR_FILTER_NOT_MATCH;
}
}
}
@ -612,11 +622,13 @@ abstract class LogStream {
}
}
/* OBSELETE CODE
foreach( $tmpValues as $mykey => $szValue )
{
// First set Filter Mode
$tmpValues[$mykey][FILTER_TMP_MODE] = $this->SetFilterIncludeMode($szValue);
}
*/
}
else
{