jasons      2002/08/27 12:33:20

  Modified:    perl/samples DOMCount.pl DOMPrint.pl SAX2Count.pl
                        SAXCount.pl
  Log:
        * samples/SAXCount.pl (Repository):
        * samples/SAX2Count.pl (Repository):
        use XML::Xerces::error()
  
        * samples/DOMPrint.pl (Repository):
        * samples/DOMCount.pl (Repository):
        fixed name of parser
  
  Revision  Changes    Path
  1.13      +7 -12     xml-xerces/perl/samples/DOMCount.pl
  
  Index: DOMCount.pl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/perl/samples/DOMCount.pl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DOMCount.pl       25 Mar 2002 00:48:21 -0000      1.12
  +++ DOMCount.pl       27 Aug 2002 19:33:19 -0000      1.13
  @@ -102,11 +102,11 @@
   my $validate = $OPTIONS{v} || 'auto';
   
   if (uc($validate) eq 'ALWAYS') {
  -  $validate = $XML::Xerces::DOMParser::Val_Always;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Always;
   } elsif (uc($validate) eq 'NEVER') {
  -  $validate = $XML::Xerces::DOMParser::Val_Never;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Never;
   } elsif (uc($validate) eq 'AUTO') {
  -  $validate = $XML::Xerces::DOMParser::Val_Auto;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Auto;
   } else {
     die("Unknown value for -v: $validate\n$USAGE");
   }
  @@ -116,7 +116,7 @@
   # Count the nodes
   #
   
  -my $parser = XML::Xerces::DOMParser->new();
  +my $parser = XML::Xerces::XercesDOMParser->new();
   $parser->setValidationScheme ($validate);
   $parser->setDoNamespaces ($namespace);
   $parser->setCreateEntityReferenceNodes(1);
  @@ -129,13 +129,8 @@
   eval {
     $parser->parse ($file);
   };
  -if ($@) {
  -  if (ref $@) {
  -    die $@->getMessage();
  -  } else {
  -    die $@;
  -  }
  -}
  +XML::Xerces::error($@) if ($@);
  +
   my $doc = $parser->getDocument ();
   my $element_count = $doc->getElementsByTagName("*")->getLength();
   my $t1 = new Benchmark;
  
  
  
  1.10      +10 -17    xml-xerces/perl/samples/DOMPrint.pl
  
  Index: DOMPrint.pl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/perl/samples/DOMPrint.pl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DOMPrint.pl       25 Mar 2002 00:47:18 -0000      1.9
  +++ DOMPrint.pl       27 Aug 2002 19:33:19 -0000      1.10
  @@ -67,7 +67,7 @@
   ######################################################################
   
   use strict;
  -# use blib;
  +use blib;
   use XML::Xerces;
   use XML::Xerces::DOMParse;
   use Getopt::Long;
  @@ -106,11 +106,11 @@
   my $validate = $OPTIONS{v} || 'auto';
   
   if (uc($validate) eq 'ALWAYS') {
  -  $validate = $XML::Xerces::DOMParser::Val_Always;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Always;
   } elsif (uc($validate) eq 'NEVER') {
  -  $validate = $XML::Xerces::DOMParser::Val_Never;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Never;
   } elsif (uc($validate) eq 'AUTO') {
  -  $validate = $XML::Xerces::DOMParser::Val_Auto;
  +  $validate = $XML::Xerces::AbstractDOMParser::Val_Auto;
   } else {
     die("Unknown value for -v: $validate\n$USAGE");
   }
  @@ -119,7 +119,7 @@
   # Parse and print
   #
   
  -my $parser = XML::Xerces::DOMParser->new();
  +my $parser = XML::Xerces::XercesDOMParser->new();
   $parser->setValidationScheme ($validate);
   $parser->setDoNamespaces ($namespace);
   $parser->setCreateEntityReferenceNodes(1);
  @@ -127,17 +127,10 @@
   
   my $ERROR_HANDLER = XML::Xerces::PerlErrorHandler->new();
   $parser->setErrorHandler($ERROR_HANDLER);
  -eval {
  -  $parser->parse (XML::Xerces::LocalFileInputSource->new($file));
  -};
  -if ($@) {
  -  if (ref $@) {
  -    die $@->getMessage();
  -  } else {
  -    die $@;
  -  }
  -}
  -my $doc = $parser->getDocument ();
  +eval {$parser->parse ($file)};
  +XML::Xerces::error($@) if ($@);
  +
  +my $doc = $parser->getDocument();
   
   XML::Xerces::DOMParse::unformat ($doc);
   XML::Xerces::DOMParse::format ($doc);
  
  
  
  1.9       +3 -8      xml-xerces/perl/samples/SAX2Count.pl
  
  Index: SAX2Count.pl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/perl/samples/SAX2Count.pl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SAX2Count.pl      21 Feb 2002 02:55:53 -0000      1.8
  +++ SAX2Count.pl      27 Aug 2002 19:33:20 -0000      1.9
  @@ -174,13 +174,8 @@
   eval {
     $parser->parse (XML::Xerces::LocalFileInputSource->new($file));
   };
  -if ($@) {
  -  if (ref $@) {
  -    die $@->getMessage();
  -  } else {
  -    die $@;
  -  }
  -}
  +XML::Xerces::error($@) if ($@);
  +
   my $t1 = new Benchmark;
   my $td = timediff($t1, $t0);
   
  
  
  
  1.7       +3 -8      xml-xerces/perl/samples/SAXCount.pl
  
  Index: SAXCount.pl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/perl/samples/SAXCount.pl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SAXCount.pl       10 Oct 2001 20:08:58 -0000      1.6
  +++ SAXCount.pl       27 Aug 2002 19:33:20 -0000      1.7
  @@ -157,13 +157,8 @@
   eval {
     $parser->parse (XML::Xerces::LocalFileInputSource->new($file));
   };
  -if ($@) {
  -  if (ref $@) {
  -    die $@->getMessage();
  -  } else {
  -    die $@;
  -  }
  -}
  +XML::Xerces::error($@) if ($@);
  +
   my $t1 = new Benchmark;
   my $td = timediff($t1, $t0);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to