cvs: pear /XML_Transformer Transformer.php package.xml /XML_Transformer/Transformer/Driver OutputBuffer.php

sebastian Sat Sep 27 12:09:15 2003 EDT Modified files: /pear/XML_Transformer Transformer.php package.xml /pear/XML_Transformer/Transformer/Driver OutputBuffer.php Log: Refactor debug message system.

Index: pear/XML_Transformer/Transformer.php diff -u pear/XML_Transformer/Transformer.php:1.116 pear/XML_Transformer/Transformer.php:1.117 --- pear/XML_Transformer/Transformer.php:1.116 Sat Sep 27 02:36:23 2003 +++ pear/XML_Transformer/Transformer.php Sat Sep 27 12:09:02 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Transformer.php,v 1.116 2003/09/27 06:36:23 sebastian Exp $ +// $Id: Transformer.php,v 1.117 2003/09/27 16:09:02 sebastian Exp $ // require_once 'XML/Transformer/CallbackRegistry.php'; @@ -28,7 +28,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.116 $ +* @version $Revision: 1.117 $ * @access public */ class XML_Transformer { @@ -195,60 +195,6 @@ } // }}} - // {{{ function logMessage($logMessage, $target = 'error_log') - - /** - * Sends an error message to a given target. - * - * @param string - * @param string - * @access public - * @static - */ - function logMessage($logMessage, $target = 'error_log') { - switch ($target) { - case 'echo': - case 'print': { - print $logMessage; - } - break; - - default: { - error_log($logMessage); - } - } - } - - // }}} - // {{{ function stackdump() - - /** - * Returns a stack dump as a debugging aid. - * - * @param - * @return string - * @access public - */ - function stackdump() { - $stackdump = sprintf( - "Stackdump (level: %s) follows:\n", - $this->_level - ); - - for ($i = $this->_level; $i >= 0; $i--) { - $stackdump .= sprintf( - "level=%d\nelement=%s:%s\ncdata=%s\n\n", - $i, - isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', - isset($this->_attributesStack[$i]) ? XML_Util::attributesToString($this->_attributesStack[$i]) : '', - isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' - ); - } - - return $stackdump; - } - - // }}} // {{{ function overloadNamespace($namespacePrefix, &$object, $recursiveOperation = '') /** @@ -287,7 +233,7 @@ ); } } else { - $this->logMessage( + $this->sendMessage( $result, $this->_logTarget ); @@ -325,6 +271,30 @@ } // }}} + // {{{ function sendMessage($message, $target = 'error_log') + + /** + * Sends a message to a given target. + * + * @param string + * @param string + * @access public + */ + function sendMessage($message, $target = 'error_log') { + switch ($target) { + case 'echo': + case 'print': { + print $message; + } + break; + + default: { + error_log($message); + } + } + } + + // }}} // {{{ function setCaseFolding($caseFolding) /** @@ -390,6 +360,35 @@ } // }}} + // {{{ function stackdump() + + /** + * Returns a stack dump as a debugging aid. + * + * @param + * @return string + * @access public + */ + function stackdump() { + $stackdump = sprintf( + "Stackdump (level: %s) follows:\n", + $this->_level + ); + + for ($i = $this->_level; $i >= 0; $i--) { + $stackdump .= sprintf( + "level=%d\nelement=%s:%s\ncdata=%s\n\n", + $i, + isset($this->_elementStack[$i]) ? $this->_elementStack[$i] : '', + isset($this->_attributesStack[$i]) ? XML_Util::attributesToString($this->_attributesStack[$i]) : '', + isset($this->_cdataStack[$i]) ? $this->_cdataStack[$i] : '' + ); + } + + return $stackdump; + } + + // }}} // {{{ function transform($xml) /** @@ -445,7 +444,7 @@ ); } - $this->logMessage( + $this->sendMessage( $errorMessage . "\n" . $this->stackdump(), $this->_logTarget ); @@ -506,7 +505,7 @@ $this->_attributesStack[$this->_level] = $attributes; if ($this->_checkDebug($element)) { - $this->_debug( + $this->sendMessage( sprintf( 'startElement[%d]: %s %s', $this->_level, @@ -588,7 +587,7 @@ // Recursively process this transformation's result. if ($this->_checkDebug('&RECURSE')) { - $this->_debug( + $this->sendMessage( sprintf( 'start recursion[%d]: %s', $this->_level, @@ -608,7 +607,7 @@ $cdata = $transformer->transform($cdata); if ($this->_checkDebug('&RECURSE')) { - $this->_debug( + $this->sendMessage( sprintf( 'end recursion[%d]: %s', $this->_level, @@ -619,7 +618,7 @@ } if ($this->_checkDebug($element)) { - $this->_debug( + $this->sendMessage( sprintf( 'endElement[%d]: %s (with cdata=%s)', $this->_level, @@ -647,7 +646,7 @@ */ function _characterData($parser, $cdata) { if ($this->_checkDebug('&CDATA')) { - $this->_debug( + $this->sendMessage( sprintf( 'cdata [%d]: %s + %s', $this->_level, @@ -725,22 +724,6 @@ } else { return false; } - } - - // }}} - // {{{ function _debug($debugMessage, $currentElement = '') - - /** - * Sends a debug message to error.log, if debugging is enabled. - * - * @param string - * @access private - */ - function _debug($debugMessage) { - $this->logMessage( - $debugMessage, - $this->_logTarget - ); } // }}} Index: pear/XML_Transformer/package.xml diff -u pear/XML_Transformer/package.xml:1.71 pear/XML_Transformer/package.xml:1.72 --- pear/XML_Transformer/package.xml:1.71 Sat Sep 27 02:36:23 2003 +++ pear/XML_Transformer/package.xml Sat Sep 27 12:09:02 2003 @@ -29,6 +29,8 @@ <date>200Y-MM-DD</date> <notes> <![CDATA[ +* Refactored debug message system. + - Replaced XML_Transformer_Util::attributesToString() with XML_Util::attributesToString(). Index: pear/XML_Transformer/Transformer/Driver/OutputBuffer.php diff -u pear/XML_Transformer/Transformer/Driver/OutputBuffer.php:1.7 pear/XML_Transformer/Transformer/Driver/OutputBuffer.php:1.8 --- pear/XML_Transformer/Transformer/Driver/OutputBuffer.php:1.7 Mon Sep 8 12:25:06 2003 +++ pear/XML_Transformer/Transformer/Driver/OutputBuffer.php Sat Sep 27 12:09:15 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: OutputBuffer.php,v 1.7 2003/09/08 16:25:06 sebastian Exp $ +// $Id: OutputBuffer.php,v 1.8 2003/09/27 16:09:15 sebastian Exp $ // require_once 'XML/Transformer.php'; @@ -55,7 +55,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.7 $ +* @version $Revision: 1.8 $ * @access public */ class XML_Transformer_Driver_OutputBuffer extends XML_Transformer { @@ -104,7 +104,7 @@ $this->_started = true; if ($this->_checkDebug()) { - $this->_debug( + $this->sendMessage( 'start: ' . serialize($this) ); }