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

Merge branch 'beta' into devel

Browse Source
This commit is contained in:
Andre Lorbach 2009-03-23 16:54:10 +01:00
commit f9ff5748a6
4 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1005,6 +1005,15 @@ abstract class LogStream {
$myBits |= FILTER_MODE_SEARCHFULL;
}
// If Filter is a REGEX match!
$pos = strpos($szValue, "~");
if ( $pos !== false && $pos == 0 )
{
//trunscate -
$szValue = substr( $szValue, 1);
$myBits |= FILTER_MODE_SEARCHREGEX;
}
// return result
return $myBits;
}

12
src/classes/logstreamdb.class.php
View File

@ -801,6 +801,18 @@ class LogStreamDB extends LogStream {
}
// ---
}
else if ( $myfilter[FILTER_MODE] & FILTER_MODE_SEARCHREGEX )
{
// --- Check if user wants to include or exclude!
if ( $myfilter[FILTER_MODE] & FILTER_MODE_INCLUDE)
$addnod = "";
else
$addnod = " NOT";
// ---
$szSearchBegin = " REGEXP '";
$szSearchEnd = "' ";
}
else
{
// --- Check if user wants to include or exclude!

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

@ -800,6 +800,48 @@ class LogStreamPDO extends LogStream {
}
// ---
}
else if ( $myfilter[FILTER_MODE] & FILTER_MODE_SEARCHREGEX )
{
//REGEXP Supported by MYSQL
if ( $this->_logStreamConfigObj->DBType == DB_MYSQL )
{
// --- Check if user wants to include or exclude!
if ( $myfilter[FILTER_MODE] & FILTER_MODE_INCLUDE)
$addnod = " ";
else
$addnod = " NOT";
// ---
$szSearchBegin = "REGEXP '";
$szSearchEnd = "' ";
}
//REGEXP Supported by POSTGRESQL
else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL )
{
// --- Check if user wants to include or exclude!
if ( $myfilter[FILTER_MODE] & FILTER_MODE_INCLUDE)
$addnod = " ";
else
$addnod = " !";
// ---
$szSearchBegin = "~* '";
$szSearchEnd = "' ";
}
else //Fallback use LIKE
{
// --- Check if user wants to include or exclude!
if ( $myfilter[FILTER_MODE] & FILTER_MODE_INCLUDE)
$addnod = " ";
else
$addnod = " NOT";
// ---
// Database Layer does not support REGEXP
$szSearchBegin = "LIKE '%";
$szSearchEnd = "%' ";
}
}
else
{
// --- Check if user wants to include or exclude!

1
src/include/constants_filters.php
View File

@ -67,6 +67,7 @@ define('FILTER_MODE', 'filtermode');
define('FILTER_MODE_INCLUDE', 1);
define('FILTER_MODE_EXCLUDE', 2);
define('FILTER_MODE_SEARCHFULL', 4);
define('FILTER_MODE_SEARCHREGEX', 8);
// --- Init Facility LIST
$content['filter_facility_list'][] = array( "ID" => SYSLOG_KERN, "DisplayName" => "KERN", "selected" => "" );