You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/05/09 21:02:36 UTC
svn commit: r405504 [3/3] - in /xerces/c/trunk/swig: interfaces/ perl/
perl/samples/ perl/t/
Modified: xerces/c/trunk/swig/perl/Xerces.pm
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/Xerces.pm?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/Xerces.pm (original)
+++ xerces/c/trunk/swig/perl/Xerces.pm Tue May 9 12:02:33 2006
@@ -4418,6 +4418,41 @@
}
+############# Class : XML::Xerces::DOMConfiguration ##############
+
+package XML::Xerces::DOMConfiguration;
+use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
+@ISA = qw( XML::Xerces );
+%OWNER = ();
+%ITERATORS = ();
+*setParameter = *XML::Xercesc::DOMConfiguration_setParameter;
+*getParameter = *XML::Xercesc::DOMConfiguration_getParameter;
+*canSetParameter = *XML::Xercesc::DOMConfiguration_canSetParameter;
+*getParameterNames = *XML::Xercesc::DOMConfiguration_getParameterNames;
+sub DESTROY {
+ return unless $_[0]->isa('HASH');
+ my $self = tied(%{$_[0]});
+ return unless defined $self;
+ delete $ITERATORS{$self};
+ if (exists $OWNER{$self}) {
+ XML::Xercesc::delete_DOMConfiguration($self);
+ delete $OWNER{$self};
+ }
+}
+
+sub DISOWN {
+ my $self = shift;
+ my $ptr = tied(%$self);
+ delete $OWNER{$ptr};
+}
+
+sub ACQUIRE {
+ my $self = shift;
+ my $ptr = tied(%$self);
+ $OWNER{$ptr} = 1;
+}
+
+
############# Class : XML::Xerces::DOMImplementationLS ##############
package XML::Xerces::DOMImplementationLS;
@@ -4773,11 +4808,14 @@
}
}
+*getStringData = *XML::Xercesc::DOMLSInput_getStringData;
*getByteStream = *XML::Xercesc::DOMLSInput_getByteStream;
*getEncoding = *XML::Xercesc::DOMLSInput_getEncoding;
*getPublicId = *XML::Xercesc::DOMLSInput_getPublicId;
*getSystemId = *XML::Xercesc::DOMLSInput_getSystemId;
*getBaseURI = *XML::Xercesc::DOMLSInput_getBaseURI;
+*setStringData = *XML::Xercesc::DOMLSInput_setStringData;
+*setByteStream = *XML::Xercesc::DOMLSInput_setByteStream;
*setEncoding = *XML::Xercesc::DOMLSInput_setEncoding;
*setPublicId = *XML::Xercesc::DOMLSInput_setPublicId;
*setSystemId = *XML::Xercesc::DOMLSInput_setSystemId;
@@ -4827,12 +4865,15 @@
}
}
+*getStringData = *XML::Xercesc::Wrapper4InputSource_getStringData;
*getByteStream = *XML::Xercesc::Wrapper4InputSource_getByteStream;
*getEncoding = *XML::Xercesc::Wrapper4InputSource_getEncoding;
*getPublicId = *XML::Xercesc::Wrapper4InputSource_getPublicId;
*getSystemId = *XML::Xercesc::Wrapper4InputSource_getSystemId;
*getBaseURI = *XML::Xercesc::Wrapper4InputSource_getBaseURI;
*getIssueFatalErrorIfNotFound = *XML::Xercesc::Wrapper4InputSource_getIssueFatalErrorIfNotFound;
+*setStringData = *XML::Xercesc::Wrapper4InputSource_setStringData;
+*setByteStream = *XML::Xercesc::Wrapper4InputSource_setByteStream;
*setEncoding = *XML::Xercesc::Wrapper4InputSource_setEncoding;
*setPublicId = *XML::Xercesc::Wrapper4InputSource_setPublicId;
*setSystemId = *XML::Xercesc::Wrapper4InputSource_setSystemId;
@@ -4950,6 +4991,44 @@
}
+############# Class : XML::Xerces::DOMLSOutput ##############
+
+package XML::Xerces::DOMLSOutput;
+use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
+@ISA = qw( XML::Xerces );
+%OWNER = ();
+%ITERATORS = ();
+sub DESTROY {
+ return unless $_[0]->isa('HASH');
+ my $self = tied(%{$_[0]});
+ return unless defined $self;
+ delete $ITERATORS{$self};
+ if (exists $OWNER{$self}) {
+ XML::Xercesc::delete_DOMLSOutput($self);
+ delete $OWNER{$self};
+ }
+}
+
+*getByteStream = *XML::Xercesc::DOMLSOutput_getByteStream;
+*getEncoding = *XML::Xercesc::DOMLSOutput_getEncoding;
+*getSystemId = *XML::Xercesc::DOMLSOutput_getSystemId;
+*setByteStream = *XML::Xercesc::DOMLSOutput_setByteStream;
+*setEncoding = *XML::Xercesc::DOMLSOutput_setEncoding;
+*setSystemId = *XML::Xercesc::DOMLSOutput_setSystemId;
+*release = *XML::Xercesc::DOMLSOutput_release;
+sub DISOWN {
+ my $self = shift;
+ my $ptr = tied(%$self);
+ delete $OWNER{$ptr};
+}
+
+sub ACQUIRE {
+ my $self = shift;
+ my $ptr = tied(%$self);
+ $OWNER{$ptr} = 1;
+}
+
+
############# Class : XML::Xerces::StdOutFormatTarget ##############
package XML::Xerces::StdOutFormatTarget;
@@ -5088,10 +5167,8 @@
}
*getDomConfig = *XML::Xercesc::DOMLSSerializer_getDomConfig;
-*setEncoding = *XML::Xercesc::DOMLSSerializer_setEncoding;
*setNewLine = *XML::Xercesc::DOMLSSerializer_setNewLine;
*setFilter = *XML::Xercesc::DOMLSSerializer_setFilter;
-*getEncoding = *XML::Xercesc::DOMLSSerializer_getEncoding;
*getNewLine = *XML::Xercesc::DOMLSSerializer_getNewLine;
*write = *XML::Xercesc::DOMLSSerializer_write;
*writeToURI = *XML::Xercesc::DOMLSSerializer_writeToURI;
Modified: xerces/c/trunk/swig/perl/samples/DOMCreate.pl
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/samples/DOMCreate.pl?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/samples/DOMCreate.pl (original)
+++ xerces/c/trunk/swig/perl/samples/DOMCreate.pl Tue May 9 12:02:33 2006
@@ -66,12 +66,15 @@
'susanhar@us.ibm.com'
));
-my $writer = $impl->createDOMWriter();
-if ($writer->canSetFeature('format-pretty-print',1)) {
- $writer->setFeature('format-pretty-print',1);
+my $writer = $impl->createLSSerializer();
+my $config = $writer->getDomConfig();
+if ($config->canSetParameter('format-pretty-print',1)) {
+ $config->setParameter('format-pretty-print',1);
}
-my $target = XML::Xerces::StdOutFormatTarget->new();
-$writer->writeNode($target,$doc);
+my $outStream = XML::Xerces::StdOutFormatTarget->new();
+my $target = $impl->createLSOutput();
+$target->setByteStream($outStream);
+$writer->write($doc,$target);
exit(0);
Modified: xerces/c/trunk/swig/perl/samples/DOMPrint.pl
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/samples/DOMPrint.pl?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/samples/DOMPrint.pl (original)
+++ xerces/c/trunk/swig/perl/samples/DOMPrint.pl Tue May 9 12:02:33 2006
@@ -138,12 +138,15 @@
my $doc = $parser->getDocument();
my $impl = XML::Xerces::DOMImplementationRegistry::getDOMImplementation('LS');
-my $writer = $impl->createDOMWriter();
-if ($writer->canSetFeature($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1)) {
- $writer->setFeature($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1);
+my $writer = $impl->createLSSerializer();
+my $config = $writer->getDomConfig();
+if ($config->canSetParameter($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1)) {
+ $config->setParameter($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1);
}
-my $target = XML::Xerces::StdOutFormatTarget->new();
-$writer->writeNode($target,$doc);
+my $outStream = XML::Xerces::StdOutFormatTarget->new();
+my $target = $impl->createLSOutput();
+$target->setByteStream($outStream);
+$writer->write($doc,$target);
END {
# NOTICE: We must now explicitly call XMLPlatformUtils::Terminate()
Modified: xerces/c/trunk/swig/perl/t/DOMElement.t
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/t/DOMElement.t?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMElement.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMElement.t Tue May 9 12:02:33 2006
@@ -9,7 +9,7 @@
use Carp;
use blib;
use XML::Xerces;
-use Test::More tests => 20;
+use Test::More tests => 23;
use lib 't';
use TestUtils qw($DOM $PERSONAL_FILE_NAME);
@@ -125,16 +125,16 @@
"setAttributeNS - undef uri fails");
$document = <<XML;
-<root>
-<a>
-<t:a/>
+<root xmlns="http://example.com/test">
+<a xmlns="http://example.org/">
+<t:a xmlns:t="http://example.org/"/>
</a>
</root>
XML
$DOM->parse(XML::Xerces::MemBufInputSource->new($document));
-my $doc = $DOM->getDocument();
+$doc = $DOM->getDocument();
ok($doc->getElementsByTagName('a')->getLength == 1);
ok($doc->getElementsByTagNameNS('http://example.org/', 'a')->getLength == 2);
ok($doc->getElementsByTagNameNS('http://example.com/test', 'root')->getLength == 1);
Modified: xerces/c/trunk/swig/perl/t/PerlErrorHandler.t
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/t/PerlErrorHandler.t?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/t/PerlErrorHandler.t (original)
+++ xerces/c/trunk/swig/perl/t/PerlErrorHandler.t Tue May 9 12:02:33 2006
@@ -137,7 +137,8 @@
COLUMN: 11
MESSAGE: Unknown element 'personnel'
EOE
- ok($expected_error eq $error);
+ ok($expected_error eq $error)
+ or diag("Expected error: [$expected_error]\nFound error: [$error]\n");
}
# test redefining the handler
@@ -168,6 +169,7 @@
COLUMN: 11
MESSAGE: Unknown element 'personnel'
EOE
- ok($expected_error eq $error);
+ ok($expected_error eq $error)
+ or diag("Expected error: [$expected_error]\nFound error: [$error]\n");
}
Modified: xerces/c/trunk/swig/perl/t/SAX2XMLReader.t
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/t/SAX2XMLReader.t?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/t/SAX2XMLReader.t (original)
+++ xerces/c/trunk/swig/perl/t/SAX2XMLReader.t Tue May 9 12:02:33 2006
@@ -9,7 +9,7 @@
use Carp;
# use blib;
use XML::Xerces qw(error);
-use Test::More tests => 23;
+use Test::More tests => 26;
use Config;
use lib 't';
Modified: xerces/c/trunk/swig/perl/t/SAXException.t
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/t/SAXException.t?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/t/SAXException.t (original)
+++ xerces/c/trunk/swig/perl/t/SAXException.t Tue May 9 12:02:33 2006
@@ -1,6 +1,6 @@
# Before `make install' is performed this script should be runnable
# with `make test'. After `make install' it should work as `perl
-# DOMException.t'
+# SAXException.t'
######################### We start with some black magic to print on failure.
Modified: xerces/c/trunk/swig/perl/t/XMLUni.t
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/swig/perl/t/XMLUni.t?rev=405504&r1=405503&r2=405504&view=diff
==============================================================================
--- xerces/c/trunk/swig/perl/t/XMLUni.t (original)
+++ xerces/c/trunk/swig/perl/t/XMLUni.t Tue May 9 12:02:33 2006
@@ -26,8 +26,8 @@
ok($XML::Xerces::XMLUni::fgPubIDString eq 'PUBLIC');
my $impl = XML::Xerces::DOMImplementationRegistry::getDOMImplementation('LS');
-my $writer = $impl->createDOMWriter();
-eval{$writer->setFeature($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1)};
+my $writer = $impl->createLSSerializer();
+eval{$writer->getDomConfig()->setParameter($XML::Xerces::XMLUni::fgDOMWRTFormatPrettyPrint,1)};
ok(!$@,
"Xerces method arguments now handle magic stringify")
or diag(XML::Xerces::error($@));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org