[SCM] Debian packaging of XML-Compile CPAN distribution branch, master, updated. 4569d80cc54388e4388e8482cfc84761ef9b244e
Joenio Costa
joenio at colivre.coop.br
Fri Jan 25 13:01:14 UTC 2013
The following commit has been merged in the master branch:
commit 4f7e769de96b6dff37a27412c95e7e20c2b4ec91
Author: Joenio Costa <joenio at colivre.coop.br>
Date: Fri Jan 25 09:11:01 2013 -0300
Imported Upstream version 1.31
diff --git a/ChangeLog b/ChangeLog
index 075c29c..f093f31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,16 @@ To be resolved:
- nillable support for mixed elements
- typemaps on basic types
+version 1.31: Thu Jan 24 15:33:04 CET 2013
+
+ Fixes:
+ - reader: elements after xsi:type elements.
+ reported by [Lars Thegler]
+ - typos: rt.cpan.org#82919 [Joenio Marques da Costa]
+
+ Improvements:
+ - writer: support prefix notation with XSI_TYPE
+
version 1.30: Mon Nov 26 09:28:10 CET 2012
Fixes:
diff --git a/META.json b/META.json
index 7bf8012..12c622d 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"Mark Overmeer"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921",
+ "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
"license" : [
"perl_5"
],
@@ -48,5 +48,5 @@
}
},
"release_status" : "stable",
- "version" : "1.30"
+ "version" : "1.31"
}
diff --git a/META.yml b/META.yml
index 4a831bd..3542e8b 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120921'
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -30,4 +30,4 @@ requires:
XML::Compile::Tester: 0.9
XML::LibXML: 1.94
bignum: 0.1
-version: 1.30
+version: 1.31
diff --git a/Makefile.PL b/Makefile.PL
index e6c4765..f03e546 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,7 +4,7 @@ use 5.008;
WriteMakefile
( NAME => 'XML::Compile'
- , VERSION => '1.30'
+ , VERSION => '1.31'
, PREREQ_PM =>
{ XML::LibXML => 1.94
diff --git a/README b/README
index ad6f1af..c531f17 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-=== README for XML-Compile version 1.30
-= Generated on Mon Nov 26 09:28:49 2012 by OODoc 2.00
+=== README for XML-Compile version 1.31
+= Generated on Thu Jan 24 00:56:36 2013 by OODoc 2.01
There are various ways to install this module:
@@ -9,16 +9,16 @@ There are various ways to install this module:
(2) if you use Windows, have a look at http://ppm.activestate.com/
(3) if you have downloaded this module manually (as root/administrator)
- gzip -d XML-Compile-1.30.tar.gz
- tar -xf XML-Compile-1.30.tar
- cd XML-Compile-1.30
+ gzip -d XML-Compile-1.31.tar.gz
+ tar -xf XML-Compile-1.31.tar
+ cd XML-Compile-1.31
perl Makefile.PL
make # optional
make test # optional
make install
For usage, see the included manual-pages or
- http://search.cpan.org/dist/XML-Compile-1.30/
+ http://search.cpan.org/dist/XML-Compile-1.31/
Please report problems to
http://rt.cpan.org/Dist/Display.html?Queue=XML-Compile
diff --git a/bin/schema2example b/bin/schema2example
index e5e7880..ef02c37 100644
--- a/bin/schema2example
+++ b/bin/schema2example
@@ -110,7 +110,7 @@ schema components have to be provided explicitly.
The type of the root element, required if the XML is not namespaceo
qualified, although the schema is. If not specified, the root element
-is automatically inspected.
+is automaticly inspected.
The TYPE notation is C<{namespace}localname>. Be warned to use quoting
on the UNIX command-line, because curly braces have a special meaning
@@ -122,7 +122,7 @@ By default, the output is to stdout.
=item --show STRING
-A comma seperated list of comment components which should be included,
+A comma separated list of comment components which should be included,
by default C<ALL>. An empty string or C<NONE> will exclude all comments.
The STRING can also be a comma separated combination of C<struct>, C<type>,
C<occur>, and C<facets>.
diff --git a/html/manual/head.html b/html/manual/head.html
index 7526052..7046a82 100644
--- a/html/manual/head.html
+++ b/html/manual/head.html
@@ -16,7 +16,7 @@
</td><td valign="top">
<!--{a manuals}-->all manuals</a><br />
<!--{a methods}-->all methods and functions</a><br />
- <!--{a diagnostics}-->all diagnostics</a><br />
+ <!--{a diagnostics}-->all diagnostics</a><br />
<!--{a details}-->all details</a><br />
</td></tr>
</table>
diff --git a/html/other/details/index.html b/html/other/details/index.html
index ee89b6f..739961f 100644
--- a/html/other/details/index.html
+++ b/html/other/details/index.html
@@ -16,7 +16,7 @@
</td><td valign="top">
<!--{a manuals}-->all manuals</a><br />
<!--{a methods}-->all methods and functions</a><br />
- <!--{a diagnostics}-->all diagnostics</a><br />
+ <!--{a diagnostics}-->all diagnostics</a><br />
<b>all details</b><br />
</td></tr>
</table>
diff --git a/html/other/diagnostics/index.html b/html/other/diagnostics/index.html
index 1968d11..63baea8 100644
--- a/html/other/diagnostics/index.html
+++ b/html/other/diagnostics/index.html
@@ -15,19 +15,19 @@
</td><td valign="top">
<!--{a manuals}-->all manuals</a><br />
<!--{a methods}-->all methods and functions</a><br />
- <b>all diagnostics</b><br />
+ <b>all diagnostics</b><br />
<!--{a details}-->all details</a><br />
</td></tr>
</table>
<h2>errors</h2>
<table>
-<!--{index DIAGNOSTICS type error}-->
+<!--{index DIAGNOSTICS type => error}-->
</table>
<h2>warnings</h2>
<table>
-<!--{index DIAGNOSTICS type warnings}-->
+<!--{index DIAGNOSTICS type => warnings}-->
</table>
</body>
diff --git a/html/other/manuals/head.html b/html/other/manuals/head.html
index ebd9f0c..c851465 100644
--- a/html/other/manuals/head.html
+++ b/html/other/manuals/head.html
@@ -16,7 +16,7 @@
</td><td valign="top">
<b>all manuals</b><br />
<!--{a methods}-->all methods and functions</a><br />
- <!--{a diagnostics}-->all diagnostics</a><br />
+ <!--{a diagnostics}-->all diagnostics</a><br />
<!--{a details}-->all details</a><br />
</td></tr>
</table>
diff --git a/html/other/methods/index.html b/html/other/methods/index.html
index 7ca1651..2ee8b4f 100644
--- a/html/other/methods/index.html
+++ b/html/other/methods/index.html
@@ -16,7 +16,7 @@
</td><td valign="top">
<!--{a manuals}-->all manuals</a><br />
<b>all methods and functions</b><br />
- <!--{a diagnostics}-->all diagnostics</a><br />
+ <!--{a diagnostics}-->all diagnostics</a><br />
<!--{a details}-->all details</a><br />
</td></tr>
</table>
diff --git a/lib/XML/Compile.pm b/lib/XML/Compile.pm
index 6f1442d..14cbccb 100644
--- a/lib/XML/Compile.pm
+++ b/lib/XML/Compile.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use Log::Report 'xml-compile';
diff --git a/lib/XML/Compile.pod b/lib/XML/Compile.pod
index ec2d735..c282d04 100644
--- a/lib/XML/Compile.pod
+++ b/lib/XML/Compile.pod
@@ -40,7 +40,7 @@ Structure as well.
Imports and includes, as used in the schemas, are NOT performed
automaticly. Schema's and such are NOT collected from internet
dynamically; you have to call L<XML::Compile::Schema::importDefinitions()|XML::Compile::Schema/"Administration">
-explictly with filenames of locally stored copies. Includes do only
+explicitly with filenames of locally stored copies. Includes do only
work if they have a targetNamespace defined, which is the same as that
of the schema it is included into.
@@ -286,8 +286,8 @@ other modules.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -315,7 +315,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/FAQ.pod b/lib/XML/Compile/FAQ.pod
index 521e453..3ac1a46 100644
--- a/lib/XML/Compile/FAQ.pod
+++ b/lib/XML/Compile/FAQ.pod
@@ -53,7 +53,7 @@ the content has.
=head3 qualified elements
-One of the more noticable problems with schemas is the specification of
+One of the more noticeable problems with schemas is the specification of
the namespaces to be used for the schema. In older schema's, like many
important protocols, there was no way to specify whether elements should
be used qualified or not. Some schema's lack the target namespace
@@ -169,7 +169,7 @@ Of course, you can also use an external file for this.
=head3 Example
This is a piece of code actually used. It shows various complications
-when an external schema is "loaded" "dynamically" into an other schema.
+when an external schema is "loaded" "dynamically" into another schema.
# In the top of your script
my $schema_dir = '/usr/share/schemas';
@@ -212,8 +212,8 @@ Try turning on debugging with:
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -241,7 +241,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Iterator.pm b/lib/XML/Compile/Iterator.pm
index 3e92981..5b28b6b 100644
--- a/lib/XML/Compile/Iterator.pm
+++ b/lib/XML/Compile/Iterator.pm
@@ -1,13 +1,13 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile::Iterator;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use XML::Compile::Util qw/pack_type type_of_node SCHEMA2001i/;
diff --git a/lib/XML/Compile/Iterator.pod b/lib/XML/Compile/Iterator.pod
index d803a17..f0db02e 100644
--- a/lib/XML/Compile/Iterator.pod
+++ b/lib/XML/Compile/Iterator.pod
@@ -25,13 +25,13 @@ administered path with be extended with the PATH.
=item XML::Compile::Iterator-E<gt>B<new>(NODE, PATH, FILTER,)
-The NODE is a XML::LibXML::Node object, of which the direct childs
+The NODE is a XML::LibXML::Node object, of which the direct children
are inspected.
The FILTER a CODE reference which is called for each child node.
-The only paramter is the parent NODE, and then it must return
+The only parameter is the parent NODE, and then it must return
either true or false. In case of true, the node is selected.
-The FILTERS is applied to all childs of the NODE once, when the
+The FILTERS is applied to all children of the NODE once, when the
first child is requested by the program.
=back
@@ -46,7 +46,7 @@ Returns the CODE reference which is used to select the nodes.
=item $obj-E<gt>B<node>()
-Returns the XML::LibXML::Node node of which the childs are walked
+Returns the XML::LibXML::Node node of which the children are walked
through.
=item $obj-E<gt>B<path>()
@@ -128,8 +128,8 @@ Returns the textContent of the L<node()|XML::Compile::Iterator/"Attributes">, or
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -157,7 +157,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema.pm b/lib/XML/Compile/Schema.pm
index 3196c32..9cbbb96 100644
--- a/lib/XML/Compile/Schema.pm
+++ b/lib/XML/Compile/Schema.pm
@@ -1,11 +1,11 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
package XML::Compile::Schema;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'XML::Compile';
diff --git a/lib/XML/Compile/Schema.pod b/lib/XML/Compile/Schema.pod
index cba4e45..acb284c 100644
--- a/lib/XML/Compile/Schema.pod
+++ b/lib/XML/Compile/Schema.pod
@@ -68,7 +68,7 @@ XML::Compile::Schema - Compile a schema into CODE
print $type; # shows {myns}mytype
# using a compiled routines cache
- use XML::Compile::Cache; # seperate distribution
+ use XML::Compile::Cache; # separate distribution
my $schema = XML::Compile::Cache->new(...);
# Show which data-structure is expected
@@ -269,7 +269,7 @@ See L<XML::Compile/"Accessors">
=item $obj-E<gt>B<addSchemas>(XML, OPTIONS)
Collect all the schemas defined in the XML data. The XML parameter
-must be a XML::LibXML node, therefore it is adviced to use
+must be a XML::LibXML node, therefore it is advised to use
L<importDefinitions()|XML::Compile::Schema/"Administration">, which has a much more flexible way to
specify the data.
@@ -694,7 +694,7 @@ blank.
=item show_comments => STRING|'ALL'|'NONE'
-A comma seperated list of tokens, which explain what kind of comments need
+A comma separated list of tokens, which explain what kind of comments need
to be included in the output. The available tokens are: C<struct>, C<type>,
C<occur>, C<facets>. A value of C<ALL> will select all available comments.
The C<NONE> or empty string will exclude all comments.
@@ -810,7 +810,7 @@ Schemas may contains C<import> and C<include> statements, which
specify other resources for definitions. In the idea of the XML design
team, those files should be retrieved automatically via an internet
connection from the C<schemaLocation>. However, this is a bad concept; in
-XML::Compile modules you will have to explictly provide filenames on local
+XML::Compile modules you will have to explicitly provide filenames on local
disk using L<importDefinitions()|XML::Compile::Schema/"Administration"> or L<XML::Compile::WSDL11::addWSDL()|XML::Compile::WSDL11/"Extension">.
There are various reasons why I, the author of this module, think the
@@ -1437,9 +1437,14 @@ they will look like C<{namespace}local>, typically produced with
L<XML::Compile::Util::pack_type()|XML::Compile::Util/"Packing">.
When used in a reader, the resulting data-set will contain a C<XSI_TYPE>
-key inbetween the facts which were taken from the element. With the
-writer, you have to provide such an C<XSI_TYPE> value or the element's
-base type will be used (and no C<xsi:type> attribute created).
+key inbetween the facts which were taken from the element. The type is
+is long syntax C<"{$ns}$type">. See L<XML::Compile::Util::unpack_type()|XML::Compile::Util/"Packing">
+
+With the writer, you have to provide such an C<XSI_TYPE> value or the
+element's base type will be used (and no C<xsi:type> attribute created).
+This will probably cause warnings about unused tags. The type can be
+provided in full (see L<XML::Compile::Util::pack_type()|XML::Compile::Util/"Packing">) or [1.31]
+prefixed.
[1.25] then the value is not an ARRAY, but only the keyword C<AUTO>,
the parser will try to auto-detect all types which are valid alternatives.
@@ -1455,7 +1460,7 @@ which list this AUTO gets expanded.
[improved with release 1.10]
The standard practice is to use the localName of the XML elements as
key in the Perl HASH; the key rewrite mechanism is used to change that,
-sometimes to seperate elements which have the same localName within
+sometimes to separate elements which have the same localName within
different name-spaces, or when an element and an attribute share a name
(key rewrite is applied to elements AND attributes) in other cases just
for fun or convenience.
@@ -1613,8 +1618,8 @@ then still only one prefix is added.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -1642,7 +1647,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema/BuiltInFacets.pm b/lib/XML/Compile/Schema/BuiltInFacets.pm
index 0af0831..aa6c4f4 100644
--- a/lib/XML/Compile/Schema/BuiltInFacets.pm
+++ b/lib/XML/Compile/Schema/BuiltInFacets.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
no warnings 'recursion';
package XML::Compile::Schema::BuiltInFacets;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'Exporter';
diff --git a/lib/XML/Compile/Schema/BuiltInFacets.pod b/lib/XML/Compile/Schema/BuiltInFacets.pod
index 543e55b..c9cdaa0 100644
--- a/lib/XML/Compile/Schema/BuiltInFacets.pod
+++ b/lib/XML/Compile/Schema/BuiltInFacets.pod
@@ -30,8 +30,8 @@ The content is not for end-users, but called by the schema translator.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -59,7 +59,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema/BuiltInTypes.pm b/lib/XML/Compile/Schema/BuiltInTypes.pm
index 4a83caf..73e1778 100644
--- a/lib/XML/Compile/Schema/BuiltInTypes.pm
+++ b/lib/XML/Compile/Schema/BuiltInTypes.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
no warnings 'recursion';
package XML::Compile::Schema::BuiltInTypes;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'Exporter';
diff --git a/lib/XML/Compile/Schema/BuiltInTypes.pod b/lib/XML/Compile/Schema/BuiltInTypes.pod
index b136e09..fd8cdad 100644
--- a/lib/XML/Compile/Schema/BuiltInTypes.pod
+++ b/lib/XML/Compile/Schema/BuiltInTypes.pod
@@ -353,8 +353,8 @@ Probably the same rules as L<anyURI()|XML::Compile::Schema::BuiltInTypes/"URI">.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -382,7 +382,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema/Instance.pm b/lib/XML/Compile/Schema/Instance.pm
index 4a40d9c..264bad1 100644
--- a/lib/XML/Compile/Schema/Instance.pm
+++ b/lib/XML/Compile/Schema/Instance.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile::Schema::Instance;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use Log::Report 'xml-compile', syntax => 'SHORT';
diff --git a/lib/XML/Compile/Schema/Instance.pod b/lib/XML/Compile/Schema/Instance.pod
index f045ff5..81138e5 100644
--- a/lib/XML/Compile/Schema/Instance.pod
+++ b/lib/XML/Compile/Schema/Instance.pod
@@ -174,8 +174,8 @@ anyway).
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -203,7 +203,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema/NameSpaces.pm b/lib/XML/Compile/Schema/NameSpaces.pm
index 062a198..82efd6a 100644
--- a/lib/XML/Compile/Schema/NameSpaces.pm
+++ b/lib/XML/Compile/Schema/NameSpaces.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile::Schema::NameSpaces;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use Log::Report 'xml-compile', syntax => 'SHORT';
diff --git a/lib/XML/Compile/Schema/NameSpaces.pod b/lib/XML/Compile/Schema/NameSpaces.pod
index c448322..f612850 100644
--- a/lib/XML/Compile/Schema/NameSpaces.pod
+++ b/lib/XML/Compile/Schema/NameSpaces.pod
@@ -48,7 +48,7 @@ Returns true when EXTTYPE extends BASETYPE.
Lookup the definition for the specified KIND of definition: the name
of a global element, global attribute, attributeGroup or model group.
-The ADDRESS is constructed as C< {uri}name > or as seperate URI and NAME.
+The ADDRESS is constructed as C< {uri}name > or as separate URI and NAME.
-Option --Default
include_used <true>
@@ -62,12 +62,12 @@ The ADDRESS is constructed as C< {uri}name > or as seperate URI and NAME.
=item $obj-E<gt>B<findID>(ADDRESS|(URI,ID))
Lookup the definition for the specified id, which is constructed as
-C< uri#id > or as seperate URI and ID.
+C< uri#id > or as separate URI and ID.
=item $obj-E<gt>B<findSgMembers>(CLASS, TYPE)
Lookup the substitutionGroup alternatives for a specific element, which
-is an TYPE (element full name) of form C< {uri}name > or as seperate
+is an TYPE (element full name) of form C< {uri}name > or as separate
URI and NAME. Returned is an ARRAY of HASHes, each describing one type
(as returned by L<find()|XML::Compile::Schema::NameSpaces/"Accessors">)
@@ -120,7 +120,7 @@ example:
=item $obj-E<gt>B<schemas>(URI)
We need the name-space; when it is lacking then import must help, but that
-must be called explictly.
+must be called explicitly.
=item $obj-E<gt>B<use>(OBJECT)
@@ -135,8 +135,8 @@ This method implements L<XML::Compile::Schema::useSchema()|XML::Compile::Schema/
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -164,7 +164,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Schema/Specs.pm b/lib/XML/Compile/Schema/Specs.pm
index 5ac6a8d..70e0b40 100644
--- a/lib/XML/Compile/Schema/Specs.pm
+++ b/lib/XML/Compile/Schema/Specs.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile::Schema::Specs;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use Log::Report 'xml-compile', syntax => 'SHORT';
diff --git a/lib/XML/Compile/Schema/Specs.pod b/lib/XML/Compile/Schema/Specs.pod
index 41647e0..191435b 100644
--- a/lib/XML/Compile/Schema/Specs.pod
+++ b/lib/XML/Compile/Schema/Specs.pod
@@ -56,8 +56,8 @@ Returns the uri of all predefined schemas.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -85,7 +85,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Translate.pm b/lib/XML/Compile/Translate.pm
index c2b1d52..4f57556 100644
--- a/lib/XML/Compile/Translate.pm
+++ b/lib/XML/Compile/Translate.pm
@@ -1,14 +1,14 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
no warnings 'recursion'; # trees can be quite deep
package XML::Compile::Translate;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
# Errors are either in _class 'usage': called with request
@@ -213,7 +213,7 @@ sub topLevel($$)
elsif($qual eq 'NONE') { $elems_qual = 0 }
elsif($qual eq 'TOP')
{ unless($elems_qual)
- { # explitly overrule the name-space qualification of the
+ { # explicitly overrule the name-space qualification of the
# top-level element, which is dirty but people shouldn't
# use unqualified schemas anyway!!!
$node->removeAttribute('form'); # when in schema
@@ -703,7 +703,6 @@ sub element($)
my $altnodeid = $altnode->nodePath.'#'.$fullname;
delete $self->{_created}{$altnodeid}; # clean nesting cache
-
$alt{$alttype} = $self->element($tree->descend($altnode));
}
$do4 = $self->makeXsiTypeSwitch($where, $name, $comptype, \%alt);
diff --git a/lib/XML/Compile/Translate.pod b/lib/XML/Compile/Translate.pod
index 0a1bbd9..e8c37ee 100644
--- a/lib/XML/Compile/Translate.pod
+++ b/lib/XML/Compile/Translate.pod
@@ -160,7 +160,7 @@ not produce invalid data.
Checking whether the number of occurrences for an item are between
C<minOccurs> and C<maxOccurs> (implied for C<all>, C<sequence>, and
-C<choice> or explictly specified) takes time. Of course, in cases
+C<choice> or explicitly specified) takes time. Of course, in cases
errors must be handled. When this option is set to C<false>,
only distinction between single and array elements is made.
@@ -200,7 +200,7 @@ the schemas is still in-tact, but name-space collission may appear.
Per schema, it can be specified whether the elements and attributes
defined in-there need to be used qualified (with prefix) or not.
This can cause horrible output when within an unqualified schema
-elements are used from an other schema which is qualified.
+elements are used from another schema which is qualified.
The suggested solution in articles about the subject is to provide
people with both a schema which is qualified as one which is not.
@@ -245,7 +245,7 @@ The HASH structure looks like this:
, prefixes => \%namespaces
);
- # share the same namespace defs with an other component
+ # share the same namespace defs with another component
my $other = $schema->compile
( WRITER => ...
, prefixes => \%namespaces
@@ -348,7 +348,7 @@ be used.
sub want_block($$$$) ( my ($type,$ns,$local,$path) = @_; undef}
$schema->blockNamespace(\&want_block);
-It is very well posible that the blocking of some namespaces breaks the
+It is very well possible that the blocking of some namespaces breaks the
validness of messages: when those elements are required but set to be
ignored. There is no way to detect this, on the moment.
@@ -394,8 +394,8 @@ element does not contains sub-elements, otherwise the XML node.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -423,7 +423,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Translate/Reader.pm b/lib/XML/Compile/Translate/Reader.pm
index 6b7d28c..de08ebe 100644
--- a/lib/XML/Compile/Translate/Reader.pm
+++ b/lib/XML/Compile/Translate/Reader.pm
@@ -1,10 +1,10 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
package XML::Compile::Translate::Reader;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'XML::Compile::Translate';
@@ -1039,9 +1039,13 @@ sub makeXsiTypeSwitch($$$$)
or error __x"specified xsi:type list for `{default}' does not contain `{got}'"
, default => $default_type, got => $type;
}
- else { ($alt, $code) = ($default_type, $types->{$default_type}) }
+ else
+ { ($alt, $code) = ($default_type, $types->{$default_type});
+ }
my ($t, $d) = $code->($tree);
+ defined $t or return ();
+
$d = { _ => $d } if ref $d ne 'HASH';
$d->{XSI_TYPE} ||= $alt;
($t, $d);
diff --git a/lib/XML/Compile/Translate/Reader.pod b/lib/XML/Compile/Translate/Reader.pod
index 5bad5a3..1d7dc58 100644
--- a/lib/XML/Compile/Translate/Reader.pod
+++ b/lib/XML/Compile/Translate/Reader.pod
@@ -277,7 +277,7 @@ the XML structure:
=head3 Typemap to Object
-An other option is to implement an object factory: one object which creates
+Another option is to implement an object factory: one object which creates
other objects. In this case, the C<$xmltype> parameter can come of use,
to have one object spawning many different other objects.
@@ -331,8 +331,8 @@ with some extra checks.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -360,7 +360,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Translate/Template.pm b/lib/XML/Compile/Translate/Template.pm
index fda36c7..8362f43 100644
--- a/lib/XML/Compile/Translate/Template.pm
+++ b/lib/XML/Compile/Translate/Template.pm
@@ -1,11 +1,11 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
package XML::Compile::Translate::Template;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'XML::Compile::Translate';
diff --git a/lib/XML/Compile/Translate/Template.pod b/lib/XML/Compile/Translate/Template.pod
index b8a2c35..1116c98 100644
--- a/lib/XML/Compile/Translate/Template.pod
+++ b/lib/XML/Compile/Translate/Template.pod
@@ -111,8 +111,8 @@ of the specified class.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -140,7 +140,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Translate/Writer.pm b/lib/XML/Compile/Translate/Writer.pm
index a487857..29d4a10 100644
--- a/lib/XML/Compile/Translate/Writer.pm
+++ b/lib/XML/Compile/Translate/Writer.pm
@@ -1,11 +1,11 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
package XML::Compile::Translate::Writer;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'XML::Compile::Translate';
@@ -1014,7 +1014,9 @@ sub makeXsiTypeSwitch($$$$)
foreach my $type (sort keys %$types)
{ my ($ns, $local) = unpack_type $type;
my $tag = $self->makeTagQualified($where, undef, $local, $ns);
- $types{$type} = [ $tag, $types->{$type} ];
+
+ # register code under both prefixed and full type name
+ $types{$self->prefixed($type)} = $types{$type} = [$tag,$types->{$type}];
}
sub {
diff --git a/lib/XML/Compile/Translate/Writer.pod b/lib/XML/Compile/Translate/Writer.pod
index dae30b8..c4053b4 100644
--- a/lib/XML/Compile/Translate/Writer.pod
+++ b/lib/XML/Compile/Translate/Writer.pod
@@ -240,8 +240,8 @@ writer considerably.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -269,7 +269,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/lib/XML/Compile/Util.pm b/lib/XML/Compile/Util.pm
index c5d2fb6..7c6850e 100644
--- a/lib/XML/Compile/Util.pm
+++ b/lib/XML/Compile/Util.pm
@@ -1,13 +1,13 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package XML::Compile::Util;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'Exporter';
diff --git a/lib/XML/Compile/Util.pod b/lib/XML/Compile/Util.pod
index 361904d..e477eef 100644
--- a/lib/XML/Compile/Util.pod
+++ b/lib/XML/Compile/Util.pod
@@ -85,8 +85,8 @@ Translate an XML::LibXML::Node into a packed type.
=head1 SEE ALSO
-This module is part of XML-Compile distribution version 1.30,
-built on November 26, 2012. Website: F<http://perl.overmeer.net/xml-compile/>
+This module is part of XML-Compile distribution version 1.31,
+built on January 24, 2013. Website: F<http://perl.overmeer.net/xml-compile/>
Other distributions in this suite:
L<XML::Compile>,
@@ -114,7 +114,7 @@ on C<irc.perl.org>.
=head1 LICENSE
-Copyrights 2006-2012 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2006-2013 by [Mark Overmeer]. For other contributors see ChangeLog.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/t/75type.t b/t/75type.t
index e94441b..5c2e3ca 100644
--- a/t/75type.t
+++ b/t/75type.t
@@ -12,7 +12,7 @@ use XML::Compile::Tester;
use XML::Compile::Util 'SCHEMA2001i';
my $schema2001i = SCHEMA2001i;
-use Test::More tests => 18;
+use Test::More tests => 26;
#use Log::Report mode => 3;
my %xsi_types = ("{$TestNS}f_t1" => [ "{$TestNS}f_t2" ] );
@@ -52,6 +52,15 @@ my $schema = XML::Compile::Schema->new( <<__SCHEMA__ );
</complexType>
</element>
+<element name="f4">
+ <complexType>
+ <sequence>
+ <element name="f_e4" type="me:f_t1" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="size" type="int" />
+ </sequence>
+ </complexType>
+</element>
+
</schema>
__SCHEMA__
@@ -109,3 +118,36 @@ test_rw($schema, "f_test" => <<__XML, \%f1);
<f_a3 f_a1="19" xsi:type="f_t1"/>
</f_test>
__XML
+
+
+#
+### Bug reported by Lars Thegler, 2013-01-15
+#
+
+set_compile_defaults
+ include_namespaces => 1
+ , xsi_type => {"{$TestNS}f_t1" => 'AUTO'};
+
+my %f2 =
+(f_e4 =>
+ [ { XSI_TYPE => "{$TestNS}f_t2"
+ , f_a1 => 20,
+ , f_a2 => 21
+ }
+ , { XSI_TYPE => "{$TestNS}f_t1"
+ , f_a1 => 22
+ }
+ ]
+ , size => 23
+ );
+
+test_rw($schema, "f4" => <<__XML, \%f2);
+<f4 xmlns="$TestNS" xmlns:xsi="$schema2001i">
+ <f_e4 f_a1="20" xsi:type="f_t2">
+ <f_a2>21</f_a2>
+ </f_e4>
+ <f_e4 f_a1="22" xsi:type="f_t1"/>
+ <size>23</size>
+</f4>
+__XML
+
diff --git a/t/TestTools.pm b/t/TestTools.pm
index b39da72..33389d5 100644
--- a/t/TestTools.pm
+++ b/t/TestTools.pm
@@ -1,13 +1,13 @@
-# Copyrights 2006-2012 by [Mark Overmeer].
+# Copyrights 2006-2013 by [Mark Overmeer].
# For other contributors see ChangeLog.
# See the manual pages for details on the licensing terms.
-# Pod stripped from pm file by OODoc 2.00.
+# Pod stripped from pm file by OODoc 2.01.
use warnings;
use strict;
package TestTools;
use vars '$VERSION';
-$VERSION = '1.30';
+$VERSION = '1.31';
use base 'Exporter';
--
Debian packaging of XML-Compile CPAN distribution
More information about the Pkg-perl-cvs-commits
mailing list