[Phpxd-commits] CVS: phpXD phpXD.php,1.17,1.18

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpxd/phpXD
In directory usw-pr-cvs1:/tmp/cvs-serv4609

Modified Files:
	phpXD.php 
Log Message:


Index: phpXD.php
===================================================================
RCS file: /cvsroot/phpxd/phpXD/phpXD.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** phpXD.php	2001/11/25 17:49:36	1.17
--- phpXD.php	2001/11/26 21:26:58	1.18
***************
*** 14,23 ****
  * XML extension (libexpat) is used. Some interface supports DOM Level 2 yet.
  *
! * @link      http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html
! * @link      http://www.w3.org/TR/DOM-Level-2-Core 
! * @copyright Copyright (c) 2001 Thomas Dohmke. All rights reserved.
! * @author    Thomas Dohmke <th...@do...>
! * @version   $Revision$
! * @access    public
  */
  
--- 14,22 ----
  * XML extension (libexpat) is used. Some interface supports DOM Level 2 yet.
  *
! * @package phpXD
! * @author  Thomas Dohmke <th...@do...>
! * @link    http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html
! * @link    http://www.w3.org/TR/DOM-Level-2-Core 
! * @version $Revision$
  */
  
***************
*** 45,50 ****
     * The Document node.
     *
!    * @access    protected
!    * @var       Document
     */
    var $document;
--- 44,49 ----
     * The Document node.
     *
!    * @private
!    * @type    Document
     */
    var $document;
***************
*** 54,59 ****
     * parsing a XML file!
     *
!    * @access    protected
!    * @var       Node
     */
    var $currentNode;
--- 53,58 ----
     * parsing a XML file!
     *
!    * @private
!    * @type    Node
     */
    var $currentNode;
***************
*** 62,67 ****
     * The last node which is parsed. Only valid while parsing a XML file!
     *
!    * @access    protected
!    * @var       Node
     */
    var $lastNode;
--- 61,66 ----
     * The last node which is parsed. Only valid while parsing a XML file!
     *
!    * @private
!    * @type    Node
     */
    var $lastNode;
***************
*** 71,76 ****
     * CDataSection node. Only valid while parsing a XML file!
     *
!    * @access    protected
!    * @var       boolean
     */
    var $parseCData;
--- 70,75 ----
     * CDataSection node. Only valid while parsing a XML file!
     *
!    * @private
!    * @type    boolean
     */
    var $parseCData;
***************
*** 79,84 ****
     * The parsed DTD string. Only valid while parsing a XML file!
     *
!    * @access    protected
!    * @var       string
     */
    var $parsedDTD;
--- 78,83 ----
     * The parsed DTD string. Only valid while parsing a XML file!
     *
!    * @private
!    * @type    string
     */
    var $parsedDTD;
***************
*** 88,93 ****
     * a XML file!
     *
!    * @access    protected
!    * @var       boolean
     */
    var $parsedDTDInternal = false;
--- 87,92 ----
     * a XML file!
     *
!    * @private
!    * @type    boolean
     */
    var $parsedDTDInternal = false;
***************
*** 96,101 ****
     * A array with the defined namespaces.
     *
!    * @access    protected
!    * @var       array
     */
    var $namespaces = false;
--- 95,100 ----
     * A array with the defined namespaces.
     *
!    * @private
!    * @type    array
     */
    var $namespaces = false;
***************
*** 105,110 ****
     * is loaded.
     *
!    * @access    public
!    * @var       string    $file
     */
    function phpXD($file = "") {
--- 104,109 ----
     * is loaded.
     *
!    * @public
!    * @param  $file A filename of a XML file.
     */
    function phpXD($file = "") {
***************
*** 120,125 ****
     * Loads the XML file specified by $file and creates the DOM tree.
     *
!    * @access    public
!    * @var       string    $file
     */
    function loadFile($file) {
--- 119,124 ----
     * Loads the XML file specified by $file and creates the DOM tree.
     *
!    * @public
!    * @param  $file A filename of a XML file.
     */
    function loadFile($file) {
***************
*** 145,150 ****
          if (!xml_parse($parser, $content, true)) {
            $this->displayError("XML error in file %s, line %d: %s", 
!                               $file, 
!                               xml_get_current_line_number($parser), 
                                xml_error_string(xml_get_error_code($parser)));
          }
--- 144,148 ----
          if (!xml_parse($parser, $content, true)) {
            $this->displayError("XML error in file %s, line %d: %s", 
!                               $file, xml_get_current_line_number($parser), 
                                xml_error_string(xml_get_error_code($parser)));
          }
***************
*** 163,169 ****
     * the XML markup are stripped.
     *
!    * @access    private
!    * @var       Node       $dom
!    * @var       boolean    $trim
     */
    function saveFile($file, $trim = false) {
--- 161,167 ----
     * the XML markup are stripped.
     *
!    * @public
!    * @param  $dom  The documentElement of a DOM.
!    * @param  $trim <code>true</code> or <code>false</code>.
     */
    function saveFile($file, $trim = false) {
***************
*** 178,187 ****
     * Writes the DOM tree recursively to the string $text as XML.
     *
!    * @access    private
!    * @var       Node       $dom
!    * @var       int        $deep
!    * @var       boolean    $trim
!    * @var       string     $text
!    * @var       string     $file
     */
    function saveTree(&$dom, $deep, $trim, &$text) {
--- 176,185 ----
     * Writes the DOM tree recursively to the string $text as XML.
     *
!    * @private
!    * @param   $dom
!    * @param   $deep
!    * @param   $trim
!    * @param   $text
!    * @param   $file
     */
    function saveTree(&$dom, $deep, $trim, &$text) {
***************
*** 279,283 ****
     * The Element Start Handler for Expat.
     *
!    * @access    private
     */
    function handleStartElement($parser, $name, $attributes) {
--- 277,281 ----
     * The Element Start Handler for Expat.
     *
!    * @private
     */
    function handleStartElement($parser, $name, $attributes) {
***************
*** 375,379 ****
     * The Element End Handler for Expat.
     *
!    * @access    private
     */
    function handleEndElement($parser, $name) {
--- 373,377 ----
     * The Element End Handler for Expat.
     *
!    * @private
     */
    function handleEndElement($parser, $name) {
***************
*** 385,389 ****
     * The CharacterData Handler for Expat.
     *
!    * @access    private
     */
    function handleCharacterData($parser, $text) {
--- 383,387 ----
     * The CharacterData Handler for Expat.
     *
!    * @private
     */
    function handleCharacterData($parser, $text) {
***************
*** 417,421 ****
     * The ProcessingInstruction Handler for Expat.
     *
!    * @access    private
     */
    function handleProcessingInstruction($parser, $target, $data) {
--- 415,419 ----
     * The ProcessingInstruction Handler for Expat.
     *
!    * @private
     */
    function handleProcessingInstruction($parser, $target, $data) {
***************
*** 435,439 ****
     * is set by handleDefault.
     *
!    * @access    private
     */
    function handleDTD($parser, $data) {
--- 433,437 ----
     * is set by handleDefault.
     *
!    * @private
     */
    function handleDTD($parser, $data) {
***************
*** 477,481 ****
     * The Default Handler for Expat.
     *
!    * @access    private
     */
    function handleDefault($parser, $data) {
--- 475,479 ----
     * The Default Handler for Expat.
     *
!    * @private
     */
    function handleDefault($parser, $data) {
***************
*** 516,520 ****
     * Displays errors, which occur while parsing.
     *
!    * @access    private
     */
    function displayError($message) {
--- 514,518 ----
     * Displays errors, which occur while parsing.
     *
!    * @private
     */
    function displayError($message) {