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

Added gernal filter support for custom fields.

Browse Source 
The view editor shows the internal ID now as well, to avoid confusions.
This commit is contained in:
Andre Lorbach 2008-10-09 17:33:11 +02:00
parent 5ccc5d83b3
commit 033120334f
3 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/admin/views.php
View File

@ -228,6 +228,9 @@ if ( isset($content['ISEDITORNEWVIEW']) && $content['ISEDITORNEWVIEW'] )
else
$myColumn['ColCaption'] = $key;
// Append Internal FieldID
$myColumn['ColInternalID'] = $fields[$key]['FieldDefine'];
// --- Set CSS Class
if ( $i % 2 == 0 )
$myColumn['colcssclass'] = "line1";
@ -260,6 +263,9 @@ if ( isset($content['ISEDITORNEWVIEW']) && $content['ISEDITORNEWVIEW'] )
$myField['FieldCaption'] = $myField['FieldCaption'];
else
$myField['FieldCaption'] = $key;
// Append Internal FieldID
$myField['FieldCaption'] .= " (" . $fields[$key]['FieldDefine'] . ")";
}
// ---
}
@ -547,7 +553,7 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
$myView['COLUMNS'][$myCol]['FieldCaption'] = $fields[$myCol]['FieldCaption'];
else
$myView['COLUMNS'][$myCol]['FieldCaption'] = $myCol;
if ( $iBegin )
{
$myView['COLUMNS'][$myCol]['FieldCaptionSeperator'] = "";

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

@ -264,6 +264,8 @@ abstract class LogStream {
*/
private function ParseFilters($szFilters)
{
global $fields;
if ( isset($szFilters) && strlen($szFilters) > 0 )
{
$tmpEntries = explode(" ", $szFilters);
@ -589,9 +591,44 @@ abstract class LogStream {
break;
/* END WebLog based fields */
default:
$tmpFilterType = FILTER_TYPE_UNKNOWN;
break;
// Unknown filter
// Custom Field, try to guess field!
if ( isset($fields[$tmpArray[FILTER_TMP_KEY]]) && isset($fields[$tmpArray[FILTER_TMP_KEY]]['SearchField']) )
{
$tmpKeyName = $tmpArray[FILTER_TMP_KEY];
$tmpFilterType = $fields[$tmpKeyName]['FieldType'];
// Handle numeric fields!
if ( $tmpFilterType == FILTER_TYPE_NUMBER )
{
// --- Extra numeric Check
if ( isset($tmpValues) )
{
foreach( $tmpValues as $mykey => $szValue )
{
if ( is_numeric($szValue[FILTER_TMP_VALUE]) )
$tmpValues[$mykey][FILTER_TMP_VALUE] = $szValue[FILTER_TMP_VALUE];
else
$tmpValues[$mykey][FILTER_TMP_VALUE] = "";
}
}
else
{
// First set Filter Mode
$tmpArray[FILTER_TMP_MODE] = $this->SetFilterIncludeMode($tmpArray[FILTER_TMP_VALUE]);
if ( !is_numeric($tmpArray[FILTER_TMP_VALUE]) )
$tmpArray[FILTER_TMP_VALUE] = "";
}
// ---
}
// Nothing to do actually!
// else if ( $tmpFilterType == FILTER_TYPE_STRING )
}
else
// Unknown filter
$tmpFilterType = FILTER_TYPE_UNKNOWN;
//done!
}
// Ignore if unknown filter!

12
src/templates/admin/admin_views.html
View File

@ -65,7 +65,7 @@
<!-- IF ISEDITORNEWVIEW="true" -->
<form action="{BASEPATH}admin/views.php{FormUrlAddOP}" method="post">
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate">
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="700" class="with_border_alternate">
<tr>
<td align="center" class="cellmenu1" colspan="2"><b>{LN_VIEWS_ADDEDIT}</b></td>
</tr>
@ -93,16 +93,20 @@
<br>
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate">
<tr>
<td align="center" class="cellmenu1" colspan="3"><b>{LN_VIEWS_COLUMNLIST}</b></td>
<td align="center" class="cellmenu1" colspan="4"><b>{LN_VIEWS_COLUMNLIST}</b></td>
</tr>
<!-- BEGIN SUBCOLUMNS -->
<tr>
<td align="left" class="cellmenu2" width="150"><b>{LN_VIEWS_COLUMN} {ZAEHLER}: </b></td>
<td align="left" class="{colcssclass}" width="300">
<td align="left" class="{colcssclass}" width="200">
<input type="hidden" name="Columns[]" value="{ColFieldID}">
<b>{ColCaption}</b>
</td>
<td align="left" class="{colcssclass}" width="200">
<I>{ColInternalID}</I>
</td>
<td align="center" class="{colcssclass}" width="150">
<button name="subop_moveup" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_UP}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
<button name="subop_movedown" type="submit" value="{ColFieldID}" class="borderlessbuttons" title="{LN_VIEWS_COLUMN_REMOVE}"><img src="{MENU_MOVE_DOWN}" width="16" alt="{LN_VIEWS_COLUMN_REMOVE}"></button>
@ -115,7 +119,7 @@
</tr>
<!-- END SUBCOLUMNS -->
<tr>
<td align="center" class="line2" colspan="3">
<td align="center" class="line2" colspan="4">
<select name="newcolumn" size="1" STYLE="width: 200px">
<!-- BEGIN FIELDS -->