Author: grobmeier
Date: Thu Jul 2 12:59:39 2009
New Revision: 790575
URL: http://svn.apache.org/viewvc?rev=790575&view=rev
Log:
moved global vars to class members
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerBasicPatternConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerBasicPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerBasicPatternConverter.php?rev=790575&r1=790574&r2=790575&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/helpers/LoggerBasicPatternConverter.php
(original)
+++
incubator/log4php/trunk/src/main/php/helpers/LoggerBasicPatternConverter.php
Thu Jul 2 12:59:39 2009
@@ -48,26 +48,27 @@
*/
function convert($event) {
switch($this->type) {
- case
LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER:
$timeStamp = $event->getTimeStamp();
$startTime = LoggerLoggingEvent::getStartTime();
return (string)(int)($timeStamp * 1000 -
$startTime * 1000);
- case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER:
return $event->getThreadName();
- case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER:
$level = $event->getLevel();
return $level->toString();
- case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER:
return $event->getNDC();
- case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER:
return $event->getRenderedMessage();
default:
return '';
}
+ echo "OK";
}
}
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php?rev=790575&r1=790574&r2=790575&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
(original)
+++
incubator/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
Thu Jul 2 12:59:39 2009
@@ -49,13 +49,13 @@
function convert($event) {
$locationInfo = $event->getLocationInformation();
switch($this->type) {
- case
LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER:
return $locationInfo->getFullInfo();
- case
LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER:
return $locationInfo->getMethodName();
- case
LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER:
return $locationInfo->getLineNumber();
- case
LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER:
+ case
LoggerPatternParser::LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER:
return $locationInfo->getFileName();
default:
return '';
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php?rev=790575&r1=790574&r2=790575&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php Thu
Jul 2 12:59:39 2009
@@ -20,31 +20,6 @@
* @subpackage helpers
*/
-define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%');
-
-define('LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE', 0);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE', 1);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE', 2);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE', 3);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE', 4);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE', 5);
-
-define('LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER', 1000);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER', 1001);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER', 1002);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER', 1003);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER', 1004);
-
-define('LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER', 2000);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER', 2001);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER', 2002);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER', 2003);
-define('LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER', 2004);
-
-define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601', 'Y-m-d H:i:s,u');
-define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE', 'H:i:s');
-define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u');
-
/**
* Most of the work of the {...@link LoggerPatternLayout} class
* is delegated to the {...@link LoggerPatternParser} class.
@@ -60,6 +35,31 @@
*/
class LoggerPatternParser {
+ const LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR = '%';
+
+ const LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE = 0;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE = 1;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_MINUS_STATE = 2;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE = 3;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE = 4;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE = 5;
+
+ const LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER = 1000;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER = 1001;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_CLASS_LOCATION_CONVERTER = 1002;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER = 1003;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER = 1004;
+
+ const LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER = 2000;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER = 2001;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER = 2002;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER = 2003;
+ const LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER = 2004;
+
+ const LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601 = 'Y-m-d
H:i:s,u';
+ const LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE = 'H:i:s';
+ const LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE = 'd M Y H:i:s,u';
+
var $state;
var $currentLiteral;
var $patternLength;
@@ -94,7 +94,7 @@
$this->pattern = $pattern;
$this->patternLength = strlen($pattern);
$this->formattingInfo = new LoggerFormattingInfo();
- $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
}
/**
@@ -149,20 +149,20 @@
$this->currentLiteral = '';
while($this->i < $this->patternLength) {
$c = $this->pattern{$this->i++};
-// LoggerLog::debug("LoggerPatternParser::parse() char
is now '$c' and currentLiteral is '{$this->currentLiteral}'");
+
switch($this->state) {
- case
LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE:
- //
LoggerLog::debug("LoggerPatternParser::parse() state is
'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'");
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE:
+ //
LoggerLog::debug("LoggerPatternParser::parse() state is
'self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'");
// In literal state, the last char is
always a literal.
if($this->i == $this->patternLength) {
$this->currentLiteral .= $c;
continue;
}
- if($c ==
LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) {
+ if($c ==
self::LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) {
//
LoggerLog::debug("LoggerPatternParser::parse() char is an escape char");
// peek at the next char.
switch($this->pattern{$this->i}) {
- case
LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR:
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR:
//
LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char");
$this->currentLiteral .= $c;
$this->i++; //
move pointer
@@ -177,61 +177,61 @@
$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
}
$this->currentLiteral = $c;
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE;
$this->formattingInfo->reset();
}
} else {
$this->currentLiteral .= $c;
}
break;
- case
LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE:
- //
LoggerLog::debug("LoggerPatternParser::parse() state is
'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'");
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE:
+ //
LoggerLog::debug("LoggerPatternParser::parse() state is
'self::LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'");
$this->currentLiteral .= $c;
switch($c) {
case '-':
$this->formattingInfo->leftAlign = true;
break;
case '.':
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
break;
default:
if(ord($c) >= ord('0')
and ord($c) <= ord('9')) {
$this->formattingInfo->min = ord($c) - ord('0');
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE;
} else {
$this->finalizeConverter($c);
}
} // switch
break;
- case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE:
- //
LoggerLog::debug("LoggerPatternParser::parse() state is
'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'");
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE:
+ //
LoggerLog::debug("LoggerPatternParser::parse() state is
'self::LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'");
$this->currentLiteral .= $c;
if(ord($c) >= ord('0') and ord($c) <=
ord('9')) {
$this->formattingInfo->min =
($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
} else if ($c == '.') {
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
} else {
$this->finalizeConverter($c);
}
break;
- case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE:
- //
LoggerLog::debug("LoggerPatternParser::parse() state is
'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'");
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE:
+ //
LoggerLog::debug("LoggerPatternParser::parse() state is
'self::LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'");
$this->currentLiteral .= $c;
if(ord($c) >= ord('0') and ord($c) <=
ord('9')) {
$this->formattingInfo->max =
ord($c) - ord('0');
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE;
} else {
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
}
break;
- case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE:
- //
LoggerLog::debug("LoggerPatternParser::parse() state is
'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'");
+ case
self::LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE:
+ //
LoggerLog::debug("LoggerPatternParser::parse() state is
'self::LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'");
$this->currentLiteral .= $c;
if(ord($c) >= ord('0') and ord($c) <=
ord('9')) {
$this->formattingInfo->max =
($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
} else {
$this->finalizeConverter($c);
- $this->state =
LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
}
break;
} // switch
@@ -255,57 +255,57 @@
$this->currentLiteral = '';
break;
case 'd':
- $dateFormatStr =
LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
+ $dateFormatStr =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
$dOpt = $this->extractOption();
if($dOpt !== null)
$dateFormatStr = $dOpt;
if($dateFormatStr == 'ISO8601') {
- $df =
LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
+ $df =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
} else if($dateFormatStr == 'ABSOLUTE') {
- $df =
LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE;
+ $df =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE;
} else if($dateFormatStr == 'DATE') {
- $df =
LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE;
+ $df =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE;
} else {
$df = $dateFormatStr;
if($df == null) {
- $df =
LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
+ $df =
self::LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
}
}
$pc = new
LoggerDatePatternConverter($this->formattingInfo, $df);
$this->currentLiteral = '';
break;
case 'F':
- $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER);
+ $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER);
$this->currentLiteral = '';
break;
case 'l':
- $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER);
+ $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER);
$this->currentLiteral = '';
break;
case 'L':
- $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER);
+ $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER);
$this->currentLiteral = '';
break;
case 'm':
- $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER);
+ $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER);
$this->currentLiteral = '';
break;
case 'M':
- $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER);
+ $pc = new
LoggerLocationPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER);
$this->currentLiteral = '';
break;
case 'p':
- $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER);
+ $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER);
$this->currentLiteral = '';
break;
case 'r':
- $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER);
+ $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER);
$this->currentLiteral = '';
break;
case 't':
- $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER);
+ $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER);
$this->currentLiteral = '';
break;
case 'u':
@@ -319,7 +319,7 @@
}
break;
case 'x':
- $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER);
+ $pc = new
LoggerBasicPatternConverter($this->formattingInfo,
self::LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER);
$this->currentLiteral = '';
break;
case 'X':
@@ -339,7 +339,7 @@
// Add the pattern converter to the list.
$this->addToList($pc);
// Next pattern is assumed to be a literal.
- $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+ $this->state =
self::LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
// Reset formatting info
$this->formattingInfo->reset();
}
