cvs: pear /XML_Transformer Transformer.php package.xml /XML_Transformer/Transformer Namespace.php Util.php /XML_Transformer/Transformer/Namespace
Image.php

sebastian Sat Sep 27 02:36:25 2003 EDT Removed files: /pear/XML_Transformer/Transformer Util.php Modified files: /pear/XML_Transformer Transformer.php package.xml /pear/XML_Transformer/Transformer Namespace.php /pear/XML_Transformer/Transformer/Namespace Image.php Log: Remove XML_Transformer_Util class. Index: pear/XML_Transformer/Transformer.php diff -u pear/XML_Transformer/Transformer.php:1.115 pear/XML_Transformer/Transformer.php:1.116 --- pear/XML_Transformer/Transformer.php:1.115 Sat Sep 27 02:28:00 2003 +++ pear/XML_Transformer/Transformer.php Sat Sep 27 02:36:23 2003 @@ -13,11 +13,10 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Transformer.php,v 1.115 2003/09/27 06:28:00 sebastian Exp $ +// $Id: Transformer.php,v 1.116 2003/09/27 06:36:23 sebastian Exp $ // require_once 'XML/Transformer/CallbackRegistry.php'; -require_once 'XML/Transformer/Util.php'; require_once 'XML/Util.php'; /** @@ -29,7 +28,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.115 $ +* @version $Revision: 1.116 $ * @access public */ class XML_Transformer { @@ -196,6 +195,31 @@ } // }}} + // {{{ 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() /** @@ -263,7 +287,7 @@ ); } } else { - XML_Transformer_Util::logMessage( + $this->logMessage( $result, $this->_logTarget ); @@ -421,7 +445,7 @@ ); } - XML_Transformer_Util::logMessage( + $this->logMessage( $errorMessage . "\n" . $this->stackdump(), $this->_logTarget ); @@ -713,7 +737,7 @@ * @access private */ function _debug($debugMessage) { - XML_Transformer_Util::logMessage( + $this->logMessage( $debugMessage, $this->_logTarget ); Index: pear/XML_Transformer/package.xml diff -u pear/XML_Transformer/package.xml:1.70 pear/XML_Transformer/package.xml:1.71 --- pear/XML_Transformer/package.xml:1.70 Sat Sep 27 02:28:00 2003 +++ pear/XML_Transformer/package.xml Sat Sep 27 02:36:23 2003 @@ -56,7 +56,6 @@ <file role="php" name="CallbackRegistry.php"/> <file role="php" name="Namespace.php"/> - <file role="php" name="Util.php"/> </dir> <file role="php" name="Transformer.php"/> Index: pear/XML_Transformer/Transformer/Namespace.php diff -u pear/XML_Transformer/Transformer/Namespace.php:1.21 pear/XML_Transformer/Transformer/Namespace.php:1.22 --- pear/XML_Transformer/Transformer/Namespace.php:1.21 Fri Sep 26 12:52:36 2003 +++ pear/XML_Transformer/Transformer/Namespace.php Sat Sep 27 02:36:24 2003 @@ -13,10 +13,9 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Namespace.php,v 1.21 2003/09/26 16:52:36 sebastian Exp $ +// $Id: Namespace.php,v 1.22 2003/09/27 06:36:24 sebastian Exp $ // -require_once 'XML/Transformer/Util.php'; require_once 'XML/Util.php'; /** @@ -64,7 +63,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.21 $ +* @version $Revision: 1.22 $ * @access public */ class XML_Transformer_Namespace { Index: pear/XML_Transformer/Transformer/Namespace/Image.php diff -u pear/XML_Transformer/Transformer/Namespace/Image.php:1.16 pear/XML_Transformer/Transformer/Namespace/Image.php:1.17 --- pear/XML_Transformer/Transformer/Namespace/Image.php:1.16 Fri Sep 26 12:52:37 2003 +++ pear/XML_Transformer/Transformer/Namespace/Image.php Sat Sep 27 02:36:25 2003 @@ -13,11 +13,10 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Image.php,v 1.16 2003/09/26 16:52:37 sebastian Exp $ +// $Id: Image.php,v 1.17 2003/09/27 06:36:25 sebastian Exp $ // require_once 'XML/Transformer/Namespace.php'; -require_once 'XML/Transformer/Util.php'; require_once 'XML/Util.php'; define('PEAR_XML_TRANSFORMER_IMAGE_FONTPATH', '/usr/X11R6/lib/X11/fonts/truetype'); @@ -57,7 +56,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.16 $ +* @version $Revision: 1.17 $ * @access public */ class XML_Transformer_Namespace_Image extends XML_Transformer_Namespace {