Merge lp:~nbrinza/zorba/parse-fragment into lp:zorba
- parse-fragment
- Merge into trunk
Status: | Superseded | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~nbrinza/zorba/parse-fragment | ||||||||||||||||||||||||||||
Merge into: | lp:zorba | ||||||||||||||||||||||||||||
Diff against target: |
5062 lines (+2677/-634) 156 files modified
CMakeLists.txt (+15/-5) ChangeLog (+2/-0) modules/com/zorba-xquery/www/modules/CMakeLists.txt (+1/-0) modules/com/zorba-xquery/www/modules/xml-options.xsd (+89/-0) modules/com/zorba-xquery/www/modules/xml.xq (+110/-96) src/api/xmldatamanagerimpl.cpp (+13/-13) src/diagnostics/diagnostic_en.xml (+6/-6) src/diagnostics/pregenerated/dict_en.cpp (+3/-3) src/functions/pregenerated/func_parse_fragment.cpp (+7/-21) src/functions/pregenerated/func_parse_fragment.h (+3/-3) src/functions/pregenerated/function_enum.h (+1/-2) src/runtime/parsing_and_serializing/fragment_istream.h (+54/-10) src/runtime/parsing_and_serializing/parse_fragment_impl.cpp (+154/-168) src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h (+1/-1) src/runtime/sequences/sequences_impl.cpp (+10/-10) src/runtime/spec/parsing_and_serializing/parse_fragment.xml (+5/-12) src/store/api/load_properties.h (+224/-38) src/store/naive/loader.h (+23/-6) src/store/naive/loader_dtd.cpp (+307/-165) src/store/naive/loader_fast.cpp (+5/-1) src/store/naive/simple_store.cpp (+14/-12) src/types/typeimpl.cpp (+20/-4) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xml.res (+6/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xml.res (+12/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xml.res (+12/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xml.res (+8/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xml.res (+8/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xml.res (+8/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xml.res (+6/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xml.res (+4/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xml.res (+5/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xml.res (+14/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xml.res (+14/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xml.res (+10/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xml.res (+6/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xml.res (+59/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xml.res (+50/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xml.res (+34/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xml.res (+18/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xml.res (+14/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xml.res (+14/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xml.res (+3/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xml.res (+31/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xml.res (+8/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xml.res (+7/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xml.res (+8/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xml.res (+7/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-12.xml.res (+1/-1) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xq (+8/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xq (+19/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xq (+19/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xq (+19/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xq (+19/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xq (+8/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xq (+8/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xq (+8/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xq (+15/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xq (+15/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xq (+15/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xq (+15/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xq (+15/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xq (+16/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xq (+21/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xq (+65/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xq (+20/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xq (+20/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xq (+20/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xq (+9/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xq (+37/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.xq (+11/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.xq (+11/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xq (+13/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xq (+14/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xq (+14/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xq (+14/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-04.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-05.xq (+8/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.xq (+7/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-10.xq (+2/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-11.xq (+7/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-12.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-13.xq (+7/-1) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-14.xq (+6/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-15.xq (+8/-2) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.spec (+0/-1) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq (+0/-8) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec (+0/-1) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.xq (+0/-8) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.spec (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq (+0/-10) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~nbrinza/zorba/parse-fragment | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Graf (community) | Approve | ||
William Candillon | Approve | ||
Matthias Brantner | Approve | ||
Review via email: mp+94419@code.launchpad.net |
This proposal supersedes a proposal from 2012-02-06.
This proposal has been superseded by a proposal from 2012-02-29.
Commit message
Fully streaming parse-xml module.
Description of the change
Fully streaming parse-xml module.
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
It seems to be a problem with the diff:
- bool isLangAttr(const store::Item_t& aAttr) const;
- bool matchesReqLang(
+ bool isLangAttr(const store::Item_t& aAttr) const;
+ bool matchesReqLang(
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal | # |
Yes, indeed, this is a strange corruption that I sometimes get after a merge. I've fixed the issue, resubmitting.
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal | # |
WOW, that's really cool. I just tried parsing a huge file and memory consumption was constant at a low level. Also, skipping root nodes worked like a charm.
I have some question/remarks:
- In the schema, there is a typo skip-top-
- If validation is enabled, will the validation copy or validate-in-place? I think it should validate-in-place for performance reasons.
- From the documentation, it's not clear on which nodes validation will happen if root nodes are skipped.
- Why does the schema have the following copyright notice "Copyright (c)2010 Elsevier, Inc."?
- The copyright should be 2006-2012
- Parsing the following document with <opt:parse-
<root><a id='0'>
0
</b>
</a>
<a id='1'>
1
</a>
<a id='2'>
2
</a>
</root>
- The feature is not added to the ChangeLog
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal | # |
Also, the branch doesn't build without schema support (i.e. ZORBA_NO_
[ 1%] Building CXX object src/CMakeFiles/
/home/mbrantner
/home/mbrantner
/home/mbrantner
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
Why is there an Elsevier copyright for modules/
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal | # |
The Elsevier copyright came from the xqdoc.xsd, which I think I used as a base for the options file. I fixed it together with the other issues Matthias has raised. I've also fixed a couple of other cases where malformed XMLs where handled incorrectly. Resubmitting for merging.
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
I tried the forecast data with the parse function: very impressive!!
For documentation purposes, I would rename the parse-xml prefix to xml, this is more consistent right?
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
Would xmldoc be a good prefix?
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal | # |
It certainly is the closest allowed alternative...
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal | # |
- The branch doesn't build without schema support (i.e. ZORBA_NO_
[ 1%] Building CXX object src/CMakeFiles/
/home/mbrantner
/home/mbrantner
/home/mbrantner
make[2]: *** [src/CMakeFiles
- If validation is enabled, will the validation copy or validate-in-place? I think it should validate-in-place for performance reasons.
William Candillon (wcandillon) : Posted in a previous version of this proposal | # |
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal | # |
All pending issues have been fixed. Resubmitting the proposal for merging.
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
I tried it and it looks like just the best.
William Candillon (wcandillon) wrote : Posted in a previous version of this proposal | # |
Adding David to the review, I think he found a bug.
David Graf (davidagraf) : Posted in a previous version of this proposal | # |
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal | # |
I've fixed the conflict in the Changelog. Resubmitting for merging into the trunk.
Matthias Brantner (matthias-brantner) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
William Candillon (wcandillon) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~nbrinza/zorba/parse-fragment into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job parse-fragment-
The final status was:
1136 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
David Graf (davidagraf) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog
Nicolae Brinza (nbrinza) wrote : | # |
I have fixed the regressions and the conflicts. Resubmitting.
- 10508. By Nicolae Brinza
-
Fixed the regressions in the parse-fragment branch
- 10509. By Nicolae Brinza
-
Merged with Zorba trunk
- 10510. By Nicolae Brinza
-
Added a parse-xml:
parse-xml- fragment( ) function for backwards compatibility. Also made a small fix to a related error message. - 10511. By Nicolae Brinza
-
Merged with Zorba trunk
- 10512. By Nicolae Brinza
-
Updated and merged Matthias' documentation code example for the parse-fragment() function
- 10513. By Nicolae Brinza
-
Added another example in the documentation of the parse-fragment function
- 10514. By Nicolae Brinza
-
Removed the strip-boundary-
whitespace option from the parse-fragment function - 10515. By Nicolae Brinza
-
Fixed the formatting of the code examples in the documenation of the parse-fragment module
- 10516. By Nicolae Brinza
-
Merged with Zorba trunk
- 10517. By Nicolae Brinza
-
Fixed the failing link crawler test in the release build
- 10518. By Nicolae Brinza
-
Merged with Zorba trunk
- 10519. By Nicolae Brinza
-
Merged with Zorba trunk
- 10520. By Nicolae Brinza
-
Added a test for the backwards-
compatible zorba:parse- xml-fragment( ) function - 10521. By Nicolae Brinza
-
Small optimization in the serializer to avoid a repeated string comparison
- 10522. By Nicolae Brinza
-
Merged with Zorba trunk
- 10523. By Nicolae Brinza
-
Documentation fixes.
- 10524. By Nicolae Brinza
-
Reverted a change in the parse fragment module to fix the regressions
- 10525. By Nicolae Brinza
-
Improved documentation of the parse-fragment module
- 10526. By Nicolae Brinza
-
Merged with Zorba trunk
- 10527. By Nicolae Brinza
-
Fixed the type of options parameter to the parse-fragment() function.
- 10528. By Nicolae Brinza
-
Fixed the quantity of the options parameter from ONE to QUESTION.
- 10529. By Nicolae Brinza
-
Merged with Zorba trunk
- 10530. By Nicolae Brinza
-
The parse-fragment function now allows a DOCTYPE declaration in the input.
- 10531. By Nicolae Brinza
-
Merged with Zorba trunk
- 10532. By Nicolae Brinza
-
Updated the Changelog with the parse-fragment info
- 10533. By Nicolae Brinza
-
Updated Changelog with the resolution of bug #1016606
- 10534. By Nicolae Brinza
-
Merged with Zorba trunk
- 10535. By Nicolae Brinza
-
Fixed parse-fragment not handling correctly the streammable streams lifetime.
- 10536. By Nicolae Brinza
-
The input buffer of parse-fragment can grow if libxml is not able to parse the current chunk. Fixes bug #1027270
- 10537. By Nicolae Brinza
-
Merged with Zorba trunk
- 10538. By Nicolae Brinza
-
Merged with Zorba trunk
- 10539. By Nicolae Brinza
-
Updated the Changelog with fixes for bugs #1016606 and #1024033
- 10540. By Nicolae Brinza
-
Updated the Changelog with the fix for the bug #1023170
- 10541. By Nicolae Brinza
-
Merged with Zorba trunk
- 10542. By Nicolae Brinza
-
Fix for bug #1099535 endless loop in xml:parse()
- 10543. By Nicolae Brinza
-
Merged with Zorba trunk
- 10544. By Nicolae Brinza
-
Updated Changelog to mention fix for bug #1099535
- 10545. By Nicolae Brinza
-
Merged with Zorba trunk
- 10546. By Nicolae Brinza
-
Fixed bug #1099648 -- XML parsing failures on Red Hat
- 10547. By Nicolae Brinza
-
Updated Changelog to mention the fix for bug #1099648
- 10548. By Nicolae Brinza
-
Merged with Zorba trunk
Unmerged revisions
- 10548. By Nicolae Brinza
-
Merged with Zorba trunk
Preview Diff
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2012-02-15 10:25:02 +0000 | |||
3 | +++ CMakeLists.txt 2012-02-23 17:28:26 +0000 | |||
4 | @@ -237,11 +237,21 @@ | |||
5 | 237 | MESSAGE(STATUS "Looking for LibXml2") | 237 | MESSAGE(STATUS "Looking for LibXml2") |
6 | 238 | FIND_PACKAGE(LibXml2) | 238 | FIND_PACKAGE(LibXml2) |
7 | 239 | IF(LIBXML2_FOUND) | 239 | IF(LIBXML2_FOUND) |
13 | 240 | MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES}) | 240 | # Now check LibXml2's version |
14 | 241 | 241 | FILE(STRINGS ${LIBXML2_INCLUDE_DIR}/libxml/xmlversion.h LIBXML2_VERSION_TMP REGEX | |
15 | 242 | INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) | 242 | "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\".*\"") |
16 | 243 | SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES}) | 243 | STRING(REGEX REPLACE "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\"(.*)\"" "\\1" |
17 | 244 | SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS}) | 244 | LIBXML2_VERSION ${LIBXML2_VERSION_TMP}) |
18 | 245 | |||
19 | 246 | IF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") | ||
20 | 247 | MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES}) | ||
21 | 248 | INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) | ||
22 | 249 | SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES}) | ||
23 | 250 | SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS}) | ||
24 | 251 | ELSE(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") | ||
25 | 252 | MESSAGE(FATAL_ERROR "The libxml2 library version 2.7.0 or higher is required in order to build Zorba.") | ||
26 | 253 | ENDIF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") | ||
27 | 254 | |||
28 | 245 | ELSE(LIBXML2_FOUND) | 255 | ELSE(LIBXML2_FOUND) |
29 | 246 | MESSAGE(FATAL_ERROR "The libxml2 library and headers are required in order to build simple store.") | 256 | MESSAGE(FATAL_ERROR "The libxml2 library and headers are required in order to build simple store.") |
30 | 247 | ENDIF(LIBXML2_FOUND) | 257 | ENDIF(LIBXML2_FOUND) |
31 | 248 | 258 | ||
32 | === modified file 'ChangeLog' | |||
33 | --- ChangeLog 2012-02-21 19:20:00 +0000 | |||
34 | +++ ChangeLog 2012-02-23 17:28:26 +0000 | |||
35 | @@ -2,6 +2,8 @@ | |||
36 | 2 | 2 | ||
37 | 3 | version 2.2 | 3 | version 2.2 |
38 | 4 | 4 | ||
39 | 5 | * The core parse-xml module is now able to parse input files in a streaming mode. A number of new options have also been added. | ||
40 | 6 | * LibXml2 version 2.7.0 or higher is now required in order to build Zorba. | ||
41 | 5 | * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr) | 7 | * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr) |
42 | 6 | * Fixed bug 923015 (clone() not implemented for full-text expressions) | 8 | * Fixed bug 923015 (clone() not implemented for full-text expressions) |
43 | 7 | * No-copy optimization: avoids copying nodes during node-constructor expressions. | 9 | * No-copy optimization: avoids copying nodes during node-constructor expressions. |
44 | 8 | 10 | ||
45 | === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' | |||
46 | --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2012-02-16 14:11:02 +0000 | |||
47 | +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2012-02-23 17:28:26 +0000 | |||
48 | @@ -63,6 +63,7 @@ | |||
49 | 63 | URI "http://www.zorba-xquery.com/modules/schema") | 63 | URI "http://www.zorba-xquery.com/modules/schema") |
50 | 64 | DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1 | 64 | DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1 |
51 | 65 | URI "http://www.zorba-xquery.com/modules/string") | 65 | URI "http://www.zorba-xquery.com/modules/string") |
52 | 66 | DECLARE_ZORBA_SCHEMA(FILE xml-options.xsd URI "http://www.zorba-xquery.com/modules/xml-options") | ||
53 | 66 | DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0 | 67 | DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0 |
54 | 67 | URI "http://www.zorba-xquery.com/modules/xml") | 68 | URI "http://www.zorba-xquery.com/modules/xml") |
55 | 68 | DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 | 69 | DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 |
56 | 69 | 70 | ||
57 | === added file 'modules/com/zorba-xquery/www/modules/xml-options.xsd' | |||
58 | --- modules/com/zorba-xquery/www/modules/xml-options.xsd 1970-01-01 00:00:00 +0000 | |||
59 | +++ modules/com/zorba-xquery/www/modules/xml-options.xsd 2012-02-23 17:28:26 +0000 | |||
60 | @@ -0,0 +1,89 @@ | |||
61 | 1 | <?xml version="1.0"?> | ||
62 | 2 | <!-- | ||
63 | 3 | - Copyright 2006-2012 The FLWOR Foundation. | ||
64 | 4 | - | ||
65 | 5 | - Licensed under the Apache License, Version 2.0 (the "License"); | ||
66 | 6 | - you may not use this file except in compliance with the License. | ||
67 | 7 | - You may obtain a copy of the License at | ||
68 | 8 | - | ||
69 | 9 | - http://www.apache.org/licenses/LICENSE-2.0 | ||
70 | 10 | - | ||
71 | 11 | - Unless required by applicable law or agreed to in writing, software | ||
72 | 12 | - distributed under the License is distributed on an "AS IS" BASIS, | ||
73 | 13 | - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
74 | 14 | - See the License for the specific language governing permissions and | ||
75 | 15 | - limitations under the License. | ||
76 | 16 | --> | ||
77 | 17 | <schema xmlns="http://www.w3.org/2001/XMLSchema" | ||
78 | 18 | targetNamespace="http://www.zorba-xquery.com/modules/xml-options" | ||
79 | 19 | elementFormDefault="qualified" attributeFormDefault="qualified"> | ||
80 | 20 | |||
81 | 21 | <element name="options"> | ||
82 | 22 | <complexType> | ||
83 | 23 | <all> | ||
84 | 24 | |||
85 | 25 | <element name="base-uri" minOccurs="0" maxOccurs="1"> | ||
86 | 26 | <complexType> | ||
87 | 27 | <attribute name="value" type="anyURI" use="required"/> | ||
88 | 28 | </complexType> | ||
89 | 29 | </element> | ||
90 | 30 | <element name="no-error" minOccurs="0" maxOccurs="1"> | ||
91 | 31 | <complexType/> | ||
92 | 32 | </element> | ||
93 | 33 | <element name="strip-boundary-space" minOccurs="0" maxOccurs="1"> | ||
94 | 34 | <complexType/> | ||
95 | 35 | </element> | ||
96 | 36 | <element name="schema-validate" minOccurs="0" maxOccurs="1"> | ||
97 | 37 | <complexType> | ||
98 | 38 | <attribute name="mode" default="strict"> | ||
99 | 39 | <simpleType> | ||
100 | 40 | <restriction base="string"> | ||
101 | 41 | <enumeration value="strict"/> | ||
102 | 42 | <enumeration value="lax"/> | ||
103 | 43 | </restriction> | ||
104 | 44 | </simpleType> | ||
105 | 45 | </attribute> | ||
106 | 46 | </complexType> | ||
107 | 47 | </element> | ||
108 | 48 | <element name="DTD-validate" minOccurs="0" maxOccurs="1"> | ||
109 | 49 | <complexType/> | ||
110 | 50 | </element> | ||
111 | 51 | <element name="DTD-load" minOccurs="0" maxOccurs="1"> | ||
112 | 52 | <complexType/> | ||
113 | 53 | </element> | ||
114 | 54 | <element name="default-DTD-attributes" minOccurs="0" maxOccurs="1"> | ||
115 | 55 | <complexType/> | ||
116 | 56 | </element> | ||
117 | 57 | <element name="parse-external-parsed-entity" minOccurs="0" maxOccurs="1"> | ||
118 | 58 | <complexType> | ||
119 | 59 | <attribute name="skip-root-nodes" use="optional"> | ||
120 | 60 | <simpleType> | ||
121 | 61 | <restriction base="int"> | ||
122 | 62 | <minInclusive value="0"/> | ||
123 | 63 | </restriction> | ||
124 | 64 | </simpleType> | ||
125 | 65 | </attribute> | ||
126 | 66 | <attribute name="skip-top-level-text-nodes" type="boolean" use="optional"/> | ||
127 | 67 | </complexType> | ||
128 | 68 | </element> | ||
129 | 69 | <element name="substitute-entities" minOccurs="0" maxOccurs="1"> | ||
130 | 70 | <complexType/> | ||
131 | 71 | </element> | ||
132 | 72 | <element name="xinclude-substitutions" minOccurs="0" maxOccurs="1"> | ||
133 | 73 | <complexType/> | ||
134 | 74 | </element> | ||
135 | 75 | <element name="remove-redundant-ns" minOccurs="0" maxOccurs="1"> | ||
136 | 76 | <complexType/> | ||
137 | 77 | </element> | ||
138 | 78 | <element name="no-CDATA" minOccurs="0" maxOccurs="1"> | ||
139 | 79 | <complexType/> | ||
140 | 80 | </element> | ||
141 | 81 | <element name="no-xinclude-nodes" minOccurs="0" maxOccurs="1"> | ||
142 | 82 | <complexType/> | ||
143 | 83 | </element> | ||
144 | 84 | |||
145 | 85 | </all> | ||
146 | 86 | </complexType> | ||
147 | 87 | </element> | ||
148 | 88 | |||
149 | 89 | </schema> | ||
150 | 0 | 90 | ||
151 | === modified file 'modules/com/zorba-xquery/www/modules/xml.xq' (properties changed: +x to -x) | |||
152 | --- modules/com/zorba-xquery/www/modules/xml.xq 2011-08-10 02:50:23 +0000 | |||
153 | +++ modules/com/zorba-xquery/www/modules/xml.xq 2012-02-23 17:28:26 +0000 | |||
154 | @@ -1,4 +1,4 @@ | |||
156 | 1 | xquery version "1.0"; | 1 | xquery version "3.0"; |
157 | 2 | 2 | ||
158 | 3 | (: | 3 | (: |
159 | 4 | : Copyright 2006-2010 The FLWOR Foundation. | 4 | : Copyright 2006-2010 The FLWOR Foundation. |
160 | @@ -23,13 +23,14 @@ | |||
161 | 23 | : external parsed entities, described by | 23 | : external parsed entities, described by |
162 | 24 | : <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed | 24 | : <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed |
163 | 25 | : Parsed Entities</a>. The functions can also perform Schema and DTD | 25 | : Parsed Entities</a>. The functions can also perform Schema and DTD |
165 | 26 | : validation of the input documents. | 26 | : validation of the input documents. |
166 | 27 | : </p> | 27 | : </p> |
167 | 28 | : | 28 | : |
168 | 29 | : @see <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed | 29 | : @see <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed |
169 | 30 | : Parsed Entities</a> | 30 | : Parsed Entities</a> |
170 | 31 | : @see <a href="http://www.w3.org/TR/xpath-functions-30/#func-parse-xml"> | 31 | : @see <a href="http://www.w3.org/TR/xpath-functions-30/#func-parse-xml"> |
171 | 32 | : fn:parse-xml() function in XPath and XQuery Functions and Operators 3.0</a> | 32 | : fn:parse-xml() function in XPath and XQuery Functions and Operators 3.0</a> |
172 | 33 | : @see <a href="http://xmlsoft.org/html/libxml-parser.html">LibXml2 parser</a> | ||
173 | 33 | : | 34 | : |
174 | 34 | : @author Nicolae Brinza | 35 | : @author Nicolae Brinza |
175 | 35 | : @project data processing/data converters | 36 | : @project data processing/data converters |
176 | @@ -37,6 +38,8 @@ | |||
177 | 37 | :) | 38 | :) |
178 | 38 | module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml"; | 39 | module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml"; |
179 | 39 | 40 | ||
180 | 41 | import schema namespace parse-xml-options = "http://www.zorba-xquery.com/modules/xml-options"; | ||
181 | 42 | |||
182 | 40 | declare namespace zerr = "http://www.zorba-xquery.com/errors"; | 43 | declare namespace zerr = "http://www.zorba-xquery.com/errors"; |
183 | 41 | declare namespace err = "http://www.w3.org/xqt-errors"; | 44 | declare namespace err = "http://www.w3.org/xqt-errors"; |
184 | 42 | 45 | ||
185 | @@ -48,21 +51,65 @@ | |||
186 | 48 | : A function to parse XML files and fragments (i.e. | 51 | : A function to parse XML files and fragments (i.e. |
187 | 49 | : <a href="http://www.w3.org/TR/xml/#wf-entities">external general parsed | 52 | : <a href="http://www.w3.org/TR/xml/#wf-entities">external general parsed |
188 | 50 | : entities</a>). The functions takes two arguments: the first one is the | 53 | : entities</a>). The functions takes two arguments: the first one is the |
201 | 51 | : string to be parsed and the second argument is a flags string | 54 | : string to be parsed and the second argument is an <options/> element that |
202 | 52 | : (eEdDsSlLwWfF]*(;[\p{L}]*)?) selecting the options described below. | 55 | : passes a list of options to the parsing function. They are described below. |
203 | 53 | : <br/> | 56 | : The options element must conform to the xml-options.xsd schema. Some of these |
204 | 54 | : <br/> | 57 | : will be passed to the underlying library (LibXml2) and further documentation |
205 | 55 | : | 58 | : for them can be found at <a href="http://xmlsoft.org/html/libxml-parser.html"> |
206 | 56 | : The convention for the flags is that a lower-case letter enables | 59 | : LibXml2 parser</a>. |
207 | 57 | : an option and the corresponding upper-case letter disables it; specifying | 60 | : |
208 | 58 | : both is an error; specifying neither leaves it implementation-defined | 61 | : The list of available options: |
209 | 59 | : whether the option is enabled or disabled. Specifying the same option twice | 62 | : |
198 | 60 | : is not an error, but specifying inconsistent options (for example "eE") is | ||
199 | 61 | : a dynamic error. The options are: | ||
200 | 62 | : | ||
210 | 63 | : <ul> | 63 | : <ul> |
211 | 64 | : <li> | 64 | : <li> |
213 | 65 | : eE - enables or disables processing of XML external entities. If the option | 65 | : <base-uri/> - the element must have a "value" attribute, which will provide |
214 | 66 | : the baseURI that will be used as the baseURI for every node returned by this | ||
215 | 67 | : function. | ||
216 | 68 | : </li> | ||
217 | 69 | : | ||
218 | 70 | : <li> | ||
219 | 71 | : <no-error/> - if present, the option will disable fatal error processing. Any | ||
220 | 72 | : failure to parse or validate the input in the requested manner will result | ||
221 | 73 | : in the function returning an empty sequence and no error will raised. | ||
222 | 74 | : </li> | ||
223 | 75 | : | ||
224 | 76 | : <li> | ||
225 | 77 | : <strip-boundary-space/> - if present, it will enable the removal of blank nodes from the input. | ||
226 | 78 | : </li> | ||
227 | 79 | : | ||
228 | 80 | : <li> | ||
229 | 81 | : <schema-validate/> - if present, it will request that the input string be Schema | ||
230 | 82 | : validated. The element accepts an attribute named "mode" which can have two | ||
231 | 83 | : values: "strict and "lax". Enabling the option will produce a result that is | ||
232 | 84 | : equivalent to processing the input with the option disabled, and then copying | ||
233 | 85 | : the result using the XQuery "validate strict|lax" expression. This option can not | ||
234 | 86 | : be used together with either the <DTD-validate/> or the <parse-external-parsed-entity/> | ||
235 | 87 | : option. Doing so will raise a zerr:ZXQD0003 error. | ||
236 | 88 | : </li> | ||
237 | 89 | : | ||
238 | 90 | : <li> | ||
239 | 91 | : <DTD-validate/> - the option will enable the DTD-based validation. If this | ||
240 | 92 | : option is enabled and the input references a DTD, then the input must be a | ||
241 | 93 | : well-formed and DTD-valid XML document. The <DTD-load/> option must be used for | ||
242 | 94 | : external DTD files to be loaded. If the option is enabled and the input does | ||
243 | 95 | : not reference a DTD then the option is ignored. If the option is disabled, the | ||
244 | 96 | : input is not required to reference a DTD and if it does reference a DTD then | ||
245 | 97 | : the DTD is ignored for validation purposes. This option can not | ||
246 | 98 | : be used together with either the <schema-validate/> or the <parse-external-parsed-entity> | ||
247 | 99 | : option. Doing so will raise a zerr:ZXQD0003 error. | ||
248 | 100 | : </li> | ||
249 | 101 | : | ||
250 | 102 | : <li> | ||
251 | 103 | : <DTD-load/> - if present, it will enable loading of external DTD files. | ||
252 | 104 | : </li> | ||
253 | 105 | : | ||
254 | 106 | : <li> | ||
255 | 107 | : <default-DTD-attributes/> - if present, it will enable the default DTD attributes. | ||
256 | 108 | : </li> | ||
257 | 109 | : | ||
258 | 110 | : <li> | ||
259 | 111 | : <parse-external-parsed-entity/> - if present, it will enable the processing of XML | ||
260 | 112 | : external entities. If the option | ||
261 | 66 | : is enabled, the input must conform to the syntax extParsedEnt (production | 113 | : is enabled, the input must conform to the syntax extParsedEnt (production |
262 | 67 | : [78] in XML 1.0, see <a href="http://www.w3.org/TR/xml/#wf-entities"> | 114 | : [78] in XML 1.0, see <a href="http://www.w3.org/TR/xml/#wf-entities"> |
263 | 68 | : Well-Formed Parsed Entities</a>). The result of the function call is a list | 115 | : Well-Formed Parsed Entities</a>). The result of the function call is a list |
264 | @@ -70,52 +117,45 @@ | |||
265 | 70 | : external entity: that is, elements, processing instructions, comments, and | 117 | : external entity: that is, elements, processing instructions, comments, and |
266 | 71 | : text nodes. CDATA sections and character references are expanded, and | 118 | : text nodes. CDATA sections and character references are expanded, and |
267 | 72 | : adjacent characters are merged so the result contains no adjacent text | 119 | : adjacent characters are merged so the result contains no adjacent text |
270 | 73 | : nodes. If this option is enabled, none of the options d, s, or l may be | 120 | : nodes. If the option is disabled, the input must be a well-formed XML |
269 | 74 | : enabled. If the option is disabled, the input must be a well-formed XML | ||
271 | 75 | : document conforming to the Document production | 121 | : document conforming to the Document production |
272 | 76 | : (<a href="http://www.w3.org/TR/xml/#sec-well-formed">production [1] in XML 1.0</a>). | 122 | : (<a href="http://www.w3.org/TR/xml/#sec-well-formed">production [1] in XML 1.0</a>). |
313 | 77 | : </li> | 123 | : This option can not be used together with either the <schema-validate/> or the <DTD-validate/> |
314 | 78 | : | 124 | : option. Doing so will raise a zerr:ZXQD0003 error. |
315 | 79 | : <li> | 125 | : The <parse-external-parsed-entity/> option has two parameters, given by attributes. The first |
316 | 80 | : dD - enables or disables DTD-based validation. If this option is enabled and | 126 | : attribute is "skip-root-nodes" and it can have a non-negative value. Specifying the paramter |
317 | 81 | : the input references a DTD, then the input must be a well-formed and | 127 | : tells the parser to skip the given number of root nodes and return only their children. E.g. |
318 | 82 | : DTD-valid XML document. If the option is enabled and the input does not | 128 | : skip-root-nodes="1" is equivalent to parse-xml($xml-string)/node()/node() . skip-root-nodes="2" is equivalent |
319 | 83 | : reference a DTD then the option is ignored. If the option is disabled, the | 129 | : to parse-xml($xml-string)/node()/node()/node() , etc. The second attribute is "skip-top-level-text-nodes" with a |
320 | 84 | : input is not required to reference a DTD and if it does reference a DTD then | 130 | : boolean value. Specifying "true" will tell the parser to skip top level text nodes, returning |
321 | 85 | : the DTD is ignored for validation purposes (though it will still be read for | 131 | : only the top level elements, comments, PIs, etc. This parameter works in combination with |
322 | 86 | : purposes such as expanding entity references and identifying ID attributes). | 132 | : the "skip-root-nodes" paramter, thus top level text nodes are skipped after "skip-root-nodes" has |
323 | 87 | : </li> | 133 | : been applied. |
324 | 88 | : | 134 | : </li> |
325 | 89 | : <li> | 135 | : |
326 | 90 | : sS - enables or disables strict XSD-based validation. If this option is | 136 | : <li> |
327 | 91 | : enabled, the result is equivalent to processing the input with the option | 137 | : <substitute-entities/> - if present, it will enable the XML entities substitutions. |
328 | 92 | : disabled, and then copying the result using the XQuery "validate strict" | 138 | : </li> |
329 | 93 | : expression. | 139 | : |
330 | 94 | : </li> | 140 | : <li> |
331 | 95 | : | 141 | : <remove-redundant-ns/> - if present, the parser will remove redundant namespaces declarations. |
332 | 96 | : <li> | 142 | : </li> |
333 | 97 | : lL - enables or disables lax XSD-based validation. If this option is enabled, | 143 | : |
334 | 98 | : the result is equivalent to processing the input with the option disabled, | 144 | : <li> |
335 | 99 | : and then copying the result using the XQuery "validate lax " expression. | 145 | : <no-CDATA/> - if present, the parser will merge CDATA nodes as text nodes. |
336 | 100 | : </li> | 146 | : </li> |
337 | 101 | : | 147 | : |
338 | 102 | : <li> | 148 | : <li> |
339 | 103 | : wW - enables or disables whitespace stripping. If the option is enabled, | 149 | : <xinclude-substitutions/> - if present, it will enable the XInclude substitutions. |
340 | 104 | : any whitespace-only text nodes that remain after any DTD-based or XSD-based | 150 | : </li> |
341 | 105 | : processing are stripped from the input; if it is disabled, such | 151 | : |
342 | 106 | : whitespace-only text nodes are retained. | 152 | : <li> |
343 | 107 | : </li> | 153 | : <no-xinclude-nodes/> - if present, the parser will not generate XInclude START/END nodes. |
344 | 108 | : | 154 | : </li> |
345 | 109 | : <li> | 155 | : |
306 | 110 | : fF - enables or disables fatal error processing. If fatal error processing | ||
307 | 111 | : is enabled, then any failure to parse the input in the manner requested | ||
308 | 112 | : results in a dynamic error. If fatal error processing is disabled, then any | ||
309 | 113 | : failure to parse the input (and also, in the case of fn:doc, a failure to | ||
310 | 114 | : obtain the input by dereferencing the supplied URI) results in the function | ||
311 | 115 | : returning an empty sequence and raising no error. | ||
312 | 116 | : </li> | ||
346 | 117 | : </ul> | 156 | : </ul> |
347 | 118 | : | 157 | : |
348 | 158 | : | ||
349 | 119 | : @param $xml-string The string that holds the XML to be parsed. If empty, | 159 | : @param $xml-string The string that holds the XML to be parsed. If empty, |
350 | 120 | : the function will return an empty sequence | 160 | : the function will return an empty sequence |
351 | 121 | : @param $options The options for the parsing | 161 | : @param $options The options for the parsing |
352 | @@ -131,42 +171,16 @@ | |||
353 | 131 | : document has not passed it. | 171 | : document has not passed it. |
354 | 132 | : | 172 | : |
355 | 133 | : @error err:XQDY0027 The error will be raised if schema validation was enabled | 173 | : @error err:XQDY0027 The error will be raised if schema validation was enabled |
395 | 134 | : and the input document has not passed it. | 174 | : and the input document has not passed it or if the parsing options are not |
396 | 135 | : | 175 | : conformant to the xml-options.xsd schema. |
397 | 136 | :) | 176 | : |
398 | 137 | declare function parse-xml:parse-xml-fragment( | 177 | : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq |
399 | 138 | $xml-string as xs:string?, | 178 | : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq |
400 | 139 | $options as xs:string) as node()* external; | 179 | : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq |
401 | 140 | 180 | : | |
402 | 141 | 181 | :) | |
403 | 142 | (:~ | 182 | |
404 | 143 | : A function to parse XML files and fragments. The behavior is the | 183 | declare function parse-xml:parse( |
405 | 144 | : same as the parse-xml-fragment with two arguments. | 184 | $xml-string as xs:string?, |
406 | 145 | : | 185 | $options as element()?) as node()* external; |
407 | 146 | : @param $xml-string The string that holds the XML to be parsed. If empty, | 186 | |
369 | 147 | : the function will return an empty sequence | ||
370 | 148 | : @param $base-uri The baseURI that will be used as the baseURI for every | ||
371 | 149 | : node returned by this function. | ||
372 | 150 | : @param $options The options for the parsing (see parse-xml-fragment#2) | ||
373 | 151 | : @return The parsed XML as a document node or a list of nodes, or an empty | ||
374 | 152 | : sequence. | ||
375 | 153 | : | ||
376 | 154 | : @error zerr:ZXQD0003 The error will be raised if the options to the function | ||
377 | 155 | : are inconsistent. | ||
378 | 156 | : | ||
379 | 157 | : @error err:FODC0006 The error will be raised if the input string is not a | ||
380 | 158 | : valid XML document or fragment (external general parsed | ||
381 | 159 | : entity) or if DTD validation was enabled and the | ||
382 | 160 | : document has not passed it. | ||
383 | 161 | : | ||
384 | 162 | : @error err:XQDY0027 The error will be raised if schema validation was enabled | ||
385 | 163 | : and the input document has not passed it. | ||
386 | 164 | : | ||
387 | 165 | : @error err:FODC0007 This error will be raised if $base-uri parameter passed | ||
388 | 166 | : to the function is not a valid absolute URI. | ||
389 | 167 | : | ||
390 | 168 | :) | ||
391 | 169 | declare function parse-xml:parse-xml-fragment( | ||
392 | 170 | $xml-string as xs:string?, | ||
393 | 171 | $base-uri as xs:string, | ||
394 | 172 | $options as xs:string) as node()* external; | ||
408 | 173 | 187 | ||
409 | === modified file 'src/api/annotationimpl.cpp' (properties changed: +x to -x) | |||
410 | === modified file 'src/api/xmldatamanagerimpl.cpp' | |||
411 | --- src/api/xmldatamanagerimpl.cpp 2012-01-23 10:06:24 +0000 | |||
412 | +++ src/api/xmldatamanagerimpl.cpp 2012-02-23 17:28:26 +0000 | |||
413 | @@ -75,7 +75,7 @@ | |||
414 | 75 | 75 | ||
415 | 76 | ********************************************************************************/ | 76 | ********************************************************************************/ |
416 | 77 | XmlDataManagerImpl::XmlDataManagerImpl() | 77 | XmlDataManagerImpl::XmlDataManagerImpl() |
418 | 78 | : | 78 | : |
419 | 79 | theDocManager(0), | 79 | theDocManager(0), |
420 | 80 | theColManager(0), | 80 | theColManager(0), |
421 | 81 | theW3CColManager(0) | 81 | theW3CColManager(0) |
422 | @@ -151,7 +151,7 @@ | |||
423 | 151 | DocumentManager* | 151 | DocumentManager* |
424 | 152 | XmlDataManagerImpl::getDocumentManager() const | 152 | XmlDataManagerImpl::getDocumentManager() const |
425 | 153 | { | 153 | { |
427 | 154 | if (!theDocManager) | 154 | if (!theDocManager) |
428 | 155 | { | 155 | { |
429 | 156 | theDocManager = new DocumentManagerImpl(theContext, theFactory); | 156 | theDocManager = new DocumentManagerImpl(theContext, theFactory); |
430 | 157 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); | 157 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); |
431 | @@ -166,7 +166,7 @@ | |||
432 | 166 | CollectionManager* | 166 | CollectionManager* |
433 | 167 | XmlDataManagerImpl::getCollectionManager() const | 167 | XmlDataManagerImpl::getCollectionManager() const |
434 | 168 | { | 168 | { |
436 | 169 | if (!theColManager) | 169 | if (!theColManager) |
437 | 170 | { | 170 | { |
438 | 171 | theColManager = new CollectionManagerImpl( | 171 | theColManager = new CollectionManagerImpl( |
439 | 172 | theContext, | 172 | theContext, |
440 | @@ -185,7 +185,7 @@ | |||
441 | 185 | CollectionManager* | 185 | CollectionManager* |
442 | 186 | XmlDataManagerImpl::getW3CCollectionManager() const | 186 | XmlDataManagerImpl::getW3CCollectionManager() const |
443 | 187 | { | 187 | { |
445 | 188 | if (!theW3CColManager) | 188 | if (!theW3CColManager) |
446 | 189 | { | 189 | { |
447 | 190 | theW3CColManager = new CollectionManagerImpl( | 190 | theW3CColManager = new CollectionManagerImpl( |
448 | 191 | theContext, | 191 | theContext, |
449 | @@ -280,7 +280,7 @@ | |||
450 | 280 | ZORBA_DM_TRY | 280 | ZORBA_DM_TRY |
451 | 281 | { | 281 | { |
452 | 282 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, | 282 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, |
454 | 283 | "parse-xml-fragment"); | 283 | "parse"); |
455 | 284 | 284 | ||
456 | 285 | // create a streamable string item | 285 | // create a streamable string item |
457 | 286 | std::vector<ItemSequence_t> lArgs; | 286 | std::vector<ItemSequence_t> lArgs; |
458 | @@ -315,7 +315,7 @@ | |||
459 | 315 | ZORBA_DM_TRY | 315 | ZORBA_DM_TRY |
460 | 316 | { | 316 | { |
461 | 317 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, | 317 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, |
463 | 318 | "parse-xml-fragment"); | 318 | "parse"); |
464 | 319 | 319 | ||
465 | 320 | // create a streamable string item | 320 | // create a streamable string item |
466 | 321 | std::vector<ItemSequence_t> lArgs; | 321 | std::vector<ItemSequence_t> lArgs; |
467 | @@ -382,15 +382,15 @@ | |||
468 | 382 | theDiagnosticHandler = aDiagnosticHandler; | 382 | theDiagnosticHandler = aDiagnosticHandler; |
469 | 383 | theUserDiagnosticHandler = true; | 383 | theUserDiagnosticHandler = true; |
470 | 384 | 384 | ||
472 | 385 | if (theColManager) | 385 | if (theColManager) |
473 | 386 | { | 386 | { |
474 | 387 | theColManager->registerDiagnosticHandler(theDiagnosticHandler); | 387 | theColManager->registerDiagnosticHandler(theDiagnosticHandler); |
475 | 388 | } | 388 | } |
477 | 389 | if (theDocManager) | 389 | if (theDocManager) |
478 | 390 | { | 390 | { |
479 | 391 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); | 391 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); |
480 | 392 | } | 392 | } |
482 | 393 | if (theW3CColManager) | 393 | if (theW3CColManager) |
483 | 394 | { | 394 | { |
484 | 395 | theW3CColManager->registerDiagnosticHandler(theDiagnosticHandler); | 395 | theW3CColManager->registerDiagnosticHandler(theDiagnosticHandler); |
485 | 396 | } | 396 | } |
486 | @@ -400,17 +400,17 @@ | |||
487 | 400 | /******************************************************************************* | 400 | /******************************************************************************* |
488 | 401 | 401 | ||
489 | 402 | ********************************************************************************/ | 402 | ********************************************************************************/ |
491 | 403 | void XmlDataManagerImpl::registerStemmerProvider(StemmerProvider const *p) | 403 | void XmlDataManagerImpl::registerStemmerProvider(StemmerProvider const *p) |
492 | 404 | { | 404 | { |
493 | 405 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) | 405 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) |
495 | 406 | if ( theStemmerProviderWrapper ) | 406 | if ( theStemmerProviderWrapper ) |
496 | 407 | { | 407 | { |
497 | 408 | if ( theStemmerProviderWrapper->get_provider() == p ) | 408 | if ( theStemmerProviderWrapper->get_provider() == p ) |
498 | 409 | return; | 409 | return; |
499 | 410 | delete theStemmerProviderWrapper; | 410 | delete theStemmerProviderWrapper; |
500 | 411 | theStemmerProviderWrapper = nullptr; | 411 | theStemmerProviderWrapper = nullptr; |
501 | 412 | } | 412 | } |
503 | 413 | if ( p ) | 413 | if ( p ) |
504 | 414 | { | 414 | { |
505 | 415 | theStemmerProviderWrapper = new internal::StemmerProviderWrapper( p ); | 415 | theStemmerProviderWrapper = new internal::StemmerProviderWrapper( p ); |
506 | 416 | theStore->setStemmerProvider( theStemmerProviderWrapper ); | 416 | theStore->setStemmerProvider( theStemmerProviderWrapper ); |
507 | @@ -421,7 +421,7 @@ | |||
508 | 421 | /******************************************************************************* | 421 | /******************************************************************************* |
509 | 422 | 422 | ||
510 | 423 | ********************************************************************************/ | 423 | ********************************************************************************/ |
512 | 424 | void XmlDataManagerImpl::registerTokenizerProvider(TokenizerProvider const *p) | 424 | void XmlDataManagerImpl::registerTokenizerProvider(TokenizerProvider const *p) |
513 | 425 | { | 425 | { |
514 | 426 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) | 426 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) |
515 | 427 | theStore->setTokenizerProvider( p ); | 427 | theStore->setTokenizerProvider( p ); |
516 | 428 | 428 | ||
517 | === modified file 'src/diagnostics/diagnostic_en.xml' | |||
518 | --- src/diagnostics/diagnostic_en.xml 2012-02-21 19:20:00 +0000 | |||
519 | +++ src/diagnostics/diagnostic_en.xml 2012-02-23 17:28:26 +0000 | |||
520 | @@ -1714,7 +1714,7 @@ | |||
521 | 1714 | </diagnostic> | 1714 | </diagnostic> |
522 | 1715 | 1715 | ||
523 | 1716 | <diagnostic code="ZXQD0003" name="INCONSISTENT_PARSE_FRAGMENT_OPTIONS"> | 1716 | <diagnostic code="ZXQD0003" name="INCONSISTENT_PARSE_FRAGMENT_OPTIONS"> |
525 | 1717 | <value>inconsistent options to the parse-xml-fragment() function: $1</value> | 1717 | <value>inconsistent options to the parse-xml() function: $1</value> |
526 | 1718 | </diagnostic> | 1718 | </diagnostic> |
527 | 1719 | 1719 | ||
528 | 1720 | <diagnostic code="ZXQD0004" name="INVALID_PARAMETER"> | 1720 | <diagnostic code="ZXQD0004" name="INVALID_PARAMETER"> |
529 | @@ -2569,6 +2569,10 @@ | |||
530 | 2569 | <entry key="BadXMLDocument_2o"> | 2569 | <entry key="BadXMLDocument_2o"> |
531 | 2570 | <value>malformed XML document${ at "2"}</value> | 2570 | <value>malformed XML document${ at "2"}</value> |
532 | 2571 | </entry> | 2571 | </entry> |
533 | 2572 | |||
534 | 2573 | <entry key="BadXMLNoOpeningTag"> | ||
535 | 2574 | <value>closing tag without matching opening tag</value> | ||
536 | 2575 | </entry> | ||
537 | 2572 | 2576 | ||
538 | 2573 | <entry key="BadXMLForXQDoc_3"> | 2577 | <entry key="BadXMLForXQDoc_3"> |
539 | 2574 | <value>can not parse as XML for xqdoc: $3</value> | 2578 | <value>can not parse as XML for xqdoc: $3</value> |
540 | @@ -3490,12 +3494,8 @@ | |||
541 | 3490 | <value>xqueryx content is empty</value> | 3494 | <value>xqueryx content is empty</value> |
542 | 3491 | </entry> | 3495 | </entry> |
543 | 3492 | 3496 | ||
544 | 3493 | <entry key="ParseFragmentOptionDSLNotAllowed"> | ||
545 | 3494 | <value>if the e option is specified, none of the options d, s, or l may be enabled</value> | ||
546 | 3495 | </entry> | ||
547 | 3496 | |||
548 | 3497 | <entry key="ParseFragmentOptionCombinationNotAllowed"> | 3497 | <entry key="ParseFragmentOptionCombinationNotAllowed"> |
550 | 3498 | <value>specifying both $2 and $3 is an error</value> | 3498 | <value>only one of the <schemaValidate/>, <DTDValidate/> or <parseExternalParsedEntity/> options can be specified</value> |
551 | 3499 | </entry> | 3499 | </entry> |
552 | 3500 | 3500 | ||
553 | 3501 | </subvalues> | 3501 | </subvalues> |
554 | 3502 | 3502 | ||
555 | === modified file 'src/diagnostics/pregenerated/dict_en.cpp' | |||
556 | --- src/diagnostics/pregenerated/dict_en.cpp 2012-02-21 19:20:00 +0000 | |||
557 | +++ src/diagnostics/pregenerated/dict_en.cpp 2012-02-23 17:28:26 +0000 | |||
558 | @@ -383,7 +383,7 @@ | |||
559 | 383 | { "ZWST0006", "\"$1\": function caching might not give the intended result because the function is declared as $2" }, | 383 | { "ZWST0006", "\"$1\": function caching might not give the intended result because the function is declared as $2" }, |
560 | 384 | { "ZXQD0001", "\"$1\": prefix not declared when calling function \"$2\" from $3" }, | 384 | { "ZXQD0001", "\"$1\": prefix not declared when calling function \"$2\" from $3" }, |
561 | 385 | { "ZXQD0002", "\"$1\": $2" }, | 385 | { "ZXQD0002", "\"$1\": $2" }, |
563 | 386 | { "ZXQD0003", "inconsistent options to the parse-xml-fragment() function: $1" }, | 386 | { "ZXQD0003", "inconsistent options to the parse-xml() function: $1" }, |
564 | 387 | { "ZXQD0004", "invalid parameter: $1" }, | 387 | { "ZXQD0004", "invalid parameter: $1" }, |
565 | 388 | { "ZXQD0005", "key with type $1 not subtype or castable to target type $2 of map ($3)" }, | 388 | { "ZXQD0005", "key with type $1 not subtype or castable to target type $2 of map ($3)" }, |
566 | 389 | { "ZXQD0006", "\"$1\": invalid UTF-8 byte sequence" }, | 389 | { "ZXQD0006", "\"$1\": invalid UTF-8 byte sequence" }, |
567 | @@ -461,6 +461,7 @@ | |||
568 | 461 | { "~BadWordNetPtr_2", "\"$2\": invalid pointer type" }, | 461 | { "~BadWordNetPtr_2", "\"$2\": invalid pointer type" }, |
569 | 462 | { "~BadXMLDocument_2o", "malformed XML document${ at \"2\"}" }, | 462 | { "~BadXMLDocument_2o", "malformed XML document${ at \"2\"}" }, |
570 | 463 | { "~BadXMLForXQDoc_3", "can not parse as XML for xqdoc: $3" }, | 463 | { "~BadXMLForXQDoc_3", "can not parse as XML for xqdoc: $3" }, |
571 | 464 | { "~BadXMLNoOpeningTag", "closing tag without matching opening tag" }, | ||
572 | 464 | { "~BadXQueryVersion", "unsupported XQuery version" }, | 465 | { "~BadXQueryVersion", "unsupported XQuery version" }, |
573 | 465 | { "~Base64BadChar", "invalid Base64 character" }, | 466 | { "~Base64BadChar", "invalid Base64 character" }, |
574 | 466 | { "~Base64Equals", "in Base64, '=' must be at the end and followed by one of [AEIMQUYcgkosw048]" }, | 467 | { "~Base64Equals", "in Base64, '=' must be at the end and followed by one of [AEIMQUYcgkosw048]" }, |
575 | @@ -581,8 +582,7 @@ | |||
576 | 581 | { "~OperationNotDef_23", "$2 not defined for type \"$3\"" }, | 582 | { "~OperationNotDef_23", "$2 not defined for type \"$3\"" }, |
577 | 582 | { "~OperationNotPossibleWithTypes_234", "\"$2\": operation not possible with parameters of type \"$3\" and \"$4\"" }, | 583 | { "~OperationNotPossibleWithTypes_234", "\"$2\": operation not possible with parameters of type \"$3\" and \"$4\"" }, |
578 | 583 | { "~OuterForClause11", "\"outer-for\" clause only available in XQuery 1.1 or later" }, | 584 | { "~OuterForClause11", "\"outer-for\" clause only available in XQuery 1.1 or later" }, |
581 | 584 | { "~ParseFragmentOptionCombinationNotAllowed", "specifying both $2 and $3 is an error" }, | 585 | { "~ParseFragmentOptionCombinationNotAllowed", "only one of the <schemaValidate/>, <DTDValidate/> or <parseExternalParsedEntity/> options can be specified" }, |
580 | 585 | { "~ParseFragmentOptionDSLNotAllowed", "if the e option is specified, none of the options d, s, or l may be enabled" }, | ||
582 | 586 | { "~ParserInitFailed", "parser initialization failed" }, | 586 | { "~ParserInitFailed", "parser initialization failed" }, |
583 | 587 | { "~ParserNoCreateTree", "XML tree creation failed" }, | 587 | { "~ParserNoCreateTree", "XML tree creation failed" }, |
584 | 588 | { "~PromotionImpossible", "promotion not possible" }, | 588 | { "~PromotionImpossible", "promotion not possible" }, |
585 | 589 | 589 | ||
586 | === modified file 'src/functions/pregenerated/func_parse_fragment.cpp' | |||
587 | --- src/functions/pregenerated/func_parse_fragment.cpp 2012-02-16 12:48:17 +0000 | |||
588 | +++ src/functions/pregenerated/func_parse_fragment.cpp 2012-02-23 17:28:26 +0000 | |||
589 | @@ -31,7 +31,7 @@ | |||
590 | 31 | 31 | ||
591 | 32 | 32 | ||
592 | 33 | 33 | ||
594 | 34 | PlanIter_t fn_zorba_xml_parse_xml_fragment::codegen( | 34 | PlanIter_t fn_zorba_xml_parse::codegen( |
595 | 35 | CompilerCB*, | 35 | CompilerCB*, |
596 | 36 | static_context* sctx, | 36 | static_context* sctx, |
597 | 37 | const QueryLoc& loc, | 37 | const QueryLoc& loc, |
598 | @@ -46,26 +46,12 @@ | |||
599 | 46 | { | 46 | { |
600 | 47 | 47 | ||
601 | 48 | 48 | ||
622 | 49 | DECL_WITH_KIND(sctx, fn_zorba_xml_parse_xml_fragment, | 49 | DECL_WITH_KIND(sctx, fn_zorba_xml_parse, |
623 | 50 | (createQName("http://www.zorba-xquery.com/modules/xml","","parse-xml-fragment"), | 50 | (createQName("http://www.zorba-xquery.com/modules/xml","","parse"), |
624 | 51 | GENV_TYPESYSTEM.STRING_TYPE_QUESTION, | 51 | GENV_TYPESYSTEM.STRING_TYPE_QUESTION, |
625 | 52 | GENV_TYPESYSTEM.STRING_TYPE_ONE, | 52 | GENV_TYPESYSTEM.ELEMENT_TYPE_QUESTION, |
626 | 53 | GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), | 53 | GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), |
627 | 54 | FunctionConsts::FN_ZORBA_XML_PARSE_XML_FRAGMENT_2); | 54 | FunctionConsts::FN_ZORBA_XML_PARSE_2); |
608 | 55 | |||
609 | 56 | } | ||
610 | 57 | |||
611 | 58 | |||
612 | 59 | { | ||
613 | 60 | |||
614 | 61 | |||
615 | 62 | DECL_WITH_KIND(sctx, fn_zorba_xml_parse_xml_fragment, | ||
616 | 63 | (createQName("http://www.zorba-xquery.com/modules/xml","","parse-xml-fragment"), | ||
617 | 64 | GENV_TYPESYSTEM.STRING_TYPE_QUESTION, | ||
618 | 65 | GENV_TYPESYSTEM.STRING_TYPE_ONE, | ||
619 | 66 | GENV_TYPESYSTEM.STRING_TYPE_ONE, | ||
620 | 67 | GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), | ||
621 | 68 | FunctionConsts::FN_ZORBA_XML_PARSE_XML_FRAGMENT_3); | ||
628 | 69 | 55 | ||
629 | 70 | } | 56 | } |
630 | 71 | 57 | ||
631 | 72 | 58 | ||
632 | === modified file 'src/functions/pregenerated/func_parse_fragment.h' | |||
633 | --- src/functions/pregenerated/func_parse_fragment.h 2012-01-11 17:30:25 +0000 | |||
634 | +++ src/functions/pregenerated/func_parse_fragment.h 2012-02-23 17:28:26 +0000 | |||
635 | @@ -38,11 +38,11 @@ | |||
636 | 38 | 38 | ||
637 | 39 | 39 | ||
638 | 40 | 40 | ||
641 | 41 | //fn-zorba-xml:parse-xml-fragment | 41 | //fn-zorba-xml:parse |
642 | 42 | class fn_zorba_xml_parse_xml_fragment : public function | 42 | class fn_zorba_xml_parse : public function |
643 | 43 | { | 43 | { |
644 | 44 | public: | 44 | public: |
646 | 45 | fn_zorba_xml_parse_xml_fragment(const signature& sig, FunctionConsts::FunctionKind kind) | 45 | fn_zorba_xml_parse(const signature& sig, FunctionConsts::FunctionKind kind) |
647 | 46 | : | 46 | : |
648 | 47 | function(sig, kind) | 47 | function(sig, kind) |
649 | 48 | { | 48 | { |
650 | 49 | 49 | ||
651 | === modified file 'src/functions/pregenerated/function_enum.h' | |||
652 | --- src/functions/pregenerated/function_enum.h 2012-02-16 14:11:02 +0000 | |||
653 | +++ src/functions/pregenerated/function_enum.h 2012-02-23 17:28:26 +0000 | |||
654 | @@ -254,8 +254,7 @@ | |||
655 | 254 | FN_FORMAT_NUMBER_3, | 254 | FN_FORMAT_NUMBER_3, |
656 | 255 | FN_FORMAT_INTEGER_2, | 255 | FN_FORMAT_INTEGER_2, |
657 | 256 | FN_FORMAT_INTEGER_3, | 256 | FN_FORMAT_INTEGER_3, |
660 | 257 | FN_ZORBA_XML_PARSE_XML_FRAGMENT_2, | 257 | FN_ZORBA_XML_PARSE_2, |
659 | 258 | FN_ZORBA_XML_PARSE_XML_FRAGMENT_3, | ||
661 | 259 | FN_PARSE_XML_1, | 258 | FN_PARSE_XML_1, |
662 | 260 | FN_PARSE_XML_2, | 259 | FN_PARSE_XML_2, |
663 | 261 | FN_SERIALIZE_1, | 260 | FN_SERIALIZE_1, |
664 | 262 | 261 | ||
665 | === modified file 'src/runtime/parsing_and_serializing/fragment_istream.h' (properties changed: +x to -x) | |||
666 | --- src/runtime/parsing_and_serializing/fragment_istream.h 2011-07-16 13:33:13 +0000 | |||
667 | +++ src/runtime/parsing_and_serializing/fragment_istream.h 2012-02-23 17:28:26 +0000 | |||
668 | @@ -18,55 +18,99 @@ | |||
669 | 18 | #define ZORBA_RUNTIME_PARSING_AND_SERIALIZING_FRAGMENT_ISTREAM_H | 18 | #define ZORBA_RUNTIME_PARSING_AND_SERIALIZING_FRAGMENT_ISTREAM_H |
670 | 19 | 19 | ||
671 | 20 | #include <iostream> | 20 | #include <iostream> |
672 | 21 | #include <libxml/parser.h> | ||
673 | 22 | #include <store/api/iterator.h> | ||
674 | 21 | 23 | ||
675 | 22 | namespace zorba { | 24 | namespace zorba { |
676 | 23 | 25 | ||
677 | 24 | /** | 26 | /** |
680 | 25 | * A class to hold an input stream for the parse-xml-fragment function | 27 | * A class to hold an input stream for the parse-xml:parse() function |
681 | 26 | * Author: Zorba Team | 28 | * Author: Nicolae Brinza |
682 | 27 | */ | 29 | */ |
683 | 28 | class FragmentIStream : public std::istream | 30 | class FragmentIStream : public std::istream |
684 | 29 | { | 31 | { |
685 | 30 | public: | 32 | public: |
686 | 33 | static const unsigned int BUFFER_SIZE = 4096; | ||
687 | 34 | static const unsigned int LOOKAHEAD_BYTES = 3; // lookahead fetching is implemented, but currently not used | ||
688 | 35 | static const unsigned int PARSED_NODES_BATCH_SIZE = 1024; | ||
689 | 36 | |||
690 | 37 | public: | ||
691 | 31 | FragmentIStream() | 38 | FragmentIStream() |
692 | 32 | : | 39 | : |
693 | 33 | std::istream(NULL), | 40 | std::istream(NULL), |
694 | 34 | theIss(NULL), | 41 | theIss(NULL), |
695 | 35 | theStream(NULL), | 42 | theStream(NULL), |
696 | 36 | theBuffer(NULL), | 43 | theBuffer(NULL), |
699 | 37 | buffer_size(0), | 44 | bytes_in_buffer(0), |
700 | 38 | current_offset(0) | 45 | current_offset(0), |
701 | 46 | current_element_depth(0), | ||
702 | 47 | root_elements_to_skip(0), | ||
703 | 48 | ctxt(NULL), | ||
704 | 49 | first_start_doc(true), | ||
705 | 50 | forced_parser_stop(false), | ||
706 | 51 | reached_eof(false), | ||
707 | 52 | parsed_nodes_count(0), | ||
708 | 53 | children(NULL) | ||
709 | 39 | { | 54 | { |
710 | 40 | }; | 55 | }; |
711 | 41 | 56 | ||
712 | 57 | bool stream_is_consumed() | ||
713 | 58 | { | ||
714 | 59 | return reached_eof && current_offset >= bytes_in_buffer; | ||
715 | 60 | } | ||
716 | 61 | |||
717 | 42 | void reset() | 62 | void reset() |
718 | 43 | { | 63 | { |
719 | 44 | if (theBuffer) | 64 | if (theBuffer) |
720 | 65 | { | ||
721 | 45 | delete[] theBuffer; | 66 | delete[] theBuffer; |
722 | 67 | } | ||
723 | 68 | |||
724 | 46 | if (theIss) | 69 | if (theIss) |
725 | 70 | { | ||
726 | 47 | delete theIss; | 71 | delete theIss; |
727 | 72 | } | ||
728 | 73 | |||
729 | 74 | if (ctxt) | ||
730 | 75 | { | ||
731 | 76 | xmlCtxtReset(ctxt); | ||
732 | 77 | xmlFreeParserCtxt(ctxt); | ||
733 | 78 | } | ||
734 | 48 | 79 | ||
735 | 49 | theIss = NULL; | 80 | theIss = NULL; |
736 | 50 | theStream = NULL; | 81 | theStream = NULL; |
737 | 51 | theBuffer = NULL; | 82 | theBuffer = NULL; |
739 | 52 | buffer_size = 0; | 83 | bytes_in_buffer = 0; |
740 | 53 | current_offset = 0; | 84 | current_offset = 0; |
741 | 85 | current_element_depth = 0; | ||
742 | 86 | root_elements_to_skip = 0; | ||
743 | 87 | ctxt = NULL; | ||
744 | 88 | first_start_doc = true; | ||
745 | 89 | forced_parser_stop = false; | ||
746 | 90 | reached_eof = false; | ||
747 | 91 | parsed_nodes_count = 0; | ||
748 | 92 | children = NULL; | ||
749 | 54 | } | 93 | } |
750 | 55 | 94 | ||
751 | 56 | virtual ~FragmentIStream() | 95 | virtual ~FragmentIStream() |
752 | 57 | { | 96 | { |
757 | 58 | if (theBuffer) | 97 | reset(); |
754 | 59 | delete[] theBuffer; | ||
755 | 60 | if (theIss) | ||
756 | 61 | delete theIss; | ||
758 | 62 | } | 98 | } |
759 | 63 | 99 | ||
760 | 64 | public: | 100 | public: |
761 | 65 | std::istringstream* theIss; | 101 | std::istringstream* theIss; |
762 | 66 | std::istream* theStream; | 102 | std::istream* theStream; |
763 | 67 | char* theBuffer; | 103 | char* theBuffer; |
765 | 68 | unsigned long buffer_size; | 104 | unsigned long bytes_in_buffer; |
766 | 69 | unsigned long current_offset; | 105 | unsigned long current_offset; |
767 | 106 | int current_element_depth; | ||
768 | 107 | int root_elements_to_skip; | ||
769 | 108 | xmlParserCtxtPtr ctxt; | ||
770 | 109 | bool first_start_doc; | ||
771 | 110 | bool forced_parser_stop; | ||
772 | 111 | bool reached_eof; | ||
773 | 112 | unsigned int parsed_nodes_count; | ||
774 | 113 | store::Iterator_t children; | ||
775 | 70 | }; | 114 | }; |
776 | 71 | 115 | ||
777 | 72 | } | 116 | } |
778 | 73 | 117 | ||
779 | === modified file 'src/runtime/parsing_and_serializing/parse_fragment_impl.cpp' (properties changed: +x to -x) | |||
780 | --- src/runtime/parsing_and_serializing/parse_fragment_impl.cpp 2011-08-10 02:50:23 +0000 | |||
781 | +++ src/runtime/parsing_and_serializing/parse_fragment_impl.cpp 2012-02-23 17:28:26 +0000 | |||
782 | @@ -25,117 +25,137 @@ | |||
783 | 25 | #include "store/api/store.h" | 25 | #include "store/api/store.h" |
784 | 26 | #include "store/api/item.h" | 26 | #include "store/api/item.h" |
785 | 27 | #include "store/api/item_factory.h" | 27 | #include "store/api/item_factory.h" |
786 | 28 | #include "store/api/load_properties.h" | ||
787 | 28 | 29 | ||
788 | 29 | #include "system/globalenv.h" | 30 | #include "system/globalenv.h" |
789 | 30 | 31 | ||
790 | 31 | #include "types/schema/schema.h" | 32 | #include "types/schema/schema.h" |
791 | 32 | #include "types/schema/validate.h" | 33 | #include "types/schema/validate.h" |
792 | 33 | 34 | ||
793 | 35 | |||
794 | 34 | namespace zorba | 36 | namespace zorba |
795 | 35 | { | 37 | { |
796 | 36 | 38 | ||
797 | 37 | /******************************************************************************* | 39 | /******************************************************************************* |
799 | 38 | 14.9.1 fn-zorba-xml:parse-xml-fragment | 40 | 14.9.1 fn-zorba-xml:parse |
800 | 39 | ********************************************************************************/ | 41 | ********************************************************************************/ |
801 | 40 | 42 | ||
900 | 41 | class ParseXmlFragmentOptions | 43 | store::Item_t getFirstAttribute(store::Item_t node) |
901 | 42 | { | 44 | { |
902 | 43 | public: | 45 | store::Item_t attr; |
903 | 44 | // all options are false by default, except for enableFatelErrorProcessing which is true | 46 | store::Iterator_t attributes = node->getAttributes(); |
904 | 45 | bool enableExternalEntitiesProcessing; | 47 | attributes->open(); |
905 | 46 | bool enableDTDValidation; | 48 | attributes->next(attr); |
906 | 47 | bool enableStrictSchemaValidation; | 49 | attributes->close(); |
907 | 48 | bool enableLaxSchemaValidation; | 50 | return attr; |
908 | 49 | bool enableWhitespaceStripping; | 51 | } |
909 | 50 | bool enableFatelErrorProcessing; | 52 | |
910 | 51 | 53 | void processOptions(store::Item_t item, store::LoadProperties& props, static_context* theSctx, const QueryLoc& loc) | |
911 | 52 | public: | 54 | { |
912 | 53 | ParseXmlFragmentOptions() : | 55 | URI lValidatedBaseUri; |
913 | 54 | enableExternalEntitiesProcessing(false), | 56 | store::Item_t child, tempItem; |
914 | 55 | enableDTDValidation(false), | 57 | |
915 | 56 | enableStrictSchemaValidation(false), | 58 | if (item.getp() == NULL) |
916 | 57 | enableLaxSchemaValidation(false), | 59 | return; |
917 | 58 | enableWhitespaceStripping(false), | 60 | |
918 | 59 | enableFatelErrorProcessing(true) // only enableFatelErrorProcessing is set to true | 61 | #ifndef ZORBA_NO_XMLSCHEMA |
919 | 60 | { | 62 | tempItem = NULL; // used as the effectiveValidationValue()'s typeName |
920 | 61 | } | 63 | Validator::effectiveValidationValue( |
921 | 62 | 64 | item, | |
922 | 63 | void reset() | 65 | item, |
923 | 64 | { | 66 | tempItem, |
924 | 65 | enableExternalEntitiesProcessing = false; | 67 | theSctx->get_typemanager(), |
925 | 66 | enableDTDValidation = false; | 68 | ParseConstants::val_strict, |
926 | 67 | enableStrictSchemaValidation = false; | 69 | theSctx, |
927 | 68 | enableLaxSchemaValidation = false; | 70 | loc); |
928 | 69 | enableWhitespaceStripping = false; | 71 | #endif |
929 | 70 | enableFatelErrorProcessing = true; // only enableFatelErrorProcessing is set to true | 72 | |
930 | 71 | } | 73 | store::Iterator_t children = item->getChildren(); |
931 | 72 | 74 | children->open(); | |
932 | 73 | static ParseXmlFragmentOptions parseOptions(const zstring& options, const QueryLoc& loc) | 75 | |
933 | 74 | { | 76 | while (children->next(child)) |
934 | 75 | ParseXmlFragmentOptions opt; | 77 | { |
935 | 76 | 78 | if (child->getNodeKind() != store::StoreConsts::elementNode) | |
936 | 77 | if (options.find("e") != zstring::npos && options.find("E") != zstring::npos) | 79 | continue; |
937 | 78 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 80 | |
938 | 79 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "e", "E"), ERROR_LOC( loc )); | 81 | if (child->getNodeName()->getLocalName() == "base-uri") |
939 | 80 | 82 | { | |
940 | 81 | if (options.find("d") != zstring::npos && options.find("D") != zstring::npos) | 83 | store::Item_t attr = getFirstAttribute(child); |
941 | 82 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 84 | |
942 | 83 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "d", "D"), ERROR_LOC( loc )); | 85 | try { |
943 | 84 | 86 | lValidatedBaseUri = URI(attr->getStringValue()); | |
944 | 85 | if (options.find("s") != zstring::npos && options.find("S") != zstring::npos) | 87 | } catch (ZorbaException const& /* e */) { |
945 | 86 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 88 | throw XQUERY_EXCEPTION( |
946 | 87 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "s", "S"), ERROR_LOC( loc )); | 89 | err::FODC0007, |
947 | 88 | 90 | ERROR_PARAMS( attr->getStringValue() ), | |
948 | 89 | if (options.find("l") != zstring::npos && options.find("L") != zstring::npos) | 91 | ERROR_LOC( loc ) |
949 | 90 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 92 | ); |
950 | 91 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "l", "L"), ERROR_LOC( loc )); | 93 | } |
951 | 92 | 94 | ||
952 | 93 | if (options.find("w") != zstring::npos && options.find("W") != zstring::npos) | 95 | if (!lValidatedBaseUri.is_absolute()) { |
953 | 94 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 96 | throw XQUERY_EXCEPTION( |
954 | 95 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "w", "W"), ERROR_LOC( loc )); | 97 | err::FODC0007, |
955 | 96 | 98 | ERROR_PARAMS( lValidatedBaseUri.toString() ), | |
956 | 97 | if (options.find("f") != zstring::npos && options.find("F") != zstring::npos) | 99 | ERROR_LOC( loc ) |
957 | 98 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 100 | ); |
958 | 99 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "f", "F"), ERROR_LOC( loc )); | 101 | } |
959 | 100 | 102 | ||
960 | 101 | if (options.find("e") != zstring::npos) | 103 | props.setBaseUri(attr->getStringValue()); |
961 | 102 | opt.enableExternalEntitiesProcessing = true; | 104 | } |
962 | 103 | if (options.find("d") != zstring::npos) | 105 | else if (child->getNodeName()->getLocalName() == "no-error") |
963 | 104 | opt.enableDTDValidation = true; | 106 | props.setNoError(true); |
964 | 105 | if (options.find("s") != zstring::npos) | 107 | else if (child->getNodeName()->getLocalName() == "strip-boundary-space") |
965 | 106 | opt.enableStrictSchemaValidation = true; | 108 | props.setStripWhitespace(true); |
966 | 107 | if (options.find("l") != zstring::npos) | 109 | else if (child->getNodeName()->getLocalName() == "schema-validate") |
967 | 108 | opt.enableLaxSchemaValidation = true; | 110 | { |
968 | 109 | if (options.find("w") != zstring::npos) | 111 | store::Item_t attr = getFirstAttribute(child); |
969 | 110 | opt.enableWhitespaceStripping = true; | 112 | if (attr->getStringValue() == "strict") |
970 | 111 | if (options.find("f") != zstring::npos) | 113 | props.setSchemaStrictValidate(true); |
971 | 112 | opt.enableFatelErrorProcessing = true; | 114 | else |
972 | 113 | 115 | props.setSchemaLaxValidate(true); | |
973 | 114 | if (options.find("E") != zstring::npos) | 116 | } |
974 | 115 | opt.enableExternalEntitiesProcessing = false; | 117 | else if (child->getNodeName()->getLocalName() == "DTD-validate") |
975 | 116 | if (options.find("D") != zstring::npos) | 118 | props.setDTDValidate(true); |
976 | 117 | opt.enableDTDValidation = false; | 119 | else if (child->getNodeName()->getLocalName() == "DTD-load") |
977 | 118 | if (options.find("S") != zstring::npos) | 120 | props.setDTDLoad(true); |
978 | 119 | opt.enableStrictSchemaValidation = false; | 121 | else if (child->getNodeName()->getLocalName() == "default-DTD-attributes") |
979 | 120 | if (options.find("L") != zstring::npos) | 122 | props.setDefaultDTDAttributes(true); |
980 | 121 | opt.enableLaxSchemaValidation = false; | 123 | else if (child->getNodeName()->getLocalName() == "parse-external-parsed-entity") |
981 | 122 | if (options.find("W") != zstring::npos) | 124 | { |
982 | 123 | opt.enableWhitespaceStripping = false; | 125 | props.setParseExternalParsedEntity(true); |
983 | 124 | if (options.find("F") != zstring::npos) | 126 | store::Item_t attr; |
984 | 125 | opt.enableFatelErrorProcessing = false; | 127 | store::Iterator_t attribs = child->getAttributes(); |
985 | 126 | 128 | attribs->open(); | |
986 | 127 | if (opt.enableExternalEntitiesProcessing | 129 | while (attribs->next(attr)) |
987 | 128 | && | 130 | { |
988 | 129 | (opt.enableDTDValidation || opt.enableStrictSchemaValidation || opt.enableLaxSchemaValidation)) | 131 | if (attr->getNodeName()->getLocalName() == "skip-root-nodes") |
989 | 130 | { | 132 | props.setSkipRootNodes(ztd::aton<xs_int>(attr->getStringValue().c_str())); |
990 | 131 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | 133 | else if (attr->getNodeName()->getLocalName() == "skip-top-level-text-nodes") |
991 | 132 | ERROR_PARAMS(ZED(ParseFragmentOptionDSLNotAllowed)), ERROR_LOC( loc )); | 134 | props.setSkipTopLevelTextNodes(true); |
992 | 133 | } | 135 | } |
993 | 134 | 136 | attribs->close(); | |
994 | 135 | return opt; | 137 | } |
995 | 136 | } | 138 | else if (child->getNodeName()->getLocalName() == "substitute-entities") |
996 | 137 | }; | 139 | props.setSubstituteEntities(true); |
997 | 138 | 140 | else if (child->getNodeName()->getLocalName() == "xinclude-substitutions") | |
998 | 141 | props.setXincludeSubstitutions(true); | ||
999 | 142 | else if (child->getNodeName()->getLocalName() == "remove-redundant-ns") | ||
1000 | 143 | props.setRemoveRedundantNS(true); | ||
1001 | 144 | else if (child->getNodeName()->getLocalName() == "no-CDATA") | ||
1002 | 145 | props.setNoCDATA(true); | ||
1003 | 146 | else if (child->getNodeName()->getLocalName() == "no-xinclude-nodes") | ||
1004 | 147 | props.setNoXIncludeNodes(true); | ||
1005 | 148 | } | ||
1006 | 149 | |||
1007 | 150 | children->close(); | ||
1008 | 151 | |||
1009 | 152 | if (props.getSchemaLaxValidate() + props.getSchemaStrictValidate() + | ||
1010 | 153 | props.getDTDValidate() + props.getParseExternalParsedEntity() > 1) | ||
1011 | 154 | { | ||
1012 | 155 | throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, | ||
1013 | 156 | ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed)), ERROR_LOC( loc )); | ||
1014 | 157 | } | ||
1015 | 158 | } | ||
1016 | 139 | 159 | ||
1017 | 140 | /******************************************************************************* | 160 | /******************************************************************************* |
1018 | 141 | 161 | ||
1019 | @@ -145,8 +165,7 @@ | |||
1020 | 145 | { | 165 | { |
1021 | 146 | PlanIteratorState::reset(planState); | 166 | PlanIteratorState::reset(planState); |
1022 | 147 | theFragmentStream.reset(); | 167 | theFragmentStream.reset(); |
1025 | 148 | theProperties.setEnableDtd(false); | 168 | theProperties.reset(); |
1024 | 149 | theProperties.setEnableExtParsedEntity(false); | ||
1026 | 150 | theProperties.setStoreDocument(false); | 169 | theProperties.setStoreDocument(false); |
1027 | 151 | baseUri = ""; | 170 | baseUri = ""; |
1028 | 152 | docUri = ""; | 171 | docUri = ""; |
1029 | @@ -161,9 +180,7 @@ | |||
1030 | 161 | { | 180 | { |
1031 | 162 | store::Store& lStore = GENV.getStore(); | 181 | store::Store& lStore = GENV.getStore(); |
1032 | 163 | zstring docString; | 182 | zstring docString; |
1033 | 164 | URI lValidatedBaseUri; | ||
1034 | 165 | store::Item_t tempItem; | 183 | store::Item_t tempItem; |
1035 | 166 | ParseXmlFragmentOptions parseOptions; | ||
1036 | 167 | bool validated = true; | 184 | bool validated = true; |
1037 | 168 | 185 | ||
1038 | 169 | FnParseXmlFragmentIteratorState* state; | 186 | FnParseXmlFragmentIteratorState* state; |
1039 | @@ -182,87 +199,61 @@ | |||
1040 | 182 | state->theFragmentStream.theStream = state->theFragmentStream.theIss; | 199 | state->theFragmentStream.theStream = state->theFragmentStream.theIss; |
1041 | 183 | } | 200 | } |
1042 | 184 | 201 | ||
1080 | 185 | // optional base URI argument | 202 | // read options |
1081 | 186 | if (theChildren.size() == 3) | 203 | consumeNext(tempItem, theChildren[1].getp(), planState); |
1082 | 187 | { | 204 | state->theProperties.setBaseUri(theSctx->get_base_uri()); |
1083 | 188 | consumeNext(result, theChildren[1].getp(), planState); | 205 | state->theProperties.setStoreDocument(false); |
1084 | 189 | ZORBA_ASSERT(result); | 206 | processOptions(tempItem, state->theProperties, theSctx, loc); |
1048 | 190 | |||
1049 | 191 | try { | ||
1050 | 192 | lValidatedBaseUri = URI(result->getStringValue()); | ||
1051 | 193 | } catch (ZorbaException const& /* e */) { | ||
1052 | 194 | throw XQUERY_EXCEPTION( | ||
1053 | 195 | err::FODC0007, | ||
1054 | 196 | ERROR_PARAMS( result->getStringValue() ), | ||
1055 | 197 | ERROR_LOC( loc ) | ||
1056 | 198 | ); | ||
1057 | 199 | } | ||
1058 | 200 | |||
1059 | 201 | if (!lValidatedBaseUri.is_absolute()) { | ||
1060 | 202 | throw XQUERY_EXCEPTION( | ||
1061 | 203 | err::FODC0007, | ||
1062 | 204 | ERROR_PARAMS( lValidatedBaseUri.toString() ), | ||
1063 | 205 | ERROR_LOC( loc ) | ||
1064 | 206 | ); | ||
1065 | 207 | } | ||
1066 | 208 | |||
1067 | 209 | result->getStringValue2(state->baseUri); | ||
1068 | 210 | |||
1069 | 211 | // read options | ||
1070 | 212 | consumeNext(tempItem, theChildren[2].getp(), planState); | ||
1071 | 213 | parseOptions = ParseXmlFragmentOptions::parseOptions(tempItem->getStringValue(), loc); | ||
1072 | 214 | |||
1073 | 215 | } else { | ||
1074 | 216 | // read options | ||
1075 | 217 | consumeNext(tempItem, theChildren[1].getp(), planState); | ||
1076 | 218 | parseOptions = ParseXmlFragmentOptions::parseOptions(tempItem->getStringValue(), loc); | ||
1077 | 219 | |||
1078 | 220 | state->baseUri = theSctx->get_base_uri(); | ||
1079 | 221 | } | ||
1085 | 222 | 207 | ||
1086 | 223 | // baseURI serves both as the base URI used by the XML parser | 208 | // baseURI serves both as the base URI used by the XML parser |
1087 | 224 | // to resolve relative entity references within the document, | 209 | // to resolve relative entity references within the document, |
1088 | 225 | // and as the base URI of the document node that is returned. | 210 | // and as the base URI of the document node that is returned. |
1099 | 226 | state->docUri = state->baseUri; | 211 | state->baseUri = state->theProperties.getBaseUri(); |
1100 | 227 | 212 | state->docUri = state->theProperties.getBaseUri(); | |
1101 | 228 | // The DTD and ExternalEntitiesProcessing options/props cannot both be true at the same time | 213 | |
1102 | 229 | if (parseOptions.enableDTDValidation) | 214 | |
1103 | 230 | state->theProperties.setEnableDtd(true); | 215 | //////////////////////////////////////////////////////////////////////// |
1104 | 231 | if (parseOptions.enableExternalEntitiesProcessing) | 216 | // External parsed entity processing |
1105 | 232 | state->theProperties.setEnableExtParsedEntity(true); | 217 | //////////////////////////////////////////////////////////////////////// |
1106 | 233 | state->theProperties.setStoreDocument(false); | 218 | if (state->theProperties.getParseExternalParsedEntity()) |
1097 | 234 | |||
1098 | 235 | if (state->theProperties.getEnableExtParsedEntity()) | ||
1107 | 236 | { | 219 | { |
1109 | 237 | // state->theFragmentStream.root_elements_to_skip = 0; | 220 | state->theFragmentStream.root_elements_to_skip = state->theProperties.getSkipRootNodes(); |
1110 | 238 | 221 | ||
1114 | 239 | while (state->theFragmentStream.theBuffer == NULL | 222 | while ( ! state->theFragmentStream.stream_is_consumed()) |
1112 | 240 | || | ||
1113 | 241 | state->theFragmentStream.current_offset < state->theFragmentStream.buffer_size) | ||
1115 | 242 | { | 223 | { |
1116 | 243 | try { | 224 | try { |
1117 | 244 | result = lStore.loadDocument(state->baseUri, state->docUri, state->theFragmentStream, state->theProperties); | 225 | result = lStore.loadDocument(state->baseUri, state->docUri, state->theFragmentStream, state->theProperties); |
1118 | 245 | } catch (ZorbaException const& e) { | 226 | } catch (ZorbaException const& e) { |
1121 | 246 | if (parseOptions.enableFatelErrorProcessing) | 227 | if ( ! state->theProperties.getNoError()) |
1122 | 247 | throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse-xml-fragment()", e.what()), ERROR_LOC( loc )); | 228 | throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse()", e.what()), ERROR_LOC( loc )); |
1123 | 248 | else | 229 | else |
1124 | 249 | result = NULL; | 230 | result = NULL; |
1125 | 250 | } | 231 | } |
1126 | 251 | 232 | ||
1128 | 252 | if (result != NULL) | 233 | if (result == NULL) |
1129 | 234 | continue; | ||
1130 | 235 | |||
1131 | 236 | // Return the children of document node | ||
1132 | 237 | state->theFragmentStream.children = result->getChildren(); | ||
1133 | 238 | while (state->theFragmentStream.children->next(result) && result != NULL) | ||
1134 | 253 | { | 239 | { |
1136 | 254 | result->getChildren()->next(result); | 240 | if (state->theProperties.getSkipTopLevelTextNodes() && result->getNodeKind() == store::StoreConsts::textNode) |
1137 | 241 | continue; | ||
1138 | 242 | |||
1139 | 255 | STACK_PUSH(true, state); | 243 | STACK_PUSH(true, state); |
1140 | 256 | } | 244 | } |
1141 | 257 | } | 245 | } |
1142 | 258 | } | 246 | } |
1143 | 247 | //////////////////////////////////////////////////////////////////////// | ||
1144 | 248 | // XML document processing | ||
1145 | 249 | //////////////////////////////////////////////////////////////////////// | ||
1146 | 259 | else // if (!state->theProperties.getEnableExtParsedEntity()) | 250 | else // if (!state->theProperties.getEnableExtParsedEntity()) |
1147 | 260 | { | 251 | { |
1148 | 261 | try { | 252 | try { |
1149 | 262 | result = lStore.loadDocument(state->baseUri, state->docUri, *state->theFragmentStream.theStream, state->theProperties); | 253 | result = lStore.loadDocument(state->baseUri, state->docUri, *state->theFragmentStream.theStream, state->theProperties); |
1150 | 263 | } catch (ZorbaException const& e) { | 254 | } catch (ZorbaException const& e) { |
1153 | 264 | if (parseOptions.enableFatelErrorProcessing) | 255 | if ( ! state->theProperties.getNoError()) |
1154 | 265 | throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse-xml-fragment()", e.what()), ERROR_LOC( loc )); | 256 | throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse()", e.what()), ERROR_LOC( loc )); |
1155 | 266 | else | 257 | else |
1156 | 267 | result = NULL; | 258 | result = NULL; |
1157 | 268 | } | 259 | } |
1158 | @@ -270,7 +261,7 @@ | |||
1159 | 270 | if (result != NULL) | 261 | if (result != NULL) |
1160 | 271 | { | 262 | { |
1161 | 272 | #ifndef ZORBA_NO_XMLSCHEMA | 263 | #ifndef ZORBA_NO_XMLSCHEMA |
1163 | 273 | if (parseOptions.enableStrictSchemaValidation || parseOptions.enableLaxSchemaValidation) | 264 | if (state->theProperties.getSchemaLaxValidate() || state->theProperties.getSchemaStrictValidate()) |
1164 | 274 | { | 265 | { |
1165 | 275 | try | 266 | try |
1166 | 276 | { | 267 | { |
1167 | @@ -280,13 +271,13 @@ | |||
1168 | 280 | result, | 271 | result, |
1169 | 281 | tempItem, | 272 | tempItem, |
1170 | 282 | theSctx->get_typemanager(), | 273 | theSctx->get_typemanager(), |
1172 | 283 | parseOptions.enableLaxSchemaValidation ? ParseConstants::val_lax : ParseConstants::val_strict, | 274 | state->theProperties.getSchemaLaxValidate() ? ParseConstants::val_lax : ParseConstants::val_strict, |
1173 | 284 | theSctx, | 275 | theSctx, |
1174 | 285 | this->loc); | 276 | this->loc); |
1175 | 286 | } | 277 | } |
1176 | 287 | catch (ZorbaException& /*e*/) | 278 | catch (ZorbaException& /*e*/) |
1177 | 288 | { | 279 | { |
1179 | 289 | if (parseOptions.enableFatelErrorProcessing) | 280 | if ( ! state->theProperties.getNoError()) |
1180 | 290 | throw; | 281 | throw; |
1181 | 291 | else | 282 | else |
1182 | 292 | { | 283 | { |
1183 | @@ -298,11 +289,6 @@ | |||
1184 | 298 | #endif | 289 | #endif |
1185 | 299 | // Ignore the schema validation options if Zorba is built without schema support | 290 | // Ignore the schema validation options if Zorba is built without schema support |
1186 | 300 | 291 | ||
1187 | 301 | if (result != NULL && validated && parseOptions.enableWhitespaceStripping) | ||
1188 | 302 | { | ||
1189 | 303 | // TODO: whitespace stripping | ||
1190 | 304 | } | ||
1191 | 305 | |||
1192 | 306 | STACK_PUSH(validated, state); | 292 | STACK_PUSH(validated, state); |
1193 | 307 | } // if (result != NULL) | 293 | } // if (result != NULL) |
1194 | 308 | } // if (state->theProperties.getEnableExtParsedEntity()) | 294 | } // if (state->theProperties.getEnableExtParsedEntity()) |
1195 | 309 | 295 | ||
1196 | === modified file 'src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp' (properties changed: +x to -x) | |||
1197 | === modified file 'src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h' (properties changed: +x to -x) | |||
1198 | --- src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h 2011-10-19 15:28:51 +0000 | |||
1199 | +++ src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h 2012-02-23 17:28:26 +0000 | |||
1200 | @@ -36,7 +36,7 @@ | |||
1201 | 36 | namespace zorba { | 36 | namespace zorba { |
1202 | 37 | 37 | ||
1203 | 38 | /** | 38 | /** |
1205 | 39 | * fn-zorba-xml:parse-xml-fragment | 39 | * fn-zorba-xml:parse |
1206 | 40 | * Author: Zorba Team | 40 | * Author: Zorba Team |
1207 | 41 | */ | 41 | */ |
1208 | 42 | class FnParseXmlFragmentIteratorState : public PlanIteratorState | 42 | class FnParseXmlFragmentIteratorState : public PlanIteratorState |
1209 | 43 | 43 | ||
1210 | === modified file 'src/runtime/sequences/sequences_impl.cpp' | |||
1211 | --- src/runtime/sequences/sequences_impl.cpp 2012-02-15 10:25:02 +0000 | |||
1212 | +++ src/runtime/sequences/sequences_impl.cpp 2012-02-23 17:28:26 +0000 | |||
1213 | @@ -464,13 +464,13 @@ | |||
1214 | 464 | state->theIsChildReset = false; | 464 | state->theIsChildReset = false; |
1215 | 465 | 465 | ||
1216 | 466 | CONSUME(startPosItem, 1); | 466 | CONSUME(startPosItem, 1); |
1218 | 467 | startPos = | 467 | startPos = |
1219 | 468 | static_cast<xs_long>(startPosItem->getDoubleValue().round().getNumber()) - 1; | 468 | static_cast<xs_long>(startPosItem->getDoubleValue().round().getNumber()) - 1; |
1220 | 469 | 469 | ||
1221 | 470 | if (theChildren.size() == 3) | 470 | if (theChildren.size() == 3) |
1222 | 471 | { | 471 | { |
1223 | 472 | CONSUME(lengthItem, 2); | 472 | CONSUME(lengthItem, 2); |
1225 | 473 | state->theRemaining = | 473 | state->theRemaining = |
1226 | 474 | static_cast<xs_long>(lengthItem->getDoubleValue().round().getNumber()); | 474 | static_cast<xs_long>(lengthItem->getDoubleValue().round().getNumber()); |
1227 | 475 | } | 475 | } |
1228 | 476 | 476 | ||
1229 | @@ -1033,7 +1033,7 @@ | |||
1230 | 1033 | } | 1033 | } |
1231 | 1034 | 1034 | ||
1232 | 1035 | bool FnDeepEqualIterator::nextImpl( | 1035 | bool FnDeepEqualIterator::nextImpl( |
1234 | 1036 | store::Item_t& result, | 1036 | store::Item_t& result, |
1235 | 1037 | PlanState& planState) const | 1037 | PlanState& planState) const |
1236 | 1038 | { | 1038 | { |
1237 | 1039 | PlanIteratorState* state; | 1039 | PlanIteratorState* state; |
1238 | @@ -1061,7 +1061,7 @@ | |||
1239 | 1061 | break; | 1061 | break; |
1240 | 1062 | } | 1062 | } |
1241 | 1063 | 1063 | ||
1243 | 1064 | if (arg1->isFunction() || arg2->isFunction()) | 1064 | if (arg1->isFunction() || arg2->isFunction()) |
1244 | 1065 | { | 1065 | { |
1245 | 1066 | throw XQUERY_EXCEPTION( | 1066 | throw XQUERY_EXCEPTION( |
1246 | 1067 | err::FOTY0015, | 1067 | err::FOTY0015, |
1247 | @@ -1161,12 +1161,12 @@ | |||
1248 | 1161 | DEFAULT_STACK_INIT(PlanIteratorState, state, planState); | 1161 | DEFAULT_STACK_INIT(PlanIteratorState, state, planState); |
1249 | 1162 | 1162 | ||
1250 | 1163 | 1163 | ||
1252 | 1164 | for (;;) | 1164 | for (;;) |
1253 | 1165 | { | 1165 | { |
1254 | 1166 | // load items | 1166 | // load items |
1256 | 1167 | for (i = 0; i < 2; i++) | 1167 | for (i = 0; i < 2; i++) |
1257 | 1168 | { | 1168 | { |
1259 | 1169 | if (item [i] == NULL) | 1169 | if (item [i] == NULL) |
1260 | 1170 | { | 1170 | { |
1261 | 1171 | if (!CONSUME (item[i], i)) | 1171 | if (!CONSUME (item[i], i)) |
1262 | 1172 | { | 1172 | { |
1263 | @@ -1178,7 +1178,7 @@ | |||
1264 | 1178 | 1178 | ||
1265 | 1179 | // advance, output | 1179 | // advance, output |
1266 | 1180 | order = GENV_STORE.compareNodes(item[0].getp(), item[1].getp()); | 1180 | order = GENV_STORE.compareNodes(item[0].getp(), item[1].getp()); |
1268 | 1181 | if ( order == 0 ) | 1181 | if ( order == 0 ) |
1269 | 1182 | { | 1182 | { |
1270 | 1183 | result = item[0]; | 1183 | result = item[0]; |
1271 | 1184 | STACK_PUSH (true, state); | 1184 | STACK_PUSH (true, state); |
1272 | @@ -1739,7 +1739,7 @@ | |||
1273 | 1739 | planState.theGlobalDynCtx->theDocLoadingUserTime += | 1739 | planState.theGlobalDynCtx->theDocLoadingUserTime += |
1274 | 1740 | zorbatm::get_cputime_elapsed(t0user, t1user); | 1740 | zorbatm::get_cputime_elapsed(t0user, t1user); |
1275 | 1741 | 1741 | ||
1277 | 1742 | planState.theGlobalDynCtx->theDocLoadingTime += | 1742 | planState.theGlobalDynCtx->theDocLoadingTime += |
1278 | 1743 | zorbatm::get_walltime_elapsed(t0, t1); | 1743 | zorbatm::get_walltime_elapsed(t0, t1); |
1279 | 1744 | } | 1744 | } |
1280 | 1745 | 1745 | ||
1281 | @@ -1833,7 +1833,7 @@ | |||
1282 | 1833 | // Prepare a LoadProperties for loading the stream into the store | 1833 | // Prepare a LoadProperties for loading the stream into the store |
1283 | 1834 | store::LoadProperties lLoadProperties; | 1834 | store::LoadProperties lLoadProperties; |
1284 | 1835 | lLoadProperties.setStoreDocument(true); | 1835 | lLoadProperties.setStoreDocument(true); |
1286 | 1836 | lLoadProperties.setEnableDtd( aSctx->is_feature_set( feature::dtd ) ); | 1836 | lLoadProperties.setDTDValidate( aSctx->is_feature_set( feature::dtd ) ); |
1287 | 1837 | 1837 | ||
1288 | 1838 | // Resolve URI to a stream | 1838 | // Resolve URI to a stream |
1289 | 1839 | zstring lErrorMessage; | 1839 | zstring lErrorMessage; |
1290 | 1840 | 1840 | ||
1291 | === modified file 'src/runtime/spec/parsing_and_serializing/parse_fragment.xml' | |||
1292 | --- src/runtime/spec/parsing_and_serializing/parse_fragment.xml 2011-07-15 16:39:51 +0000 | |||
1293 | +++ src/runtime/spec/parsing_and_serializing/parse_fragment.xml 2012-02-23 17:28:26 +0000 | |||
1294 | @@ -19,27 +19,20 @@ | |||
1295 | 19 | 19 | ||
1296 | 20 | <!-- | 20 | <!-- |
1297 | 21 | /******************************************************************************* | 21 | /******************************************************************************* |
1299 | 22 | * 14.9.1 fn:parse-xml-fragment | 22 | * 14.9.1 parse-xml:parse |
1300 | 23 | ********************************************************************************/ | 23 | ********************************************************************************/ |
1301 | 24 | --> | 24 | --> |
1302 | 25 | <zorba:iterator name="FnParseXmlFragmentIterator"> | 25 | <zorba:iterator name="FnParseXmlFragmentIterator"> |
1303 | 26 | 26 | ||
1305 | 27 | <zorba:description author="Zorba Team">fn-zorba-xml:parse-xml-fragment</zorba:description> | 27 | <zorba:description author="Zorba Team">fn-zorba-xml:parse</zorba:description> |
1306 | 28 | 28 | ||
1307 | 29 | <zorba:function> | 29 | <zorba:function> |
1311 | 30 | <zorba:signature localname="parse-xml-fragment" prefix="fn-zorba-xml"> | 30 | <zorba:signature localname="parse" prefix="fn-zorba-xml"> |
1312 | 31 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> | 31 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> |
1313 | 32 | <zorba:param>xs:string</zorba:param> <!-- parse-xml options --> | 32 | <zorba:param>element()?</zorba:param> <!-- parse() options --> |
1314 | 33 | <zorba:output>node()*</zorba:output> | 33 | <zorba:output>node()*</zorba:output> |
1315 | 34 | </zorba:signature> | 34 | </zorba:signature> |
1316 | 35 | 35 | ||
1317 | 36 | <zorba:signature localname="parse-xml-fragment" prefix="fn-zorba-xml"> | ||
1318 | 37 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> | ||
1319 | 38 | <zorba:param>xs:string</zorba:param> <!-- baseURI --> | ||
1320 | 39 | <zorba:param>xs:string</zorba:param> <!-- parse-xml options --> | ||
1321 | 40 | <zorba:output>node()*</zorba:output> | ||
1322 | 41 | </zorba:signature> | ||
1323 | 42 | |||
1324 | 43 | <zorba:methods> | 36 | <zorba:methods> |
1325 | 44 | <zorba:accessesDynCtx returnValue="true"/> | 37 | <zorba:accessesDynCtx returnValue="true"/> |
1326 | 45 | </zorba:methods> | 38 | </zorba:methods> |
1327 | 46 | 39 | ||
1328 | === modified file 'src/store/api/load_properties.h' | |||
1329 | --- src/store/api/load_properties.h 2011-06-29 15:03:41 +0000 | |||
1330 | +++ src/store/api/load_properties.h 2012-02-23 17:28:26 +0000 | |||
1331 | @@ -35,12 +35,70 @@ | |||
1332 | 35 | { | 35 | { |
1333 | 36 | private: | 36 | private: |
1334 | 37 | bool theStoreDocument; | 37 | bool theStoreDocument; |
1337 | 38 | bool theEnableDtdLoader; | 38 | zstring theBaseUri; |
1338 | 39 | bool theEnableExtParsedEntityLoader; | 39 | bool theNoError; |
1339 | 40 | bool theStripWhitespace; | ||
1340 | 41 | bool theSchemaLaxValidate; | ||
1341 | 42 | bool theSchemaStrictValidate; | ||
1342 | 43 | bool theDTDValidate; | ||
1343 | 44 | bool theDTDLoad; | ||
1344 | 45 | bool theDefaultDTDAttributes; | ||
1345 | 46 | bool theParseExternalParsedEntity; | ||
1346 | 47 | unsigned int theSkipRootNodes; | ||
1347 | 48 | bool theSkipTopLevelTextNodes; | ||
1348 | 49 | bool theSubstituteEntities; | ||
1349 | 50 | bool theXincludeSubstitutions; | ||
1350 | 51 | bool theRemoveRedundantNS; | ||
1351 | 52 | bool theNoCDATA; | ||
1352 | 53 | bool theNoXIncludeNodes; | ||
1353 | 40 | 54 | ||
1354 | 41 | public: | 55 | public: |
1357 | 42 | LoadProperties() : theStoreDocument(true), theEnableDtdLoader(false), theEnableExtParsedEntityLoader(false) {} | 56 | LoadProperties() |
1358 | 43 | virtual ~LoadProperties() {} | 57 | : |
1359 | 58 | theStoreDocument(true), | ||
1360 | 59 | theBaseUri(""), | ||
1361 | 60 | theNoError(false), | ||
1362 | 61 | theStripWhitespace(false), | ||
1363 | 62 | theSchemaLaxValidate(false), | ||
1364 | 63 | theSchemaStrictValidate(false), | ||
1365 | 64 | theDTDValidate(false), | ||
1366 | 65 | theDTDLoad(false), | ||
1367 | 66 | theDefaultDTDAttributes(false), | ||
1368 | 67 | theParseExternalParsedEntity(false), | ||
1369 | 68 | theSkipRootNodes(0), | ||
1370 | 69 | theSkipTopLevelTextNodes(false), | ||
1371 | 70 | theSubstituteEntities(false), | ||
1372 | 71 | theXincludeSubstitutions(false), | ||
1373 | 72 | theRemoveRedundantNS(false), | ||
1374 | 73 | theNoCDATA(false), | ||
1375 | 74 | theNoXIncludeNodes(false) | ||
1376 | 75 | { | ||
1377 | 76 | } | ||
1378 | 77 | |||
1379 | 78 | virtual ~LoadProperties() | ||
1380 | 79 | { | ||
1381 | 80 | } | ||
1382 | 81 | |||
1383 | 82 | void reset() | ||
1384 | 83 | { | ||
1385 | 84 | theStoreDocument = true; | ||
1386 | 85 | theBaseUri = ""; | ||
1387 | 86 | theNoError = false; | ||
1388 | 87 | theStripWhitespace = false; | ||
1389 | 88 | theSchemaLaxValidate = false; | ||
1390 | 89 | theSchemaStrictValidate = false; | ||
1391 | 90 | theDTDValidate = false; | ||
1392 | 91 | theDTDLoad = false; | ||
1393 | 92 | theDefaultDTDAttributes = false; | ||
1394 | 93 | theParseExternalParsedEntity = false; | ||
1395 | 94 | theSkipRootNodes = 0; | ||
1396 | 95 | theSkipTopLevelTextNodes = false; | ||
1397 | 96 | theSubstituteEntities = false; | ||
1398 | 97 | theXincludeSubstitutions = false; | ||
1399 | 98 | theRemoveRedundantNS = false; | ||
1400 | 99 | theNoCDATA = false; | ||
1401 | 100 | theNoXIncludeNodes = false; | ||
1402 | 101 | } | ||
1403 | 44 | 102 | ||
1404 | 45 | /** | 103 | /** |
1405 | 46 | * Set the property storeDocument, it specifies whether the document | 104 | * Set the property storeDocument, it specifies whether the document |
1406 | @@ -60,40 +118,168 @@ | |||
1407 | 60 | return theStoreDocument; | 118 | return theStoreDocument; |
1408 | 61 | } | 119 | } |
1409 | 62 | 120 | ||
1444 | 63 | /** | 121 | // theBaseUri |
1445 | 64 | * Set the property enableDtd, it specifies whether the document's | 122 | void setBaseUri(const zstring& aBaseUri) |
1446 | 65 | * dtd should be enabled when loading | 123 | { |
1447 | 66 | */ | 124 | theBaseUri = aBaseUri; |
1448 | 67 | void setEnableDtd(bool aEnableDtdLoader) | 125 | } |
1449 | 68 | { | 126 | zstring getBaseUri() const |
1450 | 69 | theEnableDtdLoader = aEnableDtdLoader; | 127 | { |
1451 | 70 | } | 128 | return theBaseUri; |
1452 | 71 | 129 | } | |
1453 | 72 | /** | 130 | |
1454 | 73 | * Get the property enableDtd, it specifies whether the document's | 131 | // theNoError |
1455 | 74 | * dtd should be enabled when loading | 132 | void setNoError(bool aNoError) |
1456 | 75 | */ | 133 | { |
1457 | 76 | bool getEnableDtd() const | 134 | theNoError = aNoError; |
1458 | 77 | { | 135 | } |
1459 | 78 | return theEnableDtdLoader; | 136 | bool getNoError() const |
1460 | 79 | } | 137 | { |
1461 | 80 | 138 | return theNoError; | |
1462 | 81 | /** | 139 | } |
1463 | 82 | * Set the property enableExtParsedEntity, it specifies whether the document | 140 | |
1464 | 83 | * should be parsed as an enxternal general parsed entity | 141 | // theStripWhitespace |
1465 | 84 | */ | 142 | void setStripWhitespace(bool aStripWhitespace) |
1466 | 85 | void setEnableExtParsedEntity(bool aEnableExtParsedEntityLoader) | 143 | { |
1467 | 86 | { | 144 | theStripWhitespace = aStripWhitespace; |
1468 | 87 | theEnableExtParsedEntityLoader = aEnableExtParsedEntityLoader; | 145 | } |
1469 | 88 | } | 146 | bool getStripWhitespace() const |
1470 | 89 | 147 | { | |
1471 | 90 | /** | 148 | return theStripWhitespace; |
1472 | 91 | * Get the property enableDtd, it specifies whether the document | 149 | } |
1473 | 92 | * should be parsed as an enxternal general parsed entity | 150 | |
1474 | 93 | */ | 151 | // theSchemaLaxValidate |
1475 | 94 | bool getEnableExtParsedEntity() const | 152 | void setSchemaLaxValidate(bool aSchemaLaxValidate) |
1476 | 95 | { | 153 | { |
1477 | 96 | return theEnableExtParsedEntityLoader; | 154 | theSchemaLaxValidate = aSchemaLaxValidate; |
1478 | 155 | if (theSchemaLaxValidate) | ||
1479 | 156 | theSchemaStrictValidate = false; | ||
1480 | 157 | } | ||
1481 | 158 | bool getSchemaLaxValidate() const | ||
1482 | 159 | { | ||
1483 | 160 | return theSchemaLaxValidate; | ||
1484 | 161 | } | ||
1485 | 162 | |||
1486 | 163 | // theSchemaStrictValidate | ||
1487 | 164 | void setSchemaStrictValidate(bool aSchemaStrictValidate) | ||
1488 | 165 | { | ||
1489 | 166 | theSchemaStrictValidate = aSchemaStrictValidate; | ||
1490 | 167 | if (theSchemaStrictValidate) | ||
1491 | 168 | theSchemaLaxValidate = false; | ||
1492 | 169 | } | ||
1493 | 170 | bool getSchemaStrictValidate() const | ||
1494 | 171 | { | ||
1495 | 172 | return theSchemaStrictValidate; | ||
1496 | 173 | } | ||
1497 | 174 | |||
1498 | 175 | // theDTDValidate | ||
1499 | 176 | void setDTDValidate(bool aDTDValidate) | ||
1500 | 177 | { | ||
1501 | 178 | theDTDValidate = aDTDValidate; | ||
1502 | 179 | } | ||
1503 | 180 | bool getDTDValidate() const | ||
1504 | 181 | { | ||
1505 | 182 | return theDTDValidate; | ||
1506 | 183 | } | ||
1507 | 184 | |||
1508 | 185 | // theDTDLoad | ||
1509 | 186 | void setDTDLoad(bool aDTDLoad) | ||
1510 | 187 | { | ||
1511 | 188 | theDTDLoad = aDTDLoad; | ||
1512 | 189 | } | ||
1513 | 190 | bool getDTDLoad() const | ||
1514 | 191 | { | ||
1515 | 192 | return theDTDLoad; | ||
1516 | 193 | } | ||
1517 | 194 | |||
1518 | 195 | // theDefaultDTDAttributes | ||
1519 | 196 | void setDefaultDTDAttributes(bool aDefaultDTDAttributes) | ||
1520 | 197 | { | ||
1521 | 198 | theDefaultDTDAttributes = aDefaultDTDAttributes; | ||
1522 | 199 | } | ||
1523 | 200 | bool getDefaultDTDAttributes() const | ||
1524 | 201 | { | ||
1525 | 202 | return theDefaultDTDAttributes; | ||
1526 | 203 | } | ||
1527 | 204 | |||
1528 | 205 | // theParseExternalParsedEntity | ||
1529 | 206 | void setParseExternalParsedEntity(bool aParseExternalParsedEntity) | ||
1530 | 207 | { | ||
1531 | 208 | theParseExternalParsedEntity = aParseExternalParsedEntity; | ||
1532 | 209 | } | ||
1533 | 210 | bool getParseExternalParsedEntity() const | ||
1534 | 211 | { | ||
1535 | 212 | return theParseExternalParsedEntity; | ||
1536 | 213 | } | ||
1537 | 214 | |||
1538 | 215 | // theSkipRootNodes | ||
1539 | 216 | void setSkipRootNodes(unsigned int aSkipRootNodes) | ||
1540 | 217 | { | ||
1541 | 218 | theSkipRootNodes = aSkipRootNodes; | ||
1542 | 219 | } | ||
1543 | 220 | unsigned int getSkipRootNodes() const | ||
1544 | 221 | { | ||
1545 | 222 | return theSkipRootNodes; | ||
1546 | 223 | } | ||
1547 | 224 | |||
1548 | 225 | // theSkipTopLevelTextNodes | ||
1549 | 226 | void setSkipTopLevelTextNodes(bool aSkipTopLevelTextNodes) | ||
1550 | 227 | { | ||
1551 | 228 | theSkipTopLevelTextNodes = aSkipTopLevelTextNodes; | ||
1552 | 229 | } | ||
1553 | 230 | bool getSkipTopLevelTextNodes() const | ||
1554 | 231 | { | ||
1555 | 232 | return theSkipTopLevelTextNodes; | ||
1556 | 233 | } | ||
1557 | 234 | |||
1558 | 235 | // theSubstituteEntities | ||
1559 | 236 | void setSubstituteEntities(bool aSubstituteEntities) | ||
1560 | 237 | { | ||
1561 | 238 | theSubstituteEntities = aSubstituteEntities; | ||
1562 | 239 | } | ||
1563 | 240 | bool getSubstituteEntities() const | ||
1564 | 241 | { | ||
1565 | 242 | return theSubstituteEntities; | ||
1566 | 243 | } | ||
1567 | 244 | |||
1568 | 245 | // theXincludeSubstitutions | ||
1569 | 246 | void setXincludeSubstitutions(bool aXincludeSubstitutions) | ||
1570 | 247 | { | ||
1571 | 248 | theXincludeSubstitutions = aXincludeSubstitutions; | ||
1572 | 249 | } | ||
1573 | 250 | bool getXincludeSubstitutions() const | ||
1574 | 251 | { | ||
1575 | 252 | return theXincludeSubstitutions; | ||
1576 | 253 | } | ||
1577 | 254 | |||
1578 | 255 | // theRemoveRedundantNS | ||
1579 | 256 | void setRemoveRedundantNS(bool aRemoveRedundantNS) | ||
1580 | 257 | { | ||
1581 | 258 | theRemoveRedundantNS = aRemoveRedundantNS; | ||
1582 | 259 | } | ||
1583 | 260 | bool getRemoveRedundantNS() const | ||
1584 | 261 | { | ||
1585 | 262 | return theRemoveRedundantNS; | ||
1586 | 263 | } | ||
1587 | 264 | |||
1588 | 265 | // theNoCDATA | ||
1589 | 266 | void setNoCDATA(bool aNoCDATA) | ||
1590 | 267 | { | ||
1591 | 268 | theNoCDATA = aNoCDATA; | ||
1592 | 269 | } | ||
1593 | 270 | bool getNoCDATA() const | ||
1594 | 271 | { | ||
1595 | 272 | return theNoCDATA; | ||
1596 | 273 | } | ||
1597 | 274 | |||
1598 | 275 | // theNoXIncludeNodes | ||
1599 | 276 | void setNoXIncludeNodes(bool aNoXIncludeNodes) | ||
1600 | 277 | { | ||
1601 | 278 | theNoXIncludeNodes = aNoXIncludeNodes; | ||
1602 | 279 | } | ||
1603 | 280 | bool getNoXIncludeNodes() const | ||
1604 | 281 | { | ||
1605 | 282 | return theNoXIncludeNodes; | ||
1606 | 97 | } | 283 | } |
1607 | 98 | }; | 284 | }; |
1608 | 99 | 285 | ||
1609 | 100 | 286 | ||
1610 | === modified file 'src/store/naive/loader.h' | |||
1611 | --- src/store/naive/loader.h 2011-07-15 16:39:51 +0000 | |||
1612 | +++ src/store/naive/loader.h 2012-02-23 17:28:26 +0000 | |||
1613 | @@ -21,6 +21,7 @@ | |||
1614 | 21 | #include <libxml/xmlstring.h> | 21 | #include <libxml/xmlstring.h> |
1615 | 22 | 22 | ||
1616 | 23 | #include "store/api/item.h" | 23 | #include "store/api/item.h" |
1617 | 24 | #include "store/api/load_properties.h" | ||
1618 | 24 | 25 | ||
1619 | 25 | #include "store/naive/ordpath.h" | 26 | #include "store/naive/ordpath.h" |
1620 | 26 | 27 | ||
1621 | @@ -74,6 +75,8 @@ | |||
1622 | 74 | static const ulong INPUT_CHUNK_SIZE = 8192; | 75 | static const ulong INPUT_CHUNK_SIZE = 8192; |
1623 | 75 | 76 | ||
1624 | 76 | protected: | 77 | protected: |
1625 | 78 | const store::LoadProperties & theLoadProperties; | ||
1626 | 79 | |||
1627 | 77 | xmlParserCtxtPtr ctxt; | 80 | xmlParserCtxtPtr ctxt; |
1628 | 78 | 81 | ||
1629 | 79 | xmlSAXHandler theSaxHandler; | 82 | xmlSAXHandler theSaxHandler; |
1630 | @@ -89,12 +92,19 @@ | |||
1631 | 89 | 92 | ||
1632 | 90 | bool theBuildDataGuide; | 93 | bool theBuildDataGuide; |
1633 | 91 | 94 | ||
1634 | 95 | |||
1635 | 96 | protected: | ||
1636 | 97 | void applyLoadOptions(const store::LoadProperties& props, xmlParserCtxtPtr ctxt); | ||
1637 | 98 | |||
1638 | 99 | |||
1639 | 92 | public: | 100 | public: |
1640 | 93 | XmlLoader( | 101 | XmlLoader( |
1641 | 94 | BasicItemFactory* factory, | 102 | BasicItemFactory* factory, |
1642 | 95 | XQueryDiagnostics* xqueryDiagnostics, | 103 | XQueryDiagnostics* xqueryDiagnostics, |
1643 | 104 | const store::LoadProperties& loadProperties, | ||
1644 | 96 | bool dataguide) | 105 | bool dataguide) |
1645 | 97 | : | 106 | : |
1646 | 107 | theLoadProperties(loadProperties), | ||
1647 | 98 | ctxt(NULL), | 108 | ctxt(NULL), |
1648 | 99 | theFactory(factory), | 109 | theFactory(factory), |
1649 | 100 | theXQueryDiagnostics(xqueryDiagnostics), | 110 | theXQueryDiagnostics(xqueryDiagnostics), |
1650 | @@ -156,6 +166,7 @@ | |||
1651 | 156 | FastXmlLoader( | 166 | FastXmlLoader( |
1652 | 157 | BasicItemFactory* factory, | 167 | BasicItemFactory* factory, |
1653 | 158 | XQueryDiagnostics* xqueryDiagnostics, | 168 | XQueryDiagnostics* xqueryDiagnostics, |
1654 | 169 | const store::LoadProperties& loadProperties, | ||
1655 | 159 | bool dataguide); | 170 | bool dataguide); |
1656 | 160 | 171 | ||
1657 | 161 | ~FastXmlLoader(); | 172 | ~FastXmlLoader(); |
1658 | @@ -245,6 +256,7 @@ | |||
1659 | 245 | FragmentXmlLoader( | 256 | FragmentXmlLoader( |
1660 | 246 | BasicItemFactory* factory, | 257 | BasicItemFactory* factory, |
1661 | 247 | XQueryDiagnostics* xqueryDiagnostics, | 258 | XQueryDiagnostics* xqueryDiagnostics, |
1662 | 259 | const store::LoadProperties& loadProperties, | ||
1663 | 248 | bool dataguide); | 260 | bool dataguide); |
1664 | 249 | 261 | ||
1665 | 250 | ~FragmentXmlLoader(); | 262 | ~FragmentXmlLoader(); |
1666 | @@ -255,7 +267,15 @@ | |||
1667 | 255 | std::istream& xmlStream); | 267 | std::istream& xmlStream); |
1668 | 256 | 268 | ||
1669 | 257 | protected: | 269 | protected: |
1671 | 258 | static void checkStopParsing(void* ctx); | 270 | bool fillBuffer(FragmentIStream* theFragmentStream); |
1672 | 271 | |||
1673 | 272 | unsigned long getCurrentInputOffset() const; | ||
1674 | 273 | |||
1675 | 274 | static void checkStopParsing(void* ctx, bool force = false); | ||
1676 | 275 | |||
1677 | 276 | static void startDocument(void * ctx); | ||
1678 | 277 | |||
1679 | 278 | static void endDocument(void * ctx); | ||
1680 | 259 | 279 | ||
1681 | 260 | static void startElement( | 280 | static void startElement( |
1682 | 261 | void * ctx, | 281 | void * ctx, |
1683 | @@ -295,7 +315,6 @@ | |||
1684 | 295 | 315 | ||
1685 | 296 | protected: | 316 | protected: |
1686 | 297 | FragmentIStream* theFragmentStream; | 317 | FragmentIStream* theFragmentStream; |
1687 | 298 | int element_depth; | ||
1688 | 299 | }; | 318 | }; |
1689 | 300 | 319 | ||
1690 | 301 | /******************************************************************************* | 320 | /******************************************************************************* |
1691 | @@ -331,8 +350,6 @@ | |||
1692 | 331 | zorba::Stack<PathStepInfo> thePathStack; | 350 | zorba::Stack<PathStepInfo> thePathStack; |
1693 | 332 | std::stack<NsBindingsContext*> theBindingsStack; | 351 | std::stack<NsBindingsContext*> theBindingsStack; |
1694 | 333 | 352 | ||
1695 | 334 | bool theParseExtParsedEntity; | ||
1696 | 335 | |||
1697 | 336 | #ifdef DATAGUIDE | 353 | #ifdef DATAGUIDE |
1698 | 337 | zorba::Stack<ElementGuideNode*> theGuideStack; | 354 | zorba::Stack<ElementGuideNode*> theGuideStack; |
1699 | 338 | #endif | 355 | #endif |
1700 | @@ -341,8 +358,8 @@ | |||
1701 | 341 | DtdXmlLoader( | 358 | DtdXmlLoader( |
1702 | 342 | BasicItemFactory* factory, | 359 | BasicItemFactory* factory, |
1703 | 343 | XQueryDiagnostics* xqueryDiagnostics, | 360 | XQueryDiagnostics* xqueryDiagnostics, |
1706 | 344 | bool dataguide, | 361 | const store::LoadProperties& loadProperties, |
1707 | 345 | bool parseExtParsedEntity); | 362 | bool dataguide); |
1708 | 346 | 363 | ||
1709 | 347 | ~DtdXmlLoader(); | 364 | ~DtdXmlLoader(); |
1710 | 348 | 365 | ||
1711 | 349 | 366 | ||
1712 | === modified file 'src/store/naive/loader_dtd.cpp' | |||
1713 | --- src/store/naive/loader_dtd.cpp 2012-02-15 10:25:02 +0000 | |||
1714 | +++ src/store/naive/loader_dtd.cpp 2012-02-23 17:28:26 +0000 | |||
1715 | @@ -76,12 +76,51 @@ | |||
1716 | 76 | /******************************************************************************* | 76 | /******************************************************************************* |
1717 | 77 | 77 | ||
1718 | 78 | ********************************************************************************/ | 78 | ********************************************************************************/ |
1719 | 79 | void XmlLoader::applyLoadOptions(const store::LoadProperties& props, xmlParserCtxtPtr ctxt) | ||
1720 | 80 | { | ||
1721 | 81 | int options = 0; | ||
1722 | 82 | |||
1723 | 83 | if (props.getStripWhitespace()) | ||
1724 | 84 | options |= XML_PARSE_NOBLANKS; | ||
1725 | 85 | |||
1726 | 86 | if (props.getDTDValidate()) | ||
1727 | 87 | options |= XML_PARSE_DTDVALID; | ||
1728 | 88 | |||
1729 | 89 | if (props.getDTDLoad()) | ||
1730 | 90 | options |= XML_PARSE_DTDLOAD; | ||
1731 | 91 | |||
1732 | 92 | if (props.getDefaultDTDAttributes()) | ||
1733 | 93 | options |= XML_PARSE_DTDATTR; | ||
1734 | 94 | |||
1735 | 95 | if (props.getSubstituteEntities()) | ||
1736 | 96 | options |= XML_PARSE_NOENT; | ||
1737 | 97 | |||
1738 | 98 | if (props.getXincludeSubstitutions()) | ||
1739 | 99 | options |= XML_PARSE_XINCLUDE; | ||
1740 | 100 | |||
1741 | 101 | if (props.getRemoveRedundantNS()) | ||
1742 | 102 | options |= XML_PARSE_NSCLEAN; | ||
1743 | 103 | |||
1744 | 104 | if (props.getNoCDATA()) | ||
1745 | 105 | options |= XML_PARSE_NOCDATA; | ||
1746 | 106 | |||
1747 | 107 | if (props.getNoXIncludeNodes()) | ||
1748 | 108 | options |= XML_PARSE_NOXINCNODE; | ||
1749 | 109 | |||
1750 | 110 | xmlCtxtUseOptions(ctxt, options); | ||
1751 | 111 | } | ||
1752 | 112 | |||
1753 | 113 | |||
1754 | 114 | /******************************************************************************* | ||
1755 | 115 | |||
1756 | 116 | ********************************************************************************/ | ||
1757 | 79 | FragmentXmlLoader::FragmentXmlLoader( | 117 | FragmentXmlLoader::FragmentXmlLoader( |
1758 | 80 | BasicItemFactory* factory, | 118 | BasicItemFactory* factory, |
1759 | 81 | XQueryDiagnostics* xqueryDiagnostics, | 119 | XQueryDiagnostics* xqueryDiagnostics, |
1760 | 120 | const store::LoadProperties& loadProperties, | ||
1761 | 82 | bool dataguide) | 121 | bool dataguide) |
1762 | 83 | : | 122 | : |
1764 | 84 | FastXmlLoader(factory, xqueryDiagnostics, dataguide) | 123 | FastXmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide) |
1765 | 85 | { | 124 | { |
1766 | 86 | theOrdPath.init(); | 125 | theOrdPath.init(); |
1767 | 87 | 126 | ||
1768 | @@ -109,6 +148,39 @@ | |||
1769 | 109 | { | 148 | { |
1770 | 110 | } | 149 | } |
1771 | 111 | 150 | ||
1772 | 151 | bool FragmentXmlLoader::fillBuffer(FragmentIStream* theFragmentStream) | ||
1773 | 152 | { | ||
1774 | 153 | if (theFragmentStream->ctxt->input->length > 0 && theFragmentStream->current_offset < theFragmentStream->bytes_in_buffer) | ||
1775 | 154 | { | ||
1776 | 155 | memmove(theFragmentStream->theBuffer, theFragmentStream->theBuffer + theFragmentStream->current_offset, | ||
1777 | 156 | theFragmentStream->bytes_in_buffer - theFragmentStream->current_offset); | ||
1778 | 157 | } | ||
1779 | 158 | theFragmentStream->bytes_in_buffer -= theFragmentStream->current_offset; | ||
1780 | 159 | |||
1781 | 160 | std::streamsize numChars = readPacket(*theFragmentStream->theStream, theFragmentStream->theBuffer + theFragmentStream->bytes_in_buffer, | ||
1782 | 161 | FragmentIStream::BUFFER_SIZE+FragmentIStream::LOOKAHEAD_BYTES - theFragmentStream->bytes_in_buffer); | ||
1783 | 162 | if (numChars < 0) | ||
1784 | 163 | { | ||
1785 | 164 | theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR)); | ||
1786 | 165 | throw 0; // the argument to throw is not used by the catch clause | ||
1787 | 166 | } | ||
1788 | 167 | |||
1789 | 168 | if (theFragmentStream->theStream->eof()) | ||
1790 | 169 | theFragmentStream->reached_eof = true; | ||
1791 | 170 | |||
1792 | 171 | theFragmentStream->bytes_in_buffer += numChars; | ||
1793 | 172 | theFragmentStream->current_offset = 0; | ||
1794 | 173 | theFragmentStream->ctxt->input->base = (xmlChar*)(theFragmentStream->theBuffer); | ||
1795 | 174 | theFragmentStream->ctxt->input->length = (theFragmentStream->bytes_in_buffer < FragmentIStream::BUFFER_SIZE? theFragmentStream->bytes_in_buffer : FragmentIStream::BUFFER_SIZE); | ||
1796 | 175 | theFragmentStream->ctxt->input->cur = theFragmentStream->ctxt->input->base; | ||
1797 | 176 | theFragmentStream->ctxt->input->end = theFragmentStream->ctxt->input->base + theFragmentStream->ctxt->input->length; | ||
1798 | 177 | theFragmentStream->ctxt->checkIndex = 0; | ||
1799 | 178 | |||
1800 | 179 | if (theFragmentStream->bytes_in_buffer < FragmentIStream::BUFFER_SIZE+FragmentIStream::LOOKAHEAD_BYTES) | ||
1801 | 180 | theFragmentStream->theBuffer[theFragmentStream->bytes_in_buffer] = 0; | ||
1802 | 181 | |||
1803 | 182 | return !theFragmentStream->stream_is_consumed(); | ||
1804 | 183 | } | ||
1805 | 112 | 184 | ||
1806 | 113 | store::Item_t FragmentXmlLoader::loadXml( | 185 | store::Item_t FragmentXmlLoader::loadXml( |
1807 | 114 | const zstring& baseUri, | 186 | const zstring& baseUri, |
1808 | @@ -138,88 +210,105 @@ | |||
1809 | 138 | { | 210 | { |
1810 | 139 | theFragmentStream = static_cast<FragmentIStream*>(&stream); | 211 | theFragmentStream = static_cast<FragmentIStream*>(&stream); |
1811 | 140 | 212 | ||
1813 | 141 | // Prepare the input buffer | 213 | // Prepare the input buffer and the parser context |
1814 | 142 | if (theFragmentStream->theBuffer == NULL) | 214 | if (theFragmentStream->theBuffer == NULL) |
1815 | 143 | { | 215 | { |
1895 | 144 | theFragmentStream->theStream->seekg(0, std::ios::end); | 216 | // Allocate input buffer |
1896 | 145 | std::streamoff fileSize = theFragmentStream->theStream->tellg(); | 217 | theFragmentStream->theBuffer = new char[FragmentIStream::BUFFER_SIZE + FragmentIStream::LOOKAHEAD_BYTES+1]; |
1897 | 146 | theFragmentStream->theStream->seekg(0, std::ios::beg); | 218 | theFragmentStream->theBuffer[FragmentIStream::BUFFER_SIZE + FragmentIStream::LOOKAHEAD_BYTES] = 0; |
1898 | 147 | 219 | ||
1899 | 148 | theFragmentStream->theBuffer = new char[static_cast<unsigned int>(fileSize+1)]; | 220 | // Create the LibXml parser context |
1900 | 149 | theFragmentStream->theBuffer[fileSize] = 0; | 221 | theFragmentStream->ctxt = xmlCreatePushParserCtxt(&theSaxHandler, this, NULL, 0, 0); |
1901 | 150 | 222 | if (theFragmentStream->ctxt == NULL) | |
1902 | 151 | std::streamsize numChars = readPacket(*theFragmentStream->theStream, | 223 | { |
1903 | 152 | theFragmentStream->theBuffer, | 224 | theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) ))); |
1904 | 153 | fileSize); | 225 | throw 0; // the argument to throw is not used by the catch clause |
1905 | 154 | theFragmentStream->buffer_size = numChars; | 226 | } |
1906 | 155 | if (numChars < 0) | 227 | |
1907 | 156 | { | 228 | // Apply parser options |
1908 | 157 | theXQueryDiagnostics-> | 229 | applyLoadOptions(theLoadProperties, theFragmentStream->ctxt); |
1909 | 158 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR)); | 230 | |
1910 | 159 | 231 | // Delete the initial empty input stream | |
1911 | 160 | abortload(); | 232 | xmlFreeInputStream(inputPop(theFragmentStream->ctxt)); |
1912 | 161 | return NULL; | 233 | |
1913 | 162 | } | 234 | // Create the LibXml parser input |
1914 | 163 | else if (numChars == 0) | 235 | xmlParserInputPtr input = xmlNewInputStream(theFragmentStream->ctxt); |
1915 | 164 | { | 236 | if (input == NULL) |
1916 | 165 | theXQueryDiagnostics-> | 237 | { |
1917 | 166 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, | 238 | theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) ))); |
1918 | 167 | ERROR_PARAMS(ZED(NoInputData)))); | 239 | throw 0; // the argument to throw is not used by the catch clause |
1919 | 168 | 240 | } | |
1920 | 169 | abortload(); | 241 | |
1921 | 170 | return NULL; | 242 | // Initialize the parser input (only filename and the pointer to the current char) |
1922 | 171 | } | 243 | theFragmentStream->theBuffer[0] = ' '; // This assignment is needed for LibXml2-2.7.6, which tries to read the buffer when xmlPushInput() is called |
1923 | 172 | } | 244 | input->cur = (xmlChar*)(theFragmentStream->theBuffer); |
1924 | 173 | 245 | input->filename = (const char*)(xmlCanonicPath((const xmlChar*)theDocUri.c_str())); | |
1925 | 174 | // Create the LibXml parser context | 246 | xmlPushInput(theFragmentStream->ctxt, input); |
1926 | 175 | ctxt = xmlCreatePushParserCtxt(&theSaxHandler, this, NULL, 0, 0); | 247 | } |
1927 | 176 | // ctxt = xmlCreate | 248 | |
1928 | 177 | if (ctxt == NULL) | 249 | theFragmentStream->ctxt->userData = this; // the loader has changed, update the address |
1929 | 178 | { | 250 | theFragmentStream->ctxt->disableSAX = false; // xmlStopParser() sets disableSAX to true |
1930 | 179 | theXQueryDiagnostics-> | 251 | theFragmentStream->parsed_nodes_count = 0; |
1931 | 180 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 252 | theFragmentStream->forced_parser_stop = false; |
1932 | 181 | ERROR_PARAMS(ZED(ParserInitFailed)))); | 253 | |
1933 | 182 | 254 | if ( ! theFragmentStream->first_start_doc) | |
1934 | 183 | abortload(); | 255 | { |
1935 | 184 | return NULL; | 256 | theFragmentStream->ctxt->instate = XML_PARSER_CONTENT; |
1936 | 185 | } | 257 | FragmentXmlLoader::startDocument(theFragmentStream->ctxt->userData); |
1937 | 186 | 258 | } | |
1938 | 187 | // Delete the initial empty input stream | 259 | |
1939 | 188 | xmlFreeInputStream(inputPop(ctxt)); | 260 | while ( ! theFragmentStream->forced_parser_stop && fillBuffer(theFragmentStream)) |
1940 | 189 | 261 | { | |
1941 | 190 | // Create the LibXml parser input | 262 | // std::cerr << "\n==================\n--> skip_root: " << theFragmentStream->root_elements_to_skip << " current_depth: " << theFragmentStream->current_element_depth << " about to parse: [" << theFragmentStream->ctxt->input->cur << "] " << std::endl; |
1942 | 191 | xmlParserInputPtr input = xmlNewInputStream(ctxt); | 263 | |
1943 | 192 | if (input == NULL) | 264 | // This case needs to be handled here, otherwise LibXml2 will segfault |
1944 | 193 | { | 265 | if (theFragmentStream->ctxt->input->cur[0] == '<' && |
1945 | 194 | theXQueryDiagnostics-> | 266 | theFragmentStream->ctxt->input->cur[1] == '/' && |
1946 | 195 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 267 | theFragmentStream->current_element_depth == 0) |
1947 | 196 | ERROR_PARAMS(ZED(ParserInitFailed)))); | 268 | { |
1948 | 197 | 269 | theXQueryDiagnostics->add_error(theDocUri.empty() ? | |
1949 | 198 | abortload(); | 270 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ))) : |
1950 | 199 | return NULL; | 271 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ), theDocUri)) |
1951 | 200 | } | 272 | ); |
1952 | 201 | 273 | throw 0; // the argument to throw is not used by the catch clause | |
1953 | 202 | // Initialize the parser input | 274 | } |
1954 | 203 | input->filename = (const char*)(xmlCanonicPath((const xmlChar*)theDocUri.c_str())); | 275 | |
1955 | 204 | input->base = (xmlChar*)(theFragmentStream->theBuffer + theFragmentStream->current_offset); | 276 | xmlParseChunk(theFragmentStream->ctxt, (const char*)theFragmentStream->ctxt->input->cur, |
1956 | 205 | input->cur = (xmlChar*)(theFragmentStream->theBuffer + theFragmentStream->current_offset); | 277 | theFragmentStream->ctxt->input->length, 0); |
1957 | 206 | input->length = theFragmentStream->buffer_size - theFragmentStream->current_offset; | 278 | |
1958 | 207 | input->end = input->base + input->length; | 279 | if (theFragmentStream->ctxt->input->base == (xmlChar*)(theFragmentStream->theBuffer) |
1959 | 208 | xmlPushInput(ctxt, input); | 280 | && |
1960 | 209 | 281 | theFragmentStream->current_offset < getCurrentInputOffset()) | |
1961 | 210 | // Reset element_depth | 282 | theFragmentStream->current_offset = getCurrentInputOffset(); |
1962 | 211 | element_depth = 0; | 283 | |
1963 | 212 | 284 | // If we didn't get an error and we haven't moved, we might have some freestanding text. Parse it as element character data. | |
1964 | 213 | // Finally call the parser | 285 | if (theXQueryDiagnostics->errors().empty() |
1965 | 214 | if (xmlParseExtParsedEnt(ctxt)==-1) | 286 | && |
1966 | 215 | { | 287 | theFragmentStream->current_offset == 0) |
1967 | 216 | theXQueryDiagnostics-> | 288 | { |
1968 | 217 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 289 | // The input has been reset by xmlStopParser() |
1969 | 218 | ERROR_PARAMS(ZED(ParserNoCreateTree)))); | 290 | theFragmentStream->ctxt->input->base = (xmlChar*)(theFragmentStream->theBuffer); |
1970 | 219 | 291 | theFragmentStream->ctxt->input->cur = theFragmentStream->ctxt->input->base; | |
1971 | 220 | abortload(); | 292 | xmlParseCharData(theFragmentStream->ctxt, 0); |
1972 | 221 | return NULL; | 293 | } |
1973 | 222 | } | 294 | |
1974 | 295 | if ( ! theXQueryDiagnostics->errors().empty()) | ||
1975 | 296 | throw 0; // the argument to throw is not used by the catch clause | ||
1976 | 297 | } | ||
1977 | 298 | |||
1978 | 299 | // this happens when there are tags that have not been closed | ||
1979 | 300 | if (theFragmentStream->stream_is_consumed() | ||
1980 | 301 | && | ||
1981 | 302 | theFragmentStream->current_element_depth > 0) | ||
1982 | 303 | { | ||
1983 | 304 | theXQueryDiagnostics->add_error(theDocUri.empty() ? | ||
1984 | 305 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : | ||
1985 | 306 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) | ||
1986 | 307 | ); | ||
1987 | 308 | throw 0; | ||
1988 | 309 | } | ||
1989 | 310 | |||
1990 | 311 | FragmentXmlLoader::endDocument(theFragmentStream->ctxt->userData); // this would not be called otherwise | ||
1991 | 223 | } | 312 | } |
1992 | 224 | catch (...) | 313 | catch (...) |
1993 | 225 | { | 314 | { |
1994 | @@ -228,49 +317,36 @@ | |||
1995 | 228 | return NULL; | 317 | return NULL; |
1996 | 229 | } | 318 | } |
1997 | 230 | 319 | ||
1998 | 231 | bool ok = ctxt->wellFormed != 0; | ||
1999 | 232 | |||
2000 | 233 | // The doc may be well formed, but it may have other kinds of errors, e.g., unresolved ns prefixes. | 320 | // The doc may be well formed, but it may have other kinds of errors, e.g., unresolved ns prefixes. |
2001 | 234 | if (!theXQueryDiagnostics->errors().empty()) | 321 | if (!theXQueryDiagnostics->errors().empty()) |
2002 | 235 | { | 322 | { |
2003 | 236 | abortload(); | 323 | abortload(); |
2004 | 237 | return NULL; | 324 | return NULL; |
2005 | 238 | } | 325 | } |
2007 | 239 | else if (!ok ) | 326 | else if ( ! theFragmentStream->ctxt->wellFormed) |
2008 | 240 | { | 327 | { |
2021 | 241 | if (!theDocUri.empty()) | 328 | theXQueryDiagnostics->add_error(theDocUri.empty() ? |
2022 | 242 | { | 329 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : |
2023 | 243 | theXQueryDiagnostics-> | 330 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) |
2024 | 244 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 331 | ); |
2013 | 245 | ERROR_PARAMS(ZED(BadXMLDocument_2o), theDocUri))); | ||
2014 | 246 | } | ||
2015 | 247 | else | ||
2016 | 248 | { | ||
2017 | 249 | theXQueryDiagnostics-> | ||
2018 | 250 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | ||
2019 | 251 | ERROR_PARAMS(ZED(BadXMLDocument_2o)))); | ||
2020 | 252 | } | ||
2025 | 253 | abortload(); | 332 | abortload(); |
2026 | 254 | return NULL; | 333 | return NULL; |
2027 | 255 | } | 334 | } |
2029 | 256 | else if ( ctxt->lastError.code != XML_ERR_OK ) | 335 | else if (theFragmentStream->ctxt->lastError.code != XML_ERR_OK) |
2030 | 257 | { | 336 | { |
2033 | 258 | if ( ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE || | 337 | if (theFragmentStream->ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE |
2034 | 259 | ctxt->lastError.code != XML_ERR_NO_DTD ) | 338 | || |
2035 | 339 | theFragmentStream->ctxt->lastError.code != XML_ERR_NO_DTD ) | ||
2036 | 260 | { | 340 | { |
2041 | 261 | theXQueryDiagnostics-> | 341 | theXQueryDiagnostics->add_error(theDocUri.empty() ? |
2042 | 262 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 342 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : |
2043 | 263 | ERROR_PARAMS(ZED(BadXMLDocument_2o)))); | 343 | NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) |
2044 | 264 | 344 | ); | |
2045 | 265 | abortload(); | 345 | abortload(); |
2046 | 266 | return NULL; | 346 | return NULL; |
2047 | 267 | } | 347 | } |
2048 | 268 | } | 348 | } |
2049 | 269 | 349 | ||
2050 | 270 | xmlCtxtReset(ctxt); | ||
2051 | 271 | xmlFreeParserCtxt(ctxt); | ||
2052 | 272 | ctxt = NULL; | ||
2053 | 273 | |||
2054 | 274 | thePathStack.pop(); | 350 | thePathStack.pop(); |
2055 | 275 | assert(thePathStack.empty()); | 351 | assert(thePathStack.empty()); |
2056 | 276 | 352 | ||
2057 | @@ -280,23 +356,59 @@ | |||
2058 | 280 | return resultNode; | 356 | return resultNode; |
2059 | 281 | } | 357 | } |
2060 | 282 | 358 | ||
2078 | 283 | 359 | unsigned long FragmentXmlLoader::getCurrentInputOffset() const | |
2079 | 284 | void FragmentXmlLoader::checkStopParsing(void* ctx) | 360 | { |
2080 | 285 | { | 361 | unsigned long offset = theFragmentStream->ctxt->input->cur |
2081 | 286 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); | 362 | - theFragmentStream->ctxt->input->base |
2082 | 287 | ZORBA_LOADER_CHECK_ERROR(loader); | 363 | + theFragmentStream->ctxt->input->consumed; |
2083 | 288 | 364 | ||
2084 | 289 | if (loader.element_depth == 0) | 365 | return offset; |
2085 | 290 | { | 366 | } |
2086 | 291 | /* if (loader.ctxt->inputNr <= 1) | 367 | |
2087 | 292 | loader.theFragmentStream->current_offset = loader.theFragmentStream->buffer_size; | 368 | void FragmentXmlLoader::checkStopParsing(void* ctx, bool force) |
2088 | 293 | else */ | 369 | { |
2089 | 294 | loader.theFragmentStream->current_offset += (loader.ctxt->input->cur - loader.ctxt->input->base) | 370 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2090 | 295 | + loader.ctxt->input->consumed; | 371 | ZORBA_LOADER_CHECK_ERROR(loader); |
2091 | 296 | xmlStopParser(loader.ctxt); | 372 | |
2092 | 297 | } | 373 | unsigned long offset = loader.getCurrentInputOffset(); |
2093 | 298 | } | 374 | |
2094 | 299 | 375 | if (force | |
2095 | 376 | || | ||
2096 | 377 | loader.theFragmentStream->current_element_depth == 0 | ||
2097 | 378 | || | ||
2098 | 379 | (offset >= loader.theFragmentStream->bytes_in_buffer | ||
2099 | 380 | && | ||
2100 | 381 | loader.theFragmentStream->reached_eof) | ||
2101 | 382 | || | ||
2102 | 383 | (loader.theFragmentStream->current_element_depth <= loader.theFragmentStream->root_elements_to_skip | ||
2103 | 384 | && | ||
2104 | 385 | loader.theFragmentStream->parsed_nodes_count >= FragmentIStream::PARSED_NODES_BATCH_SIZE)) | ||
2105 | 386 | { | ||
2106 | 387 | loader.theFragmentStream->current_offset = offset; | ||
2107 | 388 | xmlStopParser(loader.theFragmentStream->ctxt); | ||
2108 | 389 | loader.theFragmentStream->ctxt->errNo = XML_SCHEMAV_MISC; // fake error to force stopping | ||
2109 | 390 | loader.theFragmentStream->forced_parser_stop = true; | ||
2110 | 391 | } | ||
2111 | 392 | |||
2112 | 393 | loader.theFragmentStream->parsed_nodes_count++; | ||
2113 | 394 | } | ||
2114 | 395 | |||
2115 | 396 | void FragmentXmlLoader::startDocument(void * ctx) | ||
2116 | 397 | { | ||
2117 | 398 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); | ||
2118 | 399 | ZORBA_LOADER_CHECK_ERROR(loader); | ||
2119 | 400 | FastXmlLoader::startDocument(ctx); | ||
2120 | 401 | if (loader.theFragmentStream->first_start_doc) | ||
2121 | 402 | { | ||
2122 | 403 | loader.theFragmentStream->first_start_doc = false; | ||
2123 | 404 | FragmentXmlLoader::checkStopParsing(ctx, true); | ||
2124 | 405 | } | ||
2125 | 406 | } | ||
2126 | 407 | |||
2127 | 408 | void FragmentXmlLoader::endDocument(void * ctx) | ||
2128 | 409 | { | ||
2129 | 410 | FastXmlLoader::endDocument(ctx); | ||
2130 | 411 | } | ||
2131 | 300 | 412 | ||
2132 | 301 | void FragmentXmlLoader::startElement( | 413 | void FragmentXmlLoader::startElement( |
2133 | 302 | void * ctx, | 414 | void * ctx, |
2134 | @@ -309,27 +421,34 @@ | |||
2135 | 309 | int nb_defaulted, | 421 | int nb_defaulted, |
2136 | 310 | const xmlChar ** attributes) | 422 | const xmlChar ** attributes) |
2137 | 311 | { | 423 | { |
2138 | 312 | FastXmlLoader::startElement(ctx, localname, prefix, URI, nb_namespaces, namespaces, nb_attributes, nb_defaulted, attributes); | ||
2139 | 313 | |||
2140 | 314 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); | 424 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2141 | 315 | ZORBA_LOADER_CHECK_ERROR(loader); | 425 | ZORBA_LOADER_CHECK_ERROR(loader); |
2143 | 316 | loader.element_depth++; | 426 | loader.theFragmentStream->current_element_depth++; |
2144 | 427 | if (loader.theFragmentStream->current_element_depth > loader.theFragmentStream->root_elements_to_skip) | ||
2145 | 428 | { | ||
2146 | 429 | const xmlChar** nsTab = namespaces; | ||
2147 | 430 | |||
2148 | 431 | if (loader.theFragmentStream->current_element_depth == loader.theFragmentStream->root_elements_to_skip + 1) | ||
2149 | 432 | { | ||
2150 | 433 | nsTab = loader.theFragmentStream->ctxt->nsTab; | ||
2151 | 434 | nb_namespaces = loader.theFragmentStream->ctxt->nsNr/2; | ||
2152 | 435 | } | ||
2153 | 436 | |||
2154 | 437 | FastXmlLoader::startElement(ctx, localname, prefix, URI, nb_namespaces, nsTab, nb_attributes, nb_defaulted, attributes); | ||
2155 | 438 | } | ||
2156 | 317 | } | 439 | } |
2157 | 318 | 440 | ||
2158 | 319 | |||
2159 | 320 | void FragmentXmlLoader::endElement( | 441 | void FragmentXmlLoader::endElement( |
2160 | 321 | void * ctx, | 442 | void * ctx, |
2161 | 322 | const xmlChar * localname, | 443 | const xmlChar * localname, |
2162 | 323 | const xmlChar * prefix, | 444 | const xmlChar * prefix, |
2163 | 324 | const xmlChar * URI) | 445 | const xmlChar * URI) |
2164 | 325 | { | 446 | { |
2165 | 326 | FastXmlLoader::endElement(ctx, localname, prefix, URI); | ||
2166 | 327 | |||
2167 | 328 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); | 447 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2168 | 329 | ZORBA_LOADER_CHECK_ERROR(loader); | 448 | ZORBA_LOADER_CHECK_ERROR(loader); |
2172 | 330 | 449 | if (loader.theFragmentStream->current_element_depth > loader.theFragmentStream->root_elements_to_skip) | |
2173 | 331 | loader.element_depth--; | 450 | FastXmlLoader::endElement(ctx, localname, prefix, URI); |
2174 | 332 | 451 | loader.theFragmentStream->current_element_depth--; | |
2175 | 333 | checkStopParsing(ctx); | 452 | checkStopParsing(ctx); |
2176 | 334 | } | 453 | } |
2177 | 335 | 454 | ||
2178 | @@ -338,7 +457,10 @@ | |||
2179 | 338 | const xmlChar * ch, | 457 | const xmlChar * ch, |
2180 | 339 | int len) | 458 | int len) |
2181 | 340 | { | 459 | { |
2183 | 341 | FastXmlLoader::characters(ctx, ch, len); | 460 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2184 | 461 | ZORBA_LOADER_CHECK_ERROR(loader); | ||
2185 | 462 | if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) | ||
2186 | 463 | FastXmlLoader::characters(ctx, ch, len); | ||
2187 | 342 | checkStopParsing(ctx); | 464 | checkStopParsing(ctx); |
2188 | 343 | } | 465 | } |
2189 | 344 | 466 | ||
2190 | @@ -347,7 +469,10 @@ | |||
2191 | 347 | void * ctx, | 469 | void * ctx, |
2192 | 348 | const xmlChar * value) | 470 | const xmlChar * value) |
2193 | 349 | { | 471 | { |
2195 | 350 | FastXmlLoader::comment(ctx, value); | 472 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2196 | 473 | ZORBA_LOADER_CHECK_ERROR(loader); | ||
2197 | 474 | if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) | ||
2198 | 475 | FastXmlLoader::comment(ctx, value); | ||
2199 | 351 | checkStopParsing(ctx); | 476 | checkStopParsing(ctx); |
2200 | 352 | } | 477 | } |
2201 | 353 | 478 | ||
2202 | @@ -357,7 +482,10 @@ | |||
2203 | 357 | const xmlChar * value, | 482 | const xmlChar * value, |
2204 | 358 | int len) | 483 | int len) |
2205 | 359 | { | 484 | { |
2207 | 360 | FastXmlLoader::cdataBlock(ctx, value, len); | 485 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2208 | 486 | ZORBA_LOADER_CHECK_ERROR(loader); | ||
2209 | 487 | if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) | ||
2210 | 488 | FastXmlLoader::cdataBlock(ctx, value, len); | ||
2211 | 361 | checkStopParsing(ctx); | 489 | checkStopParsing(ctx); |
2212 | 362 | } | 490 | } |
2213 | 363 | 491 | ||
2214 | @@ -367,7 +495,10 @@ | |||
2215 | 367 | const xmlChar * target, | 495 | const xmlChar * target, |
2216 | 368 | const xmlChar * data) | 496 | const xmlChar * data) |
2217 | 369 | { | 497 | { |
2219 | 370 | FastXmlLoader::processingInstruction(ctx, target, data); | 498 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2220 | 499 | ZORBA_LOADER_CHECK_ERROR(loader); | ||
2221 | 500 | if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) | ||
2222 | 501 | FastXmlLoader::processingInstruction(ctx, target, data); | ||
2223 | 371 | checkStopParsing(ctx); | 502 | checkStopParsing(ctx); |
2224 | 372 | } | 503 | } |
2225 | 373 | 504 | ||
2226 | @@ -378,14 +509,13 @@ | |||
2227 | 378 | DtdXmlLoader::DtdXmlLoader( | 509 | DtdXmlLoader::DtdXmlLoader( |
2228 | 379 | BasicItemFactory* factory, | 510 | BasicItemFactory* factory, |
2229 | 380 | XQueryDiagnostics* xqueryDiagnostics, | 511 | XQueryDiagnostics* xqueryDiagnostics, |
2232 | 381 | bool dataguide, | 512 | const store::LoadProperties& loadProperties, |
2233 | 382 | bool parseExtParsedEntity) | 513 | bool dataguide) |
2234 | 383 | : | 514 | : |
2236 | 384 | XmlLoader(factory, xqueryDiagnostics, dataguide), | 515 | XmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide), |
2237 | 385 | theTree(NULL), | 516 | theTree(NULL), |
2238 | 386 | theRootNode(NULL), | 517 | theRootNode(NULL), |
2241 | 387 | theNodeStack(2048), | 518 | theNodeStack(2048) |
2240 | 388 | theParseExtParsedEntity(parseExtParsedEntity) | ||
2242 | 389 | { | 519 | { |
2243 | 390 | theOrdPath.init(); | 520 | theOrdPath.init(); |
2244 | 391 | 521 | ||
2245 | @@ -511,10 +641,7 @@ | |||
2246 | 511 | Return the number of bytes actually read, throw an exception if any I/O | 641 | Return the number of bytes actually read, throw an exception if any I/O |
2247 | 512 | error occured. | 642 | error occured. |
2248 | 513 | ********************************************************************************/ | 643 | ********************************************************************************/ |
2253 | 514 | std::streamsize DtdXmlLoader::readPacket( | 644 | std::streamsize DtdXmlLoader::readPacket(std::istream& stream, char* buf, std::streamoff size) |
2250 | 515 | std::istream& stream, | ||
2251 | 516 | char* buf, | ||
2252 | 517 | std::streamoff size) | ||
2254 | 518 | { | 645 | { |
2255 | 519 | try | 646 | try |
2256 | 520 | { | 647 | { |
2257 | @@ -626,23 +753,26 @@ | |||
2258 | 626 | } | 753 | } |
2259 | 627 | 754 | ||
2260 | 628 | // Set the LibXml DTD validation options | 755 | // Set the LibXml DTD validation options |
2261 | 756 | /* | ||
2262 | 629 | int options = XML_PARSE_COMPACT; | 757 | int options = XML_PARSE_COMPACT; |
2263 | 630 | options |= XML_PARSE_DTDVALID; | 758 | options |= XML_PARSE_DTDVALID; |
2264 | 631 | options |= XML_PARSE_DTDLOAD; | 759 | options |= XML_PARSE_DTDLOAD; |
2265 | 760 | */ | ||
2266 | 632 | //options |= XML_PARSE_SAX1; | 761 | //options |= XML_PARSE_SAX1; |
2267 | 633 | //xmlSAXDefaultVersion(1); | 762 | //xmlSAXDefaultVersion(1); |
2268 | 634 | 763 | ||
2269 | 764 | // xmlCtxtUseOptions(ctxt, options); | ||
2270 | 765 | |||
2271 | 635 | xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; | 766 | xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; |
2272 | 636 | xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; | 767 | xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; |
2273 | 637 | 768 | ||
2275 | 638 | xmlCtxtUseOptions(ctxt, options); | 769 | // Apply loader options |
2276 | 770 | applyLoadOptions(theLoadProperties, ctxt); | ||
2277 | 639 | 771 | ||
2278 | 640 | if ( xmlParseDocument(ctxt)==-1 ) | 772 | if ( xmlParseDocument(ctxt)==-1 ) |
2279 | 641 | { | 773 | { |
2280 | 642 | // std::cout << " xmlParseDocument: Error: Unable to create tree: " << ctxt->lastError.message << std::endl; | 774 | // std::cout << " xmlParseDocument: Error: Unable to create tree: " << ctxt->lastError.message << std::endl; |
2284 | 643 | theXQueryDiagnostics-> | 775 | theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,ERROR_PARAMS( ZED( ParserNoCreateTree ) ))); |
2282 | 644 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | ||
2283 | 645 | ERROR_PARAMS(ZED(ParserNoCreateTree)))); | ||
2285 | 646 | abortload(); | 776 | abortload(); |
2286 | 647 | return NULL; | 777 | return NULL; |
2287 | 648 | } | 778 | } |
2288 | @@ -667,15 +797,21 @@ | |||
2289 | 667 | { | 797 | { |
2290 | 668 | if (!theDocUri.empty()) | 798 | if (!theDocUri.empty()) |
2291 | 669 | { | 799 | { |
2295 | 670 | theXQueryDiagnostics-> | 800 | theXQueryDiagnostics->add_error( |
2296 | 671 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 801 | NEW_ZORBA_EXCEPTION( |
2297 | 672 | ERROR_PARAMS(ZED(BadXMLDocument_2o), theDocUri))); | 802 | zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2298 | 803 | ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri ) | ||
2299 | 804 | ) | ||
2300 | 805 | ); | ||
2301 | 673 | } | 806 | } |
2302 | 674 | else | 807 | else |
2303 | 675 | { | 808 | { |
2307 | 676 | theXQueryDiagnostics-> | 809 | theXQueryDiagnostics->add_error( |
2308 | 677 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 810 | NEW_ZORBA_EXCEPTION( |
2309 | 678 | ERROR_PARAMS(ZED(BadXMLDocument_2o)))); | 811 | zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2310 | 812 | ERROR_PARAMS( ZED( BadXMLDocument_2o ) ) | ||
2311 | 813 | ) | ||
2312 | 814 | ); | ||
2313 | 679 | } | 815 | } |
2314 | 680 | 816 | ||
2315 | 681 | abortload(); | 817 | abortload(); |
2316 | @@ -691,9 +827,12 @@ | |||
2317 | 691 | if ( ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE || | 827 | if ( ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE || |
2318 | 692 | ctxt->lastError.code != XML_ERR_NO_DTD ) | 828 | ctxt->lastError.code != XML_ERR_NO_DTD ) |
2319 | 693 | { | 829 | { |
2323 | 694 | theXQueryDiagnostics-> | 830 | theXQueryDiagnostics->add_error( |
2324 | 695 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 831 | NEW_ZORBA_EXCEPTION( |
2325 | 696 | ERROR_PARAMS(ZED(BadXMLDocument_2o)))); | 832 | zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2326 | 833 | ERROR_PARAMS( ZED( BadXMLDocument_2o ) ) | ||
2327 | 834 | ) | ||
2328 | 835 | ); | ||
2329 | 697 | abortload(); | 836 | abortload(); |
2330 | 698 | return NULL; | 837 | return NULL; |
2331 | 699 | 838 | ||
2332 | @@ -704,10 +843,12 @@ | |||
2333 | 704 | xmlDoc *doc = ctxt->myDoc; | 843 | xmlDoc *doc = ctxt->myDoc; |
2334 | 705 | if (doc == NULL) | 844 | if (doc == NULL) |
2335 | 706 | { | 845 | { |
2340 | 707 | theXQueryDiagnostics-> | 846 | theXQueryDiagnostics->add_error( |
2341 | 708 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, | 847 | NEW_ZORBA_EXCEPTION( |
2342 | 709 | ERROR_PARAMS(ZED(ParserNoCreateTree)))); | 848 | zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2343 | 710 | 849 | ERROR_PARAMS( ZED( ParserNoCreateTree ) ) | |
2344 | 850 | ) | ||
2345 | 851 | ); | ||
2346 | 711 | abortload(); | 852 | abortload(); |
2347 | 712 | return NULL; | 853 | return NULL; |
2348 | 713 | } | 854 | } |
2349 | @@ -859,8 +1000,9 @@ | |||
2350 | 859 | } | 1000 | } |
2351 | 860 | catch (...) | 1001 | catch (...) |
2352 | 861 | { | 1002 | { |
2355 | 862 | loader.theXQueryDiagnostics-> | 1003 | loader.theXQueryDiagnostics->add_error( |
2356 | 863 | add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR)); | 1004 | NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR ) |
2357 | 1005 | ); | ||
2358 | 864 | } | 1006 | } |
2359 | 865 | } | 1007 | } |
2360 | 866 | 1008 | ||
2361 | 867 | 1009 | ||
2362 | === modified file 'src/store/naive/loader_fast.cpp' | |||
2363 | --- src/store/naive/loader_fast.cpp 2012-02-15 10:25:02 +0000 | |||
2364 | +++ src/store/naive/loader_fast.cpp 2012-02-23 17:28:26 +0000 | |||
2365 | @@ -76,9 +76,10 @@ | |||
2366 | 76 | FastXmlLoader::FastXmlLoader( | 76 | FastXmlLoader::FastXmlLoader( |
2367 | 77 | BasicItemFactory* factory, | 77 | BasicItemFactory* factory, |
2368 | 78 | XQueryDiagnostics* xqueryDiagnostics, | 78 | XQueryDiagnostics* xqueryDiagnostics, |
2369 | 79 | const store::LoadProperties& loadProperties, | ||
2370 | 79 | bool dataguide) | 80 | bool dataguide) |
2371 | 80 | : | 81 | : |
2373 | 81 | XmlLoader(factory, xqueryDiagnostics, dataguide), | 82 | XmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide), |
2374 | 82 | theTree(NULL), | 83 | theTree(NULL), |
2375 | 83 | theRootNode(NULL), | 84 | theRootNode(NULL), |
2376 | 84 | theNodeStack(2048) | 85 | theNodeStack(2048) |
2377 | @@ -298,6 +299,9 @@ | |||
2378 | 298 | static_cast<int>(numChars), | 299 | static_cast<int>(numChars), |
2379 | 299 | docUri.c_str()); | 300 | docUri.c_str()); |
2380 | 300 | 301 | ||
2381 | 302 | // Apply loader options | ||
2382 | 303 | applyLoadOptions(theLoadProperties, ctxt); | ||
2383 | 304 | |||
2384 | 301 | if (ctxt == NULL) | 305 | if (ctxt == NULL) |
2385 | 302 | { | 306 | { |
2386 | 303 | theXQueryDiagnostics-> | 307 | theXQueryDiagnostics-> |
2387 | 304 | 308 | ||
2388 | === modified file 'src/store/naive/simple_store.cpp' | |||
2389 | --- src/store/naive/simple_store.cpp 2012-02-15 10:25:02 +0000 | |||
2390 | +++ src/store/naive/simple_store.cpp 2012-02-23 17:28:26 +0000 | |||
2391 | @@ -350,7 +350,7 @@ | |||
2392 | 350 | std::cerr << "Reference: " << (*iter).second | 350 | std::cerr << "Reference: " << (*iter).second |
2393 | 351 | << "is still in the nodes to references map" << std::endl; | 351 | << "is still in the nodes to references map" << std::endl; |
2394 | 352 | } | 352 | } |
2396 | 353 | ZORBA_FATAL(0, theNodeToReferencesMap.size() + | 353 | ZORBA_FATAL(0, theNodeToReferencesMap.size() + |
2397 | 354 | " node references still in the nodes to references map"); | 354 | " node references still in the nodes to references map"); |
2398 | 355 | } | 355 | } |
2399 | 356 | 356 | ||
2400 | @@ -360,7 +360,7 @@ | |||
2401 | 360 | RefNodeMap::iterator end = theReferencesToNodeMap.end(); | 360 | RefNodeMap::iterator end = theReferencesToNodeMap.end(); |
2402 | 361 | for (; iter != end; ++iter) | 361 | for (; iter != end; ++iter) |
2403 | 362 | { | 362 | { |
2405 | 363 | std::cerr << "Reference: " << (*iter).first | 363 | std::cerr << "Reference: " << (*iter).first |
2406 | 364 | << "is still in the references to nodes map" << std::endl; | 364 | << "is still in the references to nodes map" << std::endl; |
2407 | 365 | } | 365 | } |
2408 | 366 | ZORBA_FATAL(0, theReferencesToNodeMap.size() + | 366 | ZORBA_FATAL(0, theReferencesToNodeMap.size() + |
2409 | @@ -486,18 +486,20 @@ | |||
2410 | 486 | XmlLoader* SimpleStore::getXmlLoader(XQueryDiagnostics* aXQueryDiagnostics, | 486 | XmlLoader* SimpleStore::getXmlLoader(XQueryDiagnostics* aXQueryDiagnostics, |
2411 | 487 | const store::LoadProperties& loadProperties) | 487 | const store::LoadProperties& loadProperties) |
2412 | 488 | { | 488 | { |
2414 | 489 | if (loadProperties.getEnableExtParsedEntity()) | 489 | if (loadProperties.getParseExternalParsedEntity()) |
2415 | 490 | return new FragmentXmlLoader(theItemFactory, | 490 | return new FragmentXmlLoader(theItemFactory, |
2416 | 491 | aXQueryDiagnostics, | 491 | aXQueryDiagnostics, |
2417 | 492 | loadProperties, | ||
2418 | 492 | store::Properties::instance()->buildDataguide()); | 493 | store::Properties::instance()->buildDataguide()); |
2420 | 493 | else if (loadProperties.getEnableDtd()) | 494 | else if (loadProperties.getDTDValidate()) |
2421 | 494 | return new DtdXmlLoader(theItemFactory, | 495 | return new DtdXmlLoader(theItemFactory, |
2422 | 495 | aXQueryDiagnostics, | 496 | aXQueryDiagnostics, |
2425 | 496 | store::Properties::instance()->buildDataguide(), | 497 | loadProperties, |
2426 | 497 | loadProperties.getEnableExtParsedEntity()); | 498 | store::Properties::instance()->buildDataguide()); |
2427 | 498 | else | 499 | else |
2428 | 499 | return new FastXmlLoader(theItemFactory, | 500 | return new FastXmlLoader(theItemFactory, |
2429 | 500 | aXQueryDiagnostics, | 501 | aXQueryDiagnostics, |
2430 | 502 | loadProperties, | ||
2431 | 501 | store::Properties::instance()->buildDataguide()); | 503 | store::Properties::instance()->buildDataguide()); |
2432 | 502 | } | 504 | } |
2433 | 503 | 505 | ||
2434 | @@ -983,7 +985,7 @@ | |||
2435 | 983 | return NULL; | 985 | return NULL; |
2436 | 984 | 986 | ||
2437 | 985 | store::Collection_t collection; | 987 | store::Collection_t collection; |
2439 | 986 | if (theCollections->get(aName, collection, aDynamicCollection)) | 988 | if (theCollections->get(aName, collection, aDynamicCollection)) |
2440 | 987 | { | 989 | { |
2441 | 988 | return collection; | 990 | return collection; |
2442 | 989 | } | 991 | } |
2443 | @@ -1311,7 +1313,7 @@ | |||
2444 | 1311 | Computes the Structural Reference for the given node. | 1313 | Computes the Structural Reference for the given node. |
2445 | 1312 | ********************************************************************************/ | 1314 | ********************************************************************************/ |
2446 | 1313 | bool SimpleStore::getStructuralInformation( | 1315 | bool SimpleStore::getStructuralInformation( |
2448 | 1314 | store::Item_t& result, | 1316 | store::Item_t& result, |
2449 | 1315 | const store::Item* node) | 1317 | const store::Item* node) |
2450 | 1316 | { | 1318 | { |
2451 | 1317 | #ifdef TEXT_ORDPATH | 1319 | #ifdef TEXT_ORDPATH |
2452 | @@ -1351,7 +1353,7 @@ | |||
2453 | 1351 | 1353 | ||
2454 | 1352 | /******************************************************************************* | 1354 | /******************************************************************************* |
2455 | 1353 | Computes the reference of the given node. | 1355 | Computes the reference of the given node. |
2457 | 1354 | 1356 | ||
2458 | 1355 | @param node XDM node | 1357 | @param node XDM node |
2459 | 1356 | @return the identifier as an item of type xs:anyURI | 1358 | @return the identifier as an item of type xs:anyURI |
2460 | 1357 | ********************************************************************************/ | 1359 | ********************************************************************************/ |
2461 | @@ -1384,7 +1386,7 @@ | |||
2462 | 1384 | 1386 | ||
2463 | 1385 | /******************************************************************************* | 1387 | /******************************************************************************* |
2464 | 1386 | Returns the node which is identified by the given reference. | 1388 | Returns the node which is identified by the given reference. |
2466 | 1387 | 1389 | ||
2467 | 1388 | @param reference an xs:anyURI item | 1390 | @param reference an xs:anyURI item |
2468 | 1389 | @result the node identified by the reference, or NULL if no node with the given | 1391 | @result the node identified by the reference, or NULL if no node with the given |
2469 | 1390 | reference exists | 1392 | reference exists |
2470 | @@ -1413,7 +1415,7 @@ | |||
2471 | 1413 | 1415 | ||
2472 | 1414 | /******************************************************************************* | 1416 | /******************************************************************************* |
2473 | 1415 | Returns whether a reference has already been generated for the given node. | 1417 | Returns whether a reference has already been generated for the given node. |
2475 | 1416 | 1418 | ||
2476 | 1417 | @param item XDM node | 1419 | @param item XDM node |
2477 | 1418 | @return whether a reference has already been generated for the given node. | 1420 | @return whether a reference has already been generated for the given node. |
2478 | 1419 | ********************************************************************************/ | 1421 | ********************************************************************************/ |
2479 | @@ -1425,7 +1427,7 @@ | |||
2480 | 1425 | 1427 | ||
2481 | 1426 | /******************************************************************************* | 1428 | /******************************************************************************* |
2482 | 1427 | Removes a node from the reference-to-nodes and nodes-to-references maps. | 1429 | Removes a node from the reference-to-nodes and nodes-to-references maps. |
2484 | 1428 | 1430 | ||
2485 | 1429 | @param node XDM node | 1431 | @param node XDM node |
2486 | 1430 | @return whether the node was registered or not. | 1432 | @return whether the node was registered or not. |
2487 | 1431 | ********************************************************************************/ | 1433 | ********************************************************************************/ |
2488 | 1432 | 1434 | ||
2489 | === modified file 'src/types/typeimpl.cpp' | |||
2490 | --- src/types/typeimpl.cpp 2012-01-10 10:52:15 +0000 | |||
2491 | +++ src/types/typeimpl.cpp 2012-02-23 17:28:26 +0000 | |||
2492 | @@ -361,7 +361,7 @@ | |||
2493 | 361 | 361 | ||
2494 | 362 | 362 | ||
2495 | 363 | bool NodeXQType::is_subtype( | 363 | bool NodeXQType::is_subtype( |
2497 | 364 | const TypeManager* tm, | 364 | const TypeManager* tm, |
2498 | 365 | const NodeXQType& supertype, | 365 | const NodeXQType& supertype, |
2499 | 366 | const QueryLoc& loc) const | 366 | const QueryLoc& loc) const |
2500 | 367 | { | 367 | { |
2501 | @@ -443,7 +443,7 @@ | |||
2502 | 443 | 443 | ||
2503 | 444 | 444 | ||
2504 | 445 | bool NodeXQType::is_supertype( | 445 | bool NodeXQType::is_supertype( |
2506 | 446 | const TypeManager* tm, | 446 | const TypeManager* tm, |
2507 | 447 | const store::Item* subitem, | 447 | const store::Item* subitem, |
2508 | 448 | const QueryLoc& loc) const | 448 | const QueryLoc& loc) const |
2509 | 449 | { | 449 | { |
2510 | @@ -488,14 +488,30 @@ | |||
2511 | 488 | } | 488 | } |
2512 | 489 | } | 489 | } |
2513 | 490 | 490 | ||
2516 | 491 | if (m_node_kind != store::StoreConsts::elementNode && | 491 | // document-node( E ) matches any document node that contains exactly one element |
2517 | 492 | m_node_kind != store::StoreConsts::attributeNode) | 492 | // node, optionally accompanied by one or more comment and processing instruction |
2518 | 493 | // nodes, if E is an ElementTest or SchemaElementTest that matches the element node. | ||
2519 | 494 | bool is_element_test = ( | ||
2520 | 495 | m_node_kind == store::StoreConsts::documentNode && | ||
2521 | 496 | m_content_type != NULL && | ||
2522 | 497 | m_content_type->type_kind() == XQType::NODE_TYPE_KIND && | ||
2523 | 498 | dynamic_cast<const NodeXQType*>(m_content_type.getp())->m_schema_test == false); | ||
2524 | 499 | |||
2525 | 500 | if (m_node_kind != store::StoreConsts::elementNode && | ||
2526 | 501 | m_node_kind != store::StoreConsts::attributeNode && | ||
2527 | 502 | !is_element_test) | ||
2528 | 493 | return true; | 503 | return true; |
2529 | 494 | 504 | ||
2530 | 495 | if (m_content_type == NULL || | 505 | if (m_content_type == NULL || |
2531 | 496 | m_content_type->type_kind() == XQType::ANY_TYPE_KIND) | 506 | m_content_type->type_kind() == XQType::ANY_TYPE_KIND) |
2532 | 497 | return true; | 507 | return true; |
2533 | 498 | 508 | ||
2534 | 509 | if (is_element_test) | ||
2535 | 510 | { | ||
2536 | 511 | xqtref_t documentNodeType = tm->create_value_type(subitem, loc); | ||
2537 | 512 | return TypeOps::is_subtype(tm, *documentNodeType, *this); | ||
2538 | 513 | } | ||
2539 | 514 | |||
2540 | 499 | xqtref_t subContentType = tm->create_named_type(subitem->getType(), | 515 | xqtref_t subContentType = tm->create_named_type(subitem->getType(), |
2541 | 500 | TypeConstants::QUANT_ONE, | 516 | TypeConstants::QUANT_ONE, |
2542 | 501 | loc, | 517 | loc, |
2543 | 502 | 518 | ||
2544 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xml.res' | |||
2545 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xml.res 1970-01-01 00:00:00 +0000 | |||
2546 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xml.res 2012-02-23 17:28:26 +0000 | |||
2547 | @@ -0,0 +1,2 @@ | |||
2548 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2549 | 2 | <from1>Jani</from1> | ||
2550 | 0 | \ No newline at end of file | 3 | \ No newline at end of file |
2551 | 1 | 4 | ||
2552 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xml.res' | |||
2553 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xml.res 1970-01-01 00:00:00 +0000 | |||
2554 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xml.res 2012-02-23 17:28:26 +0000 | |||
2555 | @@ -0,0 +1,6 @@ | |||
2556 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2557 | 2 | |||
2558 | 3 | <from1>Jani1</from1> | ||
2559 | 4 | <from2>Jani2</from2> | ||
2560 | 5 | <from3>Jani3</from3> | ||
2561 | 6 | |||
2562 | 0 | 7 | ||
2563 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xml.res' | |||
2564 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xml.res 1970-01-01 00:00:00 +0000 | |||
2565 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xml.res 2012-02-23 17:28:26 +0000 | |||
2566 | @@ -0,0 +1,2 @@ | |||
2567 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2568 | 2 | Jani1Jani2Jani3 | ||
2569 | 0 | 3 | ||
2570 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xml.res' | |||
2571 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xml.res 1970-01-01 00:00:00 +0000 | |||
2572 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xml.res 2012-02-23 17:28:26 +0000 | |||
2573 | @@ -0,0 +1,12 @@ | |||
2574 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2575 | 2 | <root> | ||
2576 | 3 | <root2> | ||
2577 | 4 | <from1>Jani1</from1> | ||
2578 | 5 | </root2> | ||
2579 | 6 | <root2> | ||
2580 | 7 | <from2>Jani2</from2> | ||
2581 | 8 | </root2> | ||
2582 | 9 | <root2> | ||
2583 | 10 | <from3>Jani3</from3> | ||
2584 | 11 | </root2> | ||
2585 | 12 | </root> | ||
2586 | 0 | 13 | ||
2587 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xml.res' | |||
2588 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xml.res 1970-01-01 00:00:00 +0000 | |||
2589 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xml.res 2012-02-23 17:28:26 +0000 | |||
2590 | @@ -0,0 +1,12 @@ | |||
2591 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2592 | 2 | |||
2593 | 3 | <root2> | ||
2594 | 4 | <from1>Jani1</from1> | ||
2595 | 5 | </root2> | ||
2596 | 6 | <root2> | ||
2597 | 7 | <from2>Jani2</from2> | ||
2598 | 8 | </root2> | ||
2599 | 9 | <root2> | ||
2600 | 10 | <from3>Jani3</from3> | ||
2601 | 11 | </root2> | ||
2602 | 12 | |||
2603 | 0 | 13 | ||
2604 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xml.res' | |||
2605 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xml.res 1970-01-01 00:00:00 +0000 | |||
2606 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xml.res 2012-02-23 17:28:26 +0000 | |||
2607 | @@ -0,0 +1,8 @@ | |||
2608 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2609 | 2 | |||
2610 | 3 | <from1>Jani1</from1> | ||
2611 | 4 | |||
2612 | 5 | <from2>Jani2</from2> | ||
2613 | 6 | |||
2614 | 7 | <from3>Jani3</from3> | ||
2615 | 8 | |||
2616 | 0 | 9 | ||
2617 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xml.res' | |||
2618 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xml.res 1970-01-01 00:00:00 +0000 | |||
2619 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xml.res 2012-02-23 17:28:26 +0000 | |||
2620 | @@ -0,0 +1,2 @@ | |||
2621 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2622 | 2 | Jani1Jani2Jani3 | ||
2623 | 0 | 3 | ||
2624 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xml.res' | |||
2625 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xml.res 1970-01-01 00:00:00 +0000 | |||
2626 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xml.res 2012-02-23 17:28:26 +0000 | |||
2627 | @@ -0,0 +1,2 @@ | |||
2628 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2629 | 2 | <root><from1>Jani1</from1></root> | ||
2630 | 0 | 3 | ||
2631 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xml.res' | |||
2632 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xml.res 1970-01-01 00:00:00 +0000 | |||
2633 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xml.res 2012-02-23 17:28:26 +0000 | |||
2634 | @@ -0,0 +1,2 @@ | |||
2635 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2636 | 2 | <from1>Jani1</from1> | ||
2637 | 0 | 3 | ||
2638 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xml.res' | |||
2639 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xml.res 1970-01-01 00:00:00 +0000 | |||
2640 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xml.res 2012-02-23 17:28:26 +0000 | |||
2641 | @@ -0,0 +1,2 @@ | |||
2642 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2643 | 2 | Jani1 | ||
2644 | 0 | 3 | ||
2645 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xml.res' | |||
2646 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xml.res 1970-01-01 00:00:00 +0000 | |||
2647 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xml.res 2012-02-23 17:28:26 +0000 | |||
2648 | @@ -0,0 +1,2 @@ | |||
2649 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2650 | 2 | |||
2651 | 0 | 3 | ||
2652 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xml.res' | |||
2653 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xml.res 1970-01-01 00:00:00 +0000 | |||
2654 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xml.res 2012-02-23 17:28:26 +0000 | |||
2655 | @@ -0,0 +1,2 @@ | |||
2656 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2657 | 2 | Jani1 | ||
2658 | 0 | 3 | ||
2659 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xml.res' | |||
2660 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xml.res 1970-01-01 00:00:00 +0000 | |||
2661 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xml.res 2012-02-23 17:28:26 +0000 | |||
2662 | @@ -0,0 +1,2 @@ | |||
2663 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2664 | 2 | <from1>Jani1</from1> | ||
2665 | 0 | 3 | ||
2666 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xml.res' | |||
2667 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xml.res 1970-01-01 00:00:00 +0000 | |||
2668 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xml.res 2012-02-23 17:28:26 +0000 | |||
2669 | @@ -0,0 +1,2 @@ | |||
2670 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2671 | 2 | Jani1 | ||
2672 | 0 | 3 | ||
2673 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xml.res' | |||
2674 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xml.res 1970-01-01 00:00:00 +0000 | |||
2675 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xml.res 2012-02-23 17:28:26 +0000 | |||
2676 | @@ -0,0 +1,2 @@ | |||
2677 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2678 | 2 | Jani1 | ||
2679 | 0 | 3 | ||
2680 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xml.res' | |||
2681 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xml.res 1970-01-01 00:00:00 +0000 | |||
2682 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xml.res 2012-02-23 17:28:26 +0000 | |||
2683 | @@ -0,0 +1,2 @@ | |||
2684 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2685 | 2 | Jani1 | ||
2686 | 0 | 3 | ||
2687 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xml.res' | |||
2688 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xml.res 1970-01-01 00:00:00 +0000 | |||
2689 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xml.res 2012-02-23 17:28:26 +0000 | |||
2690 | @@ -0,0 +1,2 @@ | |||
2691 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2692 | 2 | root3 text<from1>Jani1</from1> | ||
2693 | 0 | 3 | ||
2694 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xml.res' | |||
2695 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xml.res 1970-01-01 00:00:00 +0000 | |||
2696 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xml.res 2012-02-23 17:28:26 +0000 | |||
2697 | @@ -0,0 +1,2 @@ | |||
2698 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2699 | 2 | Jani1 | ||
2700 | 0 | 3 | ||
2701 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xml.res' | |||
2702 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xml.res 1970-01-01 00:00:00 +0000 | |||
2703 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xml.res 2012-02-23 17:28:26 +0000 | |||
2704 | @@ -0,0 +1,8 @@ | |||
2705 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2706 | 2 | <level1> | ||
2707 | 3 | <level2> | ||
2708 | 4 | <level3> | ||
2709 | 5 | <level4>level4 text</level4> | ||
2710 | 6 | </level3> | ||
2711 | 7 | </level2> | ||
2712 | 8 | </level1> | ||
2713 | 0 | 9 | ||
2714 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xml.res' | |||
2715 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xml.res 1970-01-01 00:00:00 +0000 | |||
2716 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xml.res 2012-02-23 17:28:26 +0000 | |||
2717 | @@ -0,0 +1,8 @@ | |||
2718 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2719 | 2 | |||
2720 | 3 | <level2> | ||
2721 | 4 | <level3> | ||
2722 | 5 | <level4>level4 text</level4> | ||
2723 | 6 | </level3> | ||
2724 | 7 | </level2> | ||
2725 | 8 | |||
2726 | 0 | 9 | ||
2727 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xml.res' | |||
2728 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xml.res 1970-01-01 00:00:00 +0000 | |||
2729 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xml.res 2012-02-23 17:28:26 +0000 | |||
2730 | @@ -0,0 +1,6 @@ | |||
2731 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2732 | 2 | |||
2733 | 3 | <level3> | ||
2734 | 4 | <level4>level4 text</level4> | ||
2735 | 5 | </level3> | ||
2736 | 6 | |||
2737 | 0 | 7 | ||
2738 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xml.res' | |||
2739 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xml.res 1970-01-01 00:00:00 +0000 | |||
2740 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xml.res 2012-02-23 17:28:26 +0000 | |||
2741 | @@ -0,0 +1,4 @@ | |||
2742 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2743 | 2 | |||
2744 | 3 | <level4>level4 text</level4> | ||
2745 | 4 | |||
2746 | 0 | 5 | ||
2747 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xml.res' | |||
2748 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xml.res 1970-01-01 00:00:00 +0000 | |||
2749 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xml.res 2012-02-23 17:28:26 +0000 | |||
2750 | @@ -0,0 +1,2 @@ | |||
2751 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2752 | 2 | level4 text | ||
2753 | 0 | 3 | ||
2754 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xml.res' | |||
2755 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xml.res 1970-01-01 00:00:00 +0000 | |||
2756 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xml.res 2012-02-23 17:28:26 +0000 | |||
2757 | @@ -0,0 +1,5 @@ | |||
2758 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2759 | 2 | |||
2760 | 3 | <level4>level4 text</level4> | ||
2761 | 4 | level3 end | ||
2762 | 5 | |||
2763 | 0 | 6 | ||
2764 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xml.res' | |||
2765 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xml.res 1970-01-01 00:00:00 +0000 | |||
2766 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xml.res 2012-02-23 17:28:26 +0000 | |||
2767 | @@ -0,0 +1,14 @@ | |||
2768 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2769 | 2 | <level1> | ||
2770 | 3 | level1 text start | ||
2771 | 4 | <level2> | ||
2772 | 5 | level2 text start | ||
2773 | 6 | <level3> | ||
2774 | 7 | level3 text start | ||
2775 | 8 | <level4>level4 text</level4> | ||
2776 | 9 | level3 text end | ||
2777 | 10 | </level3> | ||
2778 | 11 | level2 text end | ||
2779 | 12 | </level2> | ||
2780 | 13 | level1 text end | ||
2781 | 14 | </level1> | ||
2782 | 0 | 15 | ||
2783 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xml.res' | |||
2784 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xml.res 1970-01-01 00:00:00 +0000 | |||
2785 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xml.res 2012-02-23 17:28:26 +0000 | |||
2786 | @@ -0,0 +1,14 @@ | |||
2787 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2788 | 2 | |||
2789 | 3 | level1 text start | ||
2790 | 4 | <level2> | ||
2791 | 5 | level2 text start | ||
2792 | 6 | <level3> | ||
2793 | 7 | level3 text start | ||
2794 | 8 | <level4>level4 text</level4> | ||
2795 | 9 | level3 text end | ||
2796 | 10 | </level3> | ||
2797 | 11 | level2 text end | ||
2798 | 12 | </level2> | ||
2799 | 13 | level1 text end | ||
2800 | 14 | |||
2801 | 0 | 15 | ||
2802 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xml.res' | |||
2803 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xml.res 1970-01-01 00:00:00 +0000 | |||
2804 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xml.res 2012-02-23 17:28:26 +0000 | |||
2805 | @@ -0,0 +1,10 @@ | |||
2806 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2807 | 2 | |||
2808 | 3 | level2 text start | ||
2809 | 4 | <level3> | ||
2810 | 5 | level3 text start | ||
2811 | 6 | <level4>level4 text</level4> | ||
2812 | 7 | level3 text end | ||
2813 | 8 | </level3> | ||
2814 | 9 | level2 text end | ||
2815 | 10 | |||
2816 | 0 | 11 | ||
2817 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xml.res' | |||
2818 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xml.res 1970-01-01 00:00:00 +0000 | |||
2819 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xml.res 2012-02-23 17:28:26 +0000 | |||
2820 | @@ -0,0 +1,6 @@ | |||
2821 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2822 | 2 | |||
2823 | 3 | level3 text start | ||
2824 | 4 | <level4>level4 text</level4> | ||
2825 | 5 | level3 text end | ||
2826 | 6 | |||
2827 | 0 | 7 | ||
2828 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xml.res' | |||
2829 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xml.res 1970-01-01 00:00:00 +0000 | |||
2830 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xml.res 2012-02-23 17:28:26 +0000 | |||
2831 | @@ -0,0 +1,2 @@ | |||
2832 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2833 | 2 | level4 text | ||
2834 | 0 | 3 | ||
2835 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xml.res' | |||
2836 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xml.res 1970-01-01 00:00:00 +0000 | |||
2837 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xml.res 2012-02-23 17:28:26 +0000 | |||
2838 | @@ -0,0 +1,2 @@ | |||
2839 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2840 | 2 | |||
2841 | 0 | 3 | ||
2842 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xml.res' | |||
2843 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xml.res 1970-01-01 00:00:00 +0000 | |||
2844 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xml.res 2012-02-23 17:28:26 +0000 | |||
2845 | @@ -0,0 +1,59 @@ | |||
2846 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2847 | 2 | |||
2848 | 3 | level0 text | ||
2849 | 4 | <level1> | ||
2850 | 5 | level1 text start | ||
2851 | 6 | <level2> | ||
2852 | 7 | level2 text start | ||
2853 | 8 | <level3> | ||
2854 | 9 | level3 text start | ||
2855 | 10 | <level4>level4 text</level4> | ||
2856 | 11 | level3 text end | ||
2857 | 12 | </level3> | ||
2858 | 13 | level2 text end | ||
2859 | 14 | </level2> | ||
2860 | 15 | level1 text end | ||
2861 | 16 | </level1> | ||
2862 | 17 | level0 text | ||
2863 | 18 | <level1> | ||
2864 | 19 | level1 text start | ||
2865 | 20 | <level2> | ||
2866 | 21 | level2 text start | ||
2867 | 22 | <level3> | ||
2868 | 23 | level3 text start | ||
2869 | 24 | <level4>level4 text</level4> | ||
2870 | 25 | level3 text end | ||
2871 | 26 | </level3> | ||
2872 | 27 | level2 text end | ||
2873 | 28 | </level2> | ||
2874 | 29 | level1 text end | ||
2875 | 30 | </level1> | ||
2876 | 31 | level0 text | ||
2877 | 32 | <level1> | ||
2878 | 33 | level1 text start | ||
2879 | 34 | <level2> | ||
2880 | 35 | level2 text start | ||
2881 | 36 | <level3> | ||
2882 | 37 | level3 text start | ||
2883 | 38 | <level4>level4 text</level4> | ||
2884 | 39 | level3 text end | ||
2885 | 40 | </level3> | ||
2886 | 41 | level2 text end | ||
2887 | 42 | </level2> | ||
2888 | 43 | level1 text end | ||
2889 | 44 | </level1> | ||
2890 | 45 | level0 text | ||
2891 | 46 | <level1> | ||
2892 | 47 | level1 text start | ||
2893 | 48 | <level2> | ||
2894 | 49 | level2 text start | ||
2895 | 50 | <level3> | ||
2896 | 51 | level3 text start | ||
2897 | 52 | <level4>level4 text</level4> | ||
2898 | 53 | level3 text end | ||
2899 | 54 | </level3> | ||
2900 | 55 | level2 text end | ||
2901 | 56 | </level2> | ||
2902 | 57 | level1 text end | ||
2903 | 58 | </level1> | ||
2904 | 59 | level0 text | ||
2905 | 0 | 60 | ||
2906 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xml.res' | |||
2907 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xml.res 1970-01-01 00:00:00 +0000 | |||
2908 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xml.res 2012-02-23 17:28:26 +0000 | |||
2909 | @@ -0,0 +1,50 @@ | |||
2910 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2911 | 2 | |||
2912 | 3 | level1 text start | ||
2913 | 4 | <level2> | ||
2914 | 5 | level2 text start | ||
2915 | 6 | <level3> | ||
2916 | 7 | level3 text start | ||
2917 | 8 | <level4>level4 text</level4> | ||
2918 | 9 | level3 text end | ||
2919 | 10 | </level3> | ||
2920 | 11 | level2 text end | ||
2921 | 12 | </level2> | ||
2922 | 13 | level1 text end | ||
2923 | 14 | |||
2924 | 15 | level1 text start | ||
2925 | 16 | <level2> | ||
2926 | 17 | level2 text start | ||
2927 | 18 | <level3> | ||
2928 | 19 | level3 text start | ||
2929 | 20 | <level4>level4 text</level4> | ||
2930 | 21 | level3 text end | ||
2931 | 22 | </level3> | ||
2932 | 23 | level2 text end | ||
2933 | 24 | </level2> | ||
2934 | 25 | level1 text end | ||
2935 | 26 | |||
2936 | 27 | level1 text start | ||
2937 | 28 | <level2> | ||
2938 | 29 | level2 text start | ||
2939 | 30 | <level3> | ||
2940 | 31 | level3 text start | ||
2941 | 32 | <level4>level4 text</level4> | ||
2942 | 33 | level3 text end | ||
2943 | 34 | </level3> | ||
2944 | 35 | level2 text end | ||
2945 | 36 | </level2> | ||
2946 | 37 | level1 text end | ||
2947 | 38 | |||
2948 | 39 | level1 text start | ||
2949 | 40 | <level2> | ||
2950 | 41 | level2 text start | ||
2951 | 42 | <level3> | ||
2952 | 43 | level3 text start | ||
2953 | 44 | <level4>level4 text</level4> | ||
2954 | 45 | level3 text end | ||
2955 | 46 | </level3> | ||
2956 | 47 | level2 text end | ||
2957 | 48 | </level2> | ||
2958 | 49 | level1 text end | ||
2959 | 50 | |||
2960 | 0 | 51 | ||
2961 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xml.res' | |||
2962 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xml.res 1970-01-01 00:00:00 +0000 | |||
2963 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xml.res 2012-02-23 17:28:26 +0000 | |||
2964 | @@ -0,0 +1,34 @@ | |||
2965 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2966 | 2 | |||
2967 | 3 | level2 text start | ||
2968 | 4 | <level3> | ||
2969 | 5 | level3 text start | ||
2970 | 6 | <level4>level4 text</level4> | ||
2971 | 7 | level3 text end | ||
2972 | 8 | </level3> | ||
2973 | 9 | level2 text end | ||
2974 | 10 | |||
2975 | 11 | level2 text start | ||
2976 | 12 | <level3> | ||
2977 | 13 | level3 text start | ||
2978 | 14 | <level4>level4 text</level4> | ||
2979 | 15 | level3 text end | ||
2980 | 16 | </level3> | ||
2981 | 17 | level2 text end | ||
2982 | 18 | |||
2983 | 19 | level2 text start | ||
2984 | 20 | <level3> | ||
2985 | 21 | level3 text start | ||
2986 | 22 | <level4>level4 text</level4> | ||
2987 | 23 | level3 text end | ||
2988 | 24 | </level3> | ||
2989 | 25 | level2 text end | ||
2990 | 26 | |||
2991 | 27 | level2 text start | ||
2992 | 28 | <level3> | ||
2993 | 29 | level3 text start | ||
2994 | 30 | <level4>level4 text</level4> | ||
2995 | 31 | level3 text end | ||
2996 | 32 | </level3> | ||
2997 | 33 | level2 text end | ||
2998 | 34 | |||
2999 | 0 | 35 | ||
3000 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xml.res' | |||
3001 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xml.res 1970-01-01 00:00:00 +0000 | |||
3002 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xml.res 2012-02-23 17:28:26 +0000 | |||
3003 | @@ -0,0 +1,18 @@ | |||
3004 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3005 | 2 | |||
3006 | 3 | level3 text start | ||
3007 | 4 | <level4>level4 text</level4> | ||
3008 | 5 | level3 text end | ||
3009 | 6 | |||
3010 | 7 | level3 text start | ||
3011 | 8 | <level4>level4 text</level4> | ||
3012 | 9 | level3 text end | ||
3013 | 10 | |||
3014 | 11 | level3 text start | ||
3015 | 12 | <level4>level4 text</level4> | ||
3016 | 13 | level3 text end | ||
3017 | 14 | |||
3018 | 15 | level3 text start | ||
3019 | 16 | <level4>level4 text</level4> | ||
3020 | 17 | level3 text end | ||
3021 | 18 | |||
3022 | 0 | 19 | ||
3023 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xml.res' | |||
3024 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xml.res 1970-01-01 00:00:00 +0000 | |||
3025 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xml.res 2012-02-23 17:28:26 +0000 | |||
3026 | @@ -0,0 +1,2 @@ | |||
3027 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3028 | 2 | level4 textlevel4 textlevel4 textlevel4 text | ||
3029 | 0 | 3 | ||
3030 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xml.res' | |||
3031 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xml.res 1970-01-01 00:00:00 +0000 | |||
3032 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xml.res 2012-02-23 17:28:26 +0000 | |||
3033 | @@ -0,0 +1,2 @@ | |||
3034 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3035 | 2 | |||
3036 | 0 | 3 | ||
3037 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xml.res' | |||
3038 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xml.res 1970-01-01 00:00:00 +0000 | |||
3039 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xml.res 2012-02-23 17:28:26 +0000 | |||
3040 | @@ -0,0 +1,14 @@ | |||
3041 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3042 | 2 | <doc> | ||
3043 | 3 | <foo>0</foo> | ||
3044 | 4 | <foo>1</foo> | ||
3045 | 5 | <foo>2</foo> | ||
3046 | 6 | <foo>3</foo> | ||
3047 | 7 | <foo>4</foo> | ||
3048 | 8 | <foo>5</foo> | ||
3049 | 9 | <foo>6</foo> | ||
3050 | 10 | <foo>7</foo> | ||
3051 | 11 | <foo>8</foo> | ||
3052 | 12 | <foo>9</foo> | ||
3053 | 13 | <foo>10</foo> | ||
3054 | 14 | </doc> | ||
3055 | 0 | 15 | ||
3056 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xml.res' | |||
3057 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xml.res 1970-01-01 00:00:00 +0000 | |||
3058 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xml.res 2012-02-23 17:28:26 +0000 | |||
3059 | @@ -0,0 +1,14 @@ | |||
3060 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3061 | 2 | |||
3062 | 3 | <foo>0</foo> | ||
3063 | 4 | <foo>1</foo> | ||
3064 | 5 | <foo>2</foo> | ||
3065 | 6 | <foo>3</foo> | ||
3066 | 7 | <foo>4</foo> | ||
3067 | 8 | <foo>5</foo> | ||
3068 | 9 | <foo>6</foo> | ||
3069 | 10 | <foo>7</foo> | ||
3070 | 11 | <foo>8</foo> | ||
3071 | 12 | <foo>9</foo> | ||
3072 | 13 | <foo>10</foo> | ||
3073 | 14 | |||
3074 | 0 | 15 | ||
3075 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xml.res' | |||
3076 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xml.res 1970-01-01 00:00:00 +0000 | |||
3077 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xml.res 2012-02-23 17:28:26 +0000 | |||
3078 | @@ -0,0 +1,2 @@ | |||
3079 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3080 | 2 | 012345678910 | ||
3081 | 0 | 3 | ||
3082 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xml.res' | |||
3083 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xml.res 1970-01-01 00:00:00 +0000 | |||
3084 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xml.res 2012-02-23 17:28:26 +0000 | |||
3085 | @@ -0,0 +1,3 @@ | |||
3086 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3087 | 2 | |||
3088 | 3 | <n1:root xmlns:n1="ns" xmlns:m1="ms"><n2:root2 xmlns:n2="ns2" xmlns:m2="ms2"><n1:from1 xmlns:n3="ns3"><from2>Text from2</from2></n1:from1></n2:root2></n1:root> | ||
3089 | 0 | 4 | ||
3090 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xml.res' | |||
3091 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xml.res 1970-01-01 00:00:00 +0000 | |||
3092 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xml.res 2012-02-23 17:28:26 +0000 | |||
3093 | @@ -0,0 +1,2 @@ | |||
3094 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3095 | 2 | <n2:root2 xmlns:n1="ns" xmlns:m1="ms" xmlns:n2="ns2" xmlns:m2="ms2"><n1:from1 xmlns:n3="ns3"><from2>Text from2</from2></n1:from1></n2:root2> | ||
3096 | 0 | 3 | ||
3097 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xml.res' | |||
3098 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xml.res 1970-01-01 00:00:00 +0000 | |||
3099 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xml.res 2012-02-23 17:28:26 +0000 | |||
3100 | @@ -0,0 +1,2 @@ | |||
3101 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3102 | 2 | <n1:from1 xmlns:n1="ns" xmlns:m1="ms" xmlns:n2="ns2" xmlns:m2="ms2" xmlns:n3="ns3"><from2>Text from2</from2></n1:from1> | ||
3103 | 0 | \ No newline at end of file | 3 | \ No newline at end of file |
3104 | 1 | 4 | ||
3105 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xml.res' | |||
3106 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xml.res 1970-01-01 00:00:00 +0000 | |||
3107 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xml.res 2012-02-23 17:28:26 +0000 | |||
3108 | @@ -0,0 +1,2 @@ | |||
3109 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3110 | 2 | <from2 xmlns:n1="ns" xmlns:m1="ms" xmlns:n2="ns2" xmlns:m2="ms2" xmlns:n3="ns3">Text from2</from2> | ||
3111 | 0 | \ No newline at end of file | 3 | \ No newline at end of file |
3112 | 1 | 4 | ||
3113 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xml.res' | |||
3114 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xml.res 1970-01-01 00:00:00 +0000 | |||
3115 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xml.res 2012-02-23 17:28:26 +0000 | |||
3116 | @@ -0,0 +1,2 @@ | |||
3117 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3118 | 2 | Text from2 | ||
3119 | 0 | \ No newline at end of file | 3 | \ No newline at end of file |
3120 | 1 | 4 | ||
3121 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xml.res' | |||
3122 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xml.res 1970-01-01 00:00:00 +0000 | |||
3123 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xml.res 2012-02-23 17:28:26 +0000 | |||
3124 | @@ -0,0 +1,2 @@ | |||
3125 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3126 | 2 | |||
3127 | 0 | 3 | ||
3128 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xml.res' | |||
3129 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xml.res 1970-01-01 00:00:00 +0000 | |||
3130 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xml.res 2012-02-23 17:28:26 +0000 | |||
3131 | @@ -0,0 +1,31 @@ | |||
3132 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3133 | 2 | |||
3134 | 3 | level0 text | ||
3135 | 4 | <level1/> | ||
3136 | 5 | level0 text | ||
3137 | 6 | <level1/> | ||
3138 | 7 | level0 text | ||
3139 | 8 | <level1/> | ||
3140 | 9 | level0 text | ||
3141 | 10 | <level1/> | ||
3142 | 11 | level0 text | ||
3143 | 12 | <level1/> | ||
3144 | 13 | level0 text | ||
3145 | 14 | <level1/> | ||
3146 | 15 | level0 text | ||
3147 | 16 | <level1/> | ||
3148 | 17 | level0 text | ||
3149 | 18 | <level1/> | ||
3150 | 19 | level0 text | ||
3151 | 20 | <level1/> | ||
3152 | 21 | level0 text | ||
3153 | 22 | <level1/> | ||
3154 | 23 | level0 text | ||
3155 | 24 | <level1/> | ||
3156 | 25 | level0 text | ||
3157 | 26 | <level1/> | ||
3158 | 27 | level0 text | ||
3159 | 28 | <level1/> | ||
3160 | 29 | level0 text | ||
3161 | 30 | <level1/> | ||
3162 | 31 | level0 text | ||
3163 | 0 | \ No newline at end of file | 32 | \ No newline at end of file |
3164 | 1 | 33 | ||
3165 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xml.res' | |||
3166 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xml.res 1970-01-01 00:00:00 +0000 | |||
3167 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xml.res 2012-02-23 17:28:26 +0000 | |||
3168 | @@ -0,0 +1,8 @@ | |||
3169 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3170 | 2 | <mediawiki> | ||
3171 | 3 | <page> | ||
3172 | 4 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
3173 | 5 | |||
3174 | 6 | </page> | ||
3175 | 7 | </mediawiki> | ||
3176 | 8 | |||
3177 | 0 | 9 | ||
3178 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xml.res' | |||
3179 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xml.res 1970-01-01 00:00:00 +0000 | |||
3180 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xml.res 2012-02-23 17:28:26 +0000 | |||
3181 | @@ -0,0 +1,7 @@ | |||
3182 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3183 | 2 | |||
3184 | 3 | <page> | ||
3185 | 4 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
3186 | 5 | |||
3187 | 6 | </page> | ||
3188 | 7 | |||
3189 | 0 | 8 | ||
3190 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xml.res' | |||
3191 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xml.res 1970-01-01 00:00:00 +0000 | |||
3192 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xml.res 2012-02-23 17:28:26 +0000 | |||
3193 | @@ -0,0 +1,8 @@ | |||
3194 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3195 | 2 | <mediawiki> | ||
3196 | 3 | <page> | ||
3197 | 4 | abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab | ||
3198 | 5 | |||
3199 | 6 | </page> | ||
3200 | 7 | </mediawiki> | ||
3201 | 8 | |||
3202 | 0 | 9 | ||
3203 | === added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xml.res' | |||
3204 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xml.res 1970-01-01 00:00:00 +0000 | |||
3205 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xml.res 2012-02-23 17:28:26 +0000 | |||
3206 | @@ -0,0 +1,7 @@ | |||
3207 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
3208 | 2 | |||
3209 | 3 | <page> | ||
3210 | 4 | abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab | ||
3211 | 5 | |||
3212 | 6 | </page> | ||
3213 | 7 | |||
3214 | 0 | 8 | ||
3215 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-01.xml.res' (properties changed: +x to -x) | |||
3216 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-03.xml.res' (properties changed: +x to -x) | |||
3217 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-04.xml.res' (properties changed: +x to -x) | |||
3218 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-05.xml.res' (properties changed: +x to -x) | |||
3219 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-07.xml.res' (properties changed: +x to -x) | |||
3220 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-10.xml.res' (properties changed: +x to -x) | |||
3221 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-11.xml.res' (properties changed: +x to -x) | |||
3222 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-12.xml.res' (properties changed: +x to -x) | |||
3223 | --- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-12.xml.res 2011-07-15 16:39:51 +0000 | |||
3224 | +++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-12.xml.res 2012-02-23 17:28:26 +0000 | |||
3225 | @@ -1,4 +1,4 @@ | |||
3226 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
3227 | 2 | <fragment><from1>Jani</from1> | 2 | <fragment><from1>Jani</from1> |
3228 | 3 | <from2>Jani</from2> | 3 | <from2>Jani</from2> |
3229 | 4 | <from3>Jani</from3><count>5</count></fragment> | ||
3230 | 5 | \ No newline at end of file | 4 | \ No newline at end of file |
3231 | 5 | <from3>Jani</from3><count>6</count></fragment> | ||
3232 | 6 | \ No newline at end of file | 6 | \ No newline at end of file |
3233 | 7 | 7 | ||
3234 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-14.xml.res' (properties changed: +x to -x) | |||
3235 | === modified file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-15.xml.res' (properties changed: +x to -x) | |||
3236 | === renamed file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res' => 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-16.xml.res' | |||
3237 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xq' | |||
3238 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xq 1970-01-01 00:00:00 +0000 | |||
3239 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-01.xq 2012-02-23 17:28:26 +0000 | |||
3240 | @@ -0,0 +1,8 @@ | |||
3241 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3242 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3243 | 3 | |||
3244 | 4 | z:parse("<?xml version='1.0'?><root><from1>Jani</from1></root>", | ||
3245 | 5 | <opt:options> | ||
3246 | 6 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3247 | 7 | </opt:options> | ||
3248 | 8 | ) | ||
3249 | 0 | 9 | ||
3250 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xq' | |||
3251 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xq 1970-01-01 00:00:00 +0000 | |||
3252 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-02.xq 2012-02-23 17:28:26 +0000 | |||
3253 | @@ -0,0 +1,13 @@ | |||
3254 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3255 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3256 | 3 | |||
3257 | 4 | z:parse("<?xml version='1.0'?> | ||
3258 | 5 | <root> | ||
3259 | 6 | <from1>Jani1</from1> | ||
3260 | 7 | <from2>Jani2</from2> | ||
3261 | 8 | <from3>Jani3</from3> | ||
3262 | 9 | </root>", | ||
3263 | 10 | <opt:options> | ||
3264 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3265 | 12 | </opt:options> | ||
3266 | 13 | ) | ||
3267 | 0 | 14 | ||
3268 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xq' | |||
3269 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xq 1970-01-01 00:00:00 +0000 | |||
3270 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-03.xq 2012-02-23 17:28:26 +0000 | |||
3271 | @@ -0,0 +1,13 @@ | |||
3272 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3273 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3274 | 3 | |||
3275 | 4 | z:parse("<?xml version='1.0'?> | ||
3276 | 5 | <root> | ||
3277 | 6 | <from1>Jani1</from1> | ||
3278 | 7 | <from2>Jani2</from2> | ||
3279 | 8 | <from3>Jani3</from3> | ||
3280 | 9 | </root>", | ||
3281 | 10 | <opt:options> | ||
3282 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3283 | 12 | </opt:options> | ||
3284 | 13 | ) | ||
3285 | 0 | 14 | ||
3286 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xq' | |||
3287 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xq 1970-01-01 00:00:00 +0000 | |||
3288 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-04.xq 2012-02-23 17:28:26 +0000 | |||
3289 | @@ -0,0 +1,19 @@ | |||
3290 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3291 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3292 | 3 | |||
3293 | 4 | z:parse("<?xml version='1.0'?> | ||
3294 | 5 | <root> | ||
3295 | 6 | <root2> | ||
3296 | 7 | <from1>Jani1</from1> | ||
3297 | 8 | </root2> | ||
3298 | 9 | <root2> | ||
3299 | 10 | <from2>Jani2</from2> | ||
3300 | 11 | </root2> | ||
3301 | 12 | <root2> | ||
3302 | 13 | <from3>Jani3</from3> | ||
3303 | 14 | </root2> | ||
3304 | 15 | </root>", | ||
3305 | 16 | <opt:options> | ||
3306 | 17 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
3307 | 18 | </opt:options> | ||
3308 | 19 | ) | ||
3309 | 0 | 20 | ||
3310 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xq' | |||
3311 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xq 1970-01-01 00:00:00 +0000 | |||
3312 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-05.xq 2012-02-23 17:28:26 +0000 | |||
3313 | @@ -0,0 +1,19 @@ | |||
3314 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3315 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3316 | 3 | |||
3317 | 4 | z:parse("<?xml version='1.0'?> | ||
3318 | 5 | <root> | ||
3319 | 6 | <root2> | ||
3320 | 7 | <from1>Jani1</from1> | ||
3321 | 8 | </root2> | ||
3322 | 9 | <root2> | ||
3323 | 10 | <from2>Jani2</from2> | ||
3324 | 11 | </root2> | ||
3325 | 12 | <root2> | ||
3326 | 13 | <from3>Jani3</from3> | ||
3327 | 14 | </root2> | ||
3328 | 15 | </root>", | ||
3329 | 16 | <opt:options> | ||
3330 | 17 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3331 | 18 | </opt:options> | ||
3332 | 19 | ) | ||
3333 | 0 | 20 | ||
3334 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xq' | |||
3335 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xq 1970-01-01 00:00:00 +0000 | |||
3336 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-06.xq 2012-02-23 17:28:26 +0000 | |||
3337 | @@ -0,0 +1,19 @@ | |||
3338 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3339 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3340 | 3 | |||
3341 | 4 | z:parse("<?xml version='1.0'?> | ||
3342 | 5 | <root> | ||
3343 | 6 | <root2> | ||
3344 | 7 | <from1>Jani1</from1> | ||
3345 | 8 | </root2> | ||
3346 | 9 | <root2> | ||
3347 | 10 | <from2>Jani2</from2> | ||
3348 | 11 | </root2> | ||
3349 | 12 | <root2> | ||
3350 | 13 | <from3>Jani3</from3> | ||
3351 | 14 | </root2> | ||
3352 | 15 | </root>", | ||
3353 | 16 | <opt:options> | ||
3354 | 17 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3355 | 18 | </opt:options> | ||
3356 | 19 | ) | ||
3357 | 0 | 20 | ||
3358 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xq' | |||
3359 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xq 1970-01-01 00:00:00 +0000 | |||
3360 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-07.xq 2012-02-23 17:28:26 +0000 | |||
3361 | @@ -0,0 +1,19 @@ | |||
3362 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3363 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3364 | 3 | |||
3365 | 4 | z:parse("<?xml version='1.0'?> | ||
3366 | 5 | <root> | ||
3367 | 6 | <root2> | ||
3368 | 7 | <from1>Jani1</from1> | ||
3369 | 8 | </root2> | ||
3370 | 9 | <root2> | ||
3371 | 10 | <from2>Jani2</from2> | ||
3372 | 11 | </root2> | ||
3373 | 12 | <root2> | ||
3374 | 13 | <from3>Jani3</from3> | ||
3375 | 14 | </root2> | ||
3376 | 15 | </root>", | ||
3377 | 16 | <opt:options> | ||
3378 | 17 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3379 | 18 | </opt:options> | ||
3380 | 19 | ) | ||
3381 | 0 | 20 | ||
3382 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xq' | |||
3383 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xq 1970-01-01 00:00:00 +0000 | |||
3384 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-08.xq 2012-02-23 17:28:26 +0000 | |||
3385 | @@ -0,0 +1,9 @@ | |||
3386 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3387 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3388 | 3 | |||
3389 | 4 | z:parse("<?xml version='1.0'?> | ||
3390 | 5 | <root><from1>Jani1</from1></root>", | ||
3391 | 6 | <opt:options> | ||
3392 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
3393 | 8 | </opt:options> | ||
3394 | 9 | ) | ||
3395 | 0 | 10 | ||
3396 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xq' | |||
3397 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xq 1970-01-01 00:00:00 +0000 | |||
3398 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-09.xq 2012-02-23 17:28:26 +0000 | |||
3399 | @@ -0,0 +1,9 @@ | |||
3400 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3401 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3402 | 3 | |||
3403 | 4 | z:parse("<?xml version='1.0'?> | ||
3404 | 5 | <root><from1>Jani1</from1></root>", | ||
3405 | 6 | <opt:options> | ||
3406 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3407 | 8 | </opt:options> | ||
3408 | 9 | ) | ||
3409 | 0 | 10 | ||
3410 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xq' | |||
3411 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xq 1970-01-01 00:00:00 +0000 | |||
3412 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-10.xq 2012-02-23 17:28:26 +0000 | |||
3413 | @@ -0,0 +1,9 @@ | |||
3414 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3415 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3416 | 3 | |||
3417 | 4 | z:parse("<?xml version='1.0'?> | ||
3418 | 5 | <root><from1>Jani1</from1></root>", | ||
3419 | 6 | <opt:options> | ||
3420 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3421 | 8 | </opt:options> | ||
3422 | 9 | ) | ||
3423 | 0 | 10 | ||
3424 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xq' | |||
3425 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xq 1970-01-01 00:00:00 +0000 | |||
3426 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-11.xq 2012-02-23 17:28:26 +0000 | |||
3427 | @@ -0,0 +1,9 @@ | |||
3428 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3429 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3430 | 3 | |||
3431 | 4 | z:parse("<?xml version='1.0'?> | ||
3432 | 5 | <root><from1>Jani1</from1></root>", | ||
3433 | 6 | <opt:options> | ||
3434 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3435 | 8 | </opt:options> | ||
3436 | 9 | ) | ||
3437 | 0 | 10 | ||
3438 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xq' | |||
3439 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xq 1970-01-01 00:00:00 +0000 | |||
3440 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-12.xq 2012-02-23 17:28:26 +0000 | |||
3441 | @@ -0,0 +1,9 @@ | |||
3442 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3443 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3444 | 3 | |||
3445 | 4 | z:parse("<?xml version='1.0'?> | ||
3446 | 5 | <root><root2><from1>Jani1</from1></root2></root>", | ||
3447 | 6 | <opt:options> | ||
3448 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3449 | 8 | </opt:options> | ||
3450 | 9 | ) | ||
3451 | 0 | 10 | ||
3452 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xq' | |||
3453 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xq 1970-01-01 00:00:00 +0000 | |||
3454 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-13.xq 2012-02-23 17:28:26 +0000 | |||
3455 | @@ -0,0 +1,9 @@ | |||
3456 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3457 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3458 | 3 | |||
3459 | 4 | z:parse("<?xml version='1.0'?> | ||
3460 | 5 | <root><root2><root3><from1>Jani1</from1></root3></root2></root>", | ||
3461 | 6 | <opt:options> | ||
3462 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3463 | 8 | </opt:options> | ||
3464 | 9 | ) | ||
3465 | 0 | 10 | ||
3466 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xq' | |||
3467 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xq 1970-01-01 00:00:00 +0000 | |||
3468 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-14.xq 2012-02-23 17:28:26 +0000 | |||
3469 | @@ -0,0 +1,9 @@ | |||
3470 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3471 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3472 | 3 | |||
3473 | 4 | z:parse("<?xml version='1.0'?> | ||
3474 | 5 | <root><root2><root3><from1>Jani1</from1></root3></root2></root>", | ||
3475 | 6 | <opt:options> | ||
3476 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
3477 | 8 | </opt:options> | ||
3478 | 9 | ) | ||
3479 | 0 | 10 | ||
3480 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xq' | |||
3481 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xq 1970-01-01 00:00:00 +0000 | |||
3482 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-15.xq 2012-02-23 17:28:26 +0000 | |||
3483 | @@ -0,0 +1,8 @@ | |||
3484 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3485 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3486 | 3 | |||
3487 | 4 | z:parse("<?xml version='1.0'?><root>root1 text<root2>root2 text<root3>root3 text<from1>Jani1</from1></root3></root2></root>", | ||
3488 | 5 | <opt:options> | ||
3489 | 6 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
3490 | 7 | </opt:options> | ||
3491 | 8 | ) | ||
3492 | 0 | 9 | ||
3493 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xq' | |||
3494 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xq 1970-01-01 00:00:00 +0000 | |||
3495 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-16.xq 2012-02-23 17:28:26 +0000 | |||
3496 | @@ -0,0 +1,8 @@ | |||
3497 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3498 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3499 | 3 | |||
3500 | 4 | z:parse("<?xml version='1.0'?><root>root1 text<root15>root15 text</root15><root2>root2 text<root3>root3 text<from1>Jani1</from1></root3></root2></root>", | ||
3501 | 5 | <opt:options> | ||
3502 | 6 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
3503 | 7 | </opt:options> | ||
3504 | 8 | ) | ||
3505 | 0 | 9 | ||
3506 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xq' | |||
3507 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xq 1970-01-01 00:00:00 +0000 | |||
3508 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-17.xq 2012-02-23 17:28:26 +0000 | |||
3509 | @@ -0,0 +1,8 @@ | |||
3510 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3511 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3512 | 3 | |||
3513 | 4 | z:parse("<?xml version='1.0'?><root>root1 text<root15>root15 text</root15><root2>root2 text<root3>root3 text<from1>Jani1</from1></root3></root2></root>", | ||
3514 | 5 | <opt:options> | ||
3515 | 6 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3516 | 7 | </opt:options> | ||
3517 | 8 | ) | ||
3518 | 0 | 9 | ||
3519 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xq' | |||
3520 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xq 1970-01-01 00:00:00 +0000 | |||
3521 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-18.xq 2012-02-23 17:28:26 +0000 | |||
3522 | @@ -0,0 +1,9 @@ | |||
3523 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3524 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3525 | 3 | |||
3526 | 4 | z:parse("<?xml version='1.0'?> | ||
3527 | 5 | <root>Jani0<from1>Jani1</from1></root>", | ||
3528 | 6 | <opt:options> | ||
3529 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3530 | 8 | </opt:options> | ||
3531 | 9 | ) | ||
3532 | 0 | 10 | ||
3533 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xq' | |||
3534 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xq 1970-01-01 00:00:00 +0000 | |||
3535 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-19.xq 2012-02-23 17:28:26 +0000 | |||
3536 | @@ -0,0 +1,15 @@ | |||
3537 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3538 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3539 | 3 | |||
3540 | 4 | z:parse("<?xml version='1.0'?> | ||
3541 | 5 | <level1> | ||
3542 | 6 | <level2> | ||
3543 | 7 | <level3> | ||
3544 | 8 | <level4>level4 text</level4> | ||
3545 | 9 | </level3> | ||
3546 | 10 | </level2> | ||
3547 | 11 | </level1>", | ||
3548 | 12 | <opt:options> | ||
3549 | 13 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
3550 | 14 | </opt:options> | ||
3551 | 15 | ) | ||
3552 | 0 | 16 | ||
3553 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xq' | |||
3554 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xq 1970-01-01 00:00:00 +0000 | |||
3555 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-20.xq 2012-02-23 17:28:26 +0000 | |||
3556 | @@ -0,0 +1,15 @@ | |||
3557 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3558 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3559 | 3 | |||
3560 | 4 | z:parse("<?xml version='1.0'?> | ||
3561 | 5 | <level1> | ||
3562 | 6 | <level2> | ||
3563 | 7 | <level3> | ||
3564 | 8 | <level4>level4 text</level4> | ||
3565 | 9 | </level3> | ||
3566 | 10 | </level2> | ||
3567 | 11 | </level1>", | ||
3568 | 12 | <opt:options> | ||
3569 | 13 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3570 | 14 | </opt:options> | ||
3571 | 15 | ) | ||
3572 | 0 | 16 | ||
3573 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xq' | |||
3574 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xq 1970-01-01 00:00:00 +0000 | |||
3575 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-21.xq 2012-02-23 17:28:26 +0000 | |||
3576 | @@ -0,0 +1,15 @@ | |||
3577 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3578 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3579 | 3 | |||
3580 | 4 | z:parse("<?xml version='1.0'?> | ||
3581 | 5 | <level1> | ||
3582 | 6 | <level2> | ||
3583 | 7 | <level3> | ||
3584 | 8 | <level4>level4 text</level4> | ||
3585 | 9 | </level3> | ||
3586 | 10 | </level2> | ||
3587 | 11 | </level1>", | ||
3588 | 12 | <opt:options> | ||
3589 | 13 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3590 | 14 | </opt:options> | ||
3591 | 15 | ) | ||
3592 | 0 | 16 | ||
3593 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xq' | |||
3594 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xq 1970-01-01 00:00:00 +0000 | |||
3595 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-22.xq 2012-02-23 17:28:26 +0000 | |||
3596 | @@ -0,0 +1,15 @@ | |||
3597 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3598 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3599 | 3 | |||
3600 | 4 | z:parse("<?xml version='1.0'?> | ||
3601 | 5 | <level1> | ||
3602 | 6 | <level2> | ||
3603 | 7 | <level3> | ||
3604 | 8 | <level4>level4 text</level4> | ||
3605 | 9 | </level3> | ||
3606 | 10 | </level2> | ||
3607 | 11 | </level1>", | ||
3608 | 12 | <opt:options> | ||
3609 | 13 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3610 | 14 | </opt:options> | ||
3611 | 15 | ) | ||
3612 | 0 | 16 | ||
3613 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xq' | |||
3614 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xq 1970-01-01 00:00:00 +0000 | |||
3615 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-23.xq 2012-02-23 17:28:26 +0000 | |||
3616 | @@ -0,0 +1,15 @@ | |||
3617 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3618 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3619 | 3 | |||
3620 | 4 | z:parse("<?xml version='1.0'?> | ||
3621 | 5 | <level1> | ||
3622 | 6 | <level2> | ||
3623 | 7 | <level3> | ||
3624 | 8 | <level4>level4 text</level4> | ||
3625 | 9 | </level3> | ||
3626 | 10 | </level2> | ||
3627 | 11 | </level1>", | ||
3628 | 12 | <opt:options> | ||
3629 | 13 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
3630 | 14 | </opt:options> | ||
3631 | 15 | ) | ||
3632 | 0 | 16 | ||
3633 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xq' | |||
3634 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xq 1970-01-01 00:00:00 +0000 | |||
3635 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-24.xq 2012-02-23 17:28:26 +0000 | |||
3636 | @@ -0,0 +1,16 @@ | |||
3637 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3638 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3639 | 3 | |||
3640 | 4 | z:parse("<?xml version='1.0'?> | ||
3641 | 5 | <level1> | ||
3642 | 6 | <level2> | ||
3643 | 7 | <level3> | ||
3644 | 8 | <level4>level4 text</level4> | ||
3645 | 9 | level3 end | ||
3646 | 10 | </level3> | ||
3647 | 11 | </level2> | ||
3648 | 12 | </level1>", | ||
3649 | 13 | <opt:options> | ||
3650 | 14 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3651 | 15 | </opt:options> | ||
3652 | 16 | ) | ||
3653 | 0 | 17 | ||
3654 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xq' | |||
3655 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xq 1970-01-01 00:00:00 +0000 | |||
3656 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-25.xq 2012-02-23 17:28:26 +0000 | |||
3657 | @@ -0,0 +1,21 @@ | |||
3658 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3659 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3660 | 3 | |||
3661 | 4 | z:parse("<?xml version='1.0'?> | ||
3662 | 5 | <level1> | ||
3663 | 6 | level1 text start | ||
3664 | 7 | <level2> | ||
3665 | 8 | level2 text start | ||
3666 | 9 | <level3> | ||
3667 | 10 | level3 text start | ||
3668 | 11 | <level4>level4 text</level4> | ||
3669 | 12 | level3 text end | ||
3670 | 13 | </level3> | ||
3671 | 14 | level2 text end | ||
3672 | 15 | </level2> | ||
3673 | 16 | level1 text end | ||
3674 | 17 | </level1>", | ||
3675 | 18 | <opt:options> | ||
3676 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
3677 | 20 | </opt:options> | ||
3678 | 21 | ) | ||
3679 | 0 | 22 | ||
3680 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xq' | |||
3681 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xq 1970-01-01 00:00:00 +0000 | |||
3682 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-26.xq 2012-02-23 17:28:26 +0000 | |||
3683 | @@ -0,0 +1,21 @@ | |||
3684 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3685 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3686 | 3 | |||
3687 | 4 | z:parse("<?xml version='1.0'?> | ||
3688 | 5 | <level1> | ||
3689 | 6 | level1 text start | ||
3690 | 7 | <level2> | ||
3691 | 8 | level2 text start | ||
3692 | 9 | <level3> | ||
3693 | 10 | level3 text start | ||
3694 | 11 | <level4>level4 text</level4> | ||
3695 | 12 | level3 text end | ||
3696 | 13 | </level3> | ||
3697 | 14 | level2 text end | ||
3698 | 15 | </level2> | ||
3699 | 16 | level1 text end | ||
3700 | 17 | </level1>", | ||
3701 | 18 | <opt:options> | ||
3702 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3703 | 20 | </opt:options> | ||
3704 | 21 | ) | ||
3705 | 0 | 22 | ||
3706 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xq' | |||
3707 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xq 1970-01-01 00:00:00 +0000 | |||
3708 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-27.xq 2012-02-23 17:28:26 +0000 | |||
3709 | @@ -0,0 +1,21 @@ | |||
3710 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3711 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3712 | 3 | |||
3713 | 4 | z:parse("<?xml version='1.0'?> | ||
3714 | 5 | <level1> | ||
3715 | 6 | level1 text start | ||
3716 | 7 | <level2> | ||
3717 | 8 | level2 text start | ||
3718 | 9 | <level3> | ||
3719 | 10 | level3 text start | ||
3720 | 11 | <level4>level4 text</level4> | ||
3721 | 12 | level3 text end | ||
3722 | 13 | </level3> | ||
3723 | 14 | level2 text end | ||
3724 | 15 | </level2> | ||
3725 | 16 | level1 text end | ||
3726 | 17 | </level1>", | ||
3727 | 18 | <opt:options> | ||
3728 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
3729 | 20 | </opt:options> | ||
3730 | 21 | ) | ||
3731 | 0 | 22 | ||
3732 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xq' | |||
3733 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xq 1970-01-01 00:00:00 +0000 | |||
3734 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-28.xq 2012-02-23 17:28:26 +0000 | |||
3735 | @@ -0,0 +1,21 @@ | |||
3736 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3737 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3738 | 3 | |||
3739 | 4 | z:parse("<?xml version='1.0'?> | ||
3740 | 5 | <level1> | ||
3741 | 6 | level1 text start | ||
3742 | 7 | <level2> | ||
3743 | 8 | level2 text start | ||
3744 | 9 | <level3> | ||
3745 | 10 | level3 text start | ||
3746 | 11 | <level4>level4 text</level4> | ||
3747 | 12 | level3 text end | ||
3748 | 13 | </level3> | ||
3749 | 14 | level2 text end | ||
3750 | 15 | </level2> | ||
3751 | 16 | level1 text end | ||
3752 | 17 | </level1>", | ||
3753 | 18 | <opt:options> | ||
3754 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
3755 | 20 | </opt:options> | ||
3756 | 21 | ) | ||
3757 | 0 | 22 | ||
3758 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xq' | |||
3759 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xq 1970-01-01 00:00:00 +0000 | |||
3760 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-29.xq 2012-02-23 17:28:26 +0000 | |||
3761 | @@ -0,0 +1,21 @@ | |||
3762 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3763 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3764 | 3 | |||
3765 | 4 | z:parse("<?xml version='1.0'?> | ||
3766 | 5 | <level1> | ||
3767 | 6 | level1 text start | ||
3768 | 7 | <level2> | ||
3769 | 8 | level2 text start | ||
3770 | 9 | <level3> | ||
3771 | 10 | level3 text start | ||
3772 | 11 | <level4>level4 text</level4> | ||
3773 | 12 | level3 text end | ||
3774 | 13 | </level3> | ||
3775 | 14 | level2 text end | ||
3776 | 15 | </level2> | ||
3777 | 16 | level1 text end | ||
3778 | 17 | </level1>", | ||
3779 | 18 | <opt:options> | ||
3780 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
3781 | 20 | </opt:options> | ||
3782 | 21 | ) | ||
3783 | 0 | 22 | ||
3784 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xq' | |||
3785 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xq 1970-01-01 00:00:00 +0000 | |||
3786 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-30.xq 2012-02-23 17:28:26 +0000 | |||
3787 | @@ -0,0 +1,21 @@ | |||
3788 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3789 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3790 | 3 | |||
3791 | 4 | z:parse("<?xml version='1.0'?> | ||
3792 | 5 | <level1> | ||
3793 | 6 | level1 text start | ||
3794 | 7 | <level2> | ||
3795 | 8 | level2 text start | ||
3796 | 9 | <level3> | ||
3797 | 10 | level3 text start | ||
3798 | 11 | <level4>level4 text</level4> | ||
3799 | 12 | level3 text end | ||
3800 | 13 | </level3> | ||
3801 | 14 | level2 text end | ||
3802 | 15 | </level2> | ||
3803 | 16 | level1 text end | ||
3804 | 17 | </level1>", | ||
3805 | 18 | <opt:options> | ||
3806 | 19 | <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> | ||
3807 | 20 | </opt:options> | ||
3808 | 21 | ) | ||
3809 | 0 | 22 | ||
3810 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xq' | |||
3811 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xq 1970-01-01 00:00:00 +0000 | |||
3812 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-31.xq 2012-02-23 17:28:26 +0000 | |||
3813 | @@ -0,0 +1,65 @@ | |||
3814 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3815 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3816 | 3 | |||
3817 | 4 | z:parse("<?xml version='1.0'?> | ||
3818 | 5 | level0 text | ||
3819 | 6 | <level1> | ||
3820 | 7 | level1 text start | ||
3821 | 8 | <level2> | ||
3822 | 9 | level2 text start | ||
3823 | 10 | <level3> | ||
3824 | 11 | level3 text start | ||
3825 | 12 | <level4>level4 text</level4> | ||
3826 | 13 | level3 text end | ||
3827 | 14 | </level3> | ||
3828 | 15 | level2 text end | ||
3829 | 16 | </level2> | ||
3830 | 17 | level1 text end | ||
3831 | 18 | </level1> | ||
3832 | 19 | level0 text | ||
3833 | 20 | <level1> | ||
3834 | 21 | level1 text start | ||
3835 | 22 | <level2> | ||
3836 | 23 | level2 text start | ||
3837 | 24 | <level3> | ||
3838 | 25 | level3 text start | ||
3839 | 26 | <level4>level4 text</level4> | ||
3840 | 27 | level3 text end | ||
3841 | 28 | </level3> | ||
3842 | 29 | level2 text end | ||
3843 | 30 | </level2> | ||
3844 | 31 | level1 text end | ||
3845 | 32 | </level1> | ||
3846 | 33 | level0 text | ||
3847 | 34 | <level1> | ||
3848 | 35 | level1 text start | ||
3849 | 36 | <level2> | ||
3850 | 37 | level2 text start | ||
3851 | 38 | <level3> | ||
3852 | 39 | level3 text start | ||
3853 | 40 | <level4>level4 text</level4> | ||
3854 | 41 | level3 text end | ||
3855 | 42 | </level3> | ||
3856 | 43 | level2 text end | ||
3857 | 44 | </level2> | ||
3858 | 45 | level1 text end | ||
3859 | 46 | </level1> | ||
3860 | 47 | level0 text | ||
3861 | 48 | <level1> | ||
3862 | 49 | level1 text start | ||
3863 | 50 | <level2> | ||
3864 | 51 | level2 text start | ||
3865 | 52 | <level3> | ||
3866 | 53 | level3 text start | ||
3867 | 54 | <level4>level4 text</level4> | ||
3868 | 55 | level3 text end | ||
3869 | 56 | </level3> | ||
3870 | 57 | level2 text end | ||
3871 | 58 | </level2> | ||
3872 | 59 | level1 text end | ||
3873 | 60 | </level1> | ||
3874 | 61 | level0 text", | ||
3875 | 62 | <opt:options> | ||
3876 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
3877 | 64 | </opt:options> | ||
3878 | 65 | ) | ||
3879 | 0 | 66 | ||
3880 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xq' | |||
3881 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xq 1970-01-01 00:00:00 +0000 | |||
3882 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-32.xq 2012-02-23 17:28:26 +0000 | |||
3883 | @@ -0,0 +1,65 @@ | |||
3884 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3885 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3886 | 3 | |||
3887 | 4 | z:parse("<?xml version='1.0'?> | ||
3888 | 5 | level0 text | ||
3889 | 6 | <level1> | ||
3890 | 7 | level1 text start | ||
3891 | 8 | <level2> | ||
3892 | 9 | level2 text start | ||
3893 | 10 | <level3> | ||
3894 | 11 | level3 text start | ||
3895 | 12 | <level4>level4 text</level4> | ||
3896 | 13 | level3 text end | ||
3897 | 14 | </level3> | ||
3898 | 15 | level2 text end | ||
3899 | 16 | </level2> | ||
3900 | 17 | level1 text end | ||
3901 | 18 | </level1> | ||
3902 | 19 | level0 text | ||
3903 | 20 | <level1> | ||
3904 | 21 | level1 text start | ||
3905 | 22 | <level2> | ||
3906 | 23 | level2 text start | ||
3907 | 24 | <level3> | ||
3908 | 25 | level3 text start | ||
3909 | 26 | <level4>level4 text</level4> | ||
3910 | 27 | level3 text end | ||
3911 | 28 | </level3> | ||
3912 | 29 | level2 text end | ||
3913 | 30 | </level2> | ||
3914 | 31 | level1 text end | ||
3915 | 32 | </level1> | ||
3916 | 33 | level0 text | ||
3917 | 34 | <level1> | ||
3918 | 35 | level1 text start | ||
3919 | 36 | <level2> | ||
3920 | 37 | level2 text start | ||
3921 | 38 | <level3> | ||
3922 | 39 | level3 text start | ||
3923 | 40 | <level4>level4 text</level4> | ||
3924 | 41 | level3 text end | ||
3925 | 42 | </level3> | ||
3926 | 43 | level2 text end | ||
3927 | 44 | </level2> | ||
3928 | 45 | level1 text end | ||
3929 | 46 | </level1> | ||
3930 | 47 | level0 text | ||
3931 | 48 | <level1> | ||
3932 | 49 | level1 text start | ||
3933 | 50 | <level2> | ||
3934 | 51 | level2 text start | ||
3935 | 52 | <level3> | ||
3936 | 53 | level3 text start | ||
3937 | 54 | <level4>level4 text</level4> | ||
3938 | 55 | level3 text end | ||
3939 | 56 | </level3> | ||
3940 | 57 | level2 text end | ||
3941 | 58 | </level2> | ||
3942 | 59 | level1 text end | ||
3943 | 60 | </level1> | ||
3944 | 61 | level0 text", | ||
3945 | 62 | <opt:options> | ||
3946 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
3947 | 64 | </opt:options> | ||
3948 | 65 | ) | ||
3949 | 0 | 66 | ||
3950 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xq' | |||
3951 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xq 1970-01-01 00:00:00 +0000 | |||
3952 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-33.xq 2012-02-23 17:28:26 +0000 | |||
3953 | @@ -0,0 +1,65 @@ | |||
3954 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
3955 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
3956 | 3 | |||
3957 | 4 | z:parse("<?xml version='1.0'?> | ||
3958 | 5 | level0 text | ||
3959 | 6 | <level1> | ||
3960 | 7 | level1 text start | ||
3961 | 8 | <level2> | ||
3962 | 9 | level2 text start | ||
3963 | 10 | <level3> | ||
3964 | 11 | level3 text start | ||
3965 | 12 | <level4>level4 text</level4> | ||
3966 | 13 | level3 text end | ||
3967 | 14 | </level3> | ||
3968 | 15 | level2 text end | ||
3969 | 16 | </level2> | ||
3970 | 17 | level1 text end | ||
3971 | 18 | </level1> | ||
3972 | 19 | level0 text | ||
3973 | 20 | <level1> | ||
3974 | 21 | level1 text start | ||
3975 | 22 | <level2> | ||
3976 | 23 | level2 text start | ||
3977 | 24 | <level3> | ||
3978 | 25 | level3 text start | ||
3979 | 26 | <level4>level4 text</level4> | ||
3980 | 27 | level3 text end | ||
3981 | 28 | </level3> | ||
3982 | 29 | level2 text end | ||
3983 | 30 | </level2> | ||
3984 | 31 | level1 text end | ||
3985 | 32 | </level1> | ||
3986 | 33 | level0 text | ||
3987 | 34 | <level1> | ||
3988 | 35 | level1 text start | ||
3989 | 36 | <level2> | ||
3990 | 37 | level2 text start | ||
3991 | 38 | <level3> | ||
3992 | 39 | level3 text start | ||
3993 | 40 | <level4>level4 text</level4> | ||
3994 | 41 | level3 text end | ||
3995 | 42 | </level3> | ||
3996 | 43 | level2 text end | ||
3997 | 44 | </level2> | ||
3998 | 45 | level1 text end | ||
3999 | 46 | </level1> | ||
4000 | 47 | level0 text | ||
4001 | 48 | <level1> | ||
4002 | 49 | level1 text start | ||
4003 | 50 | <level2> | ||
4004 | 51 | level2 text start | ||
4005 | 52 | <level3> | ||
4006 | 53 | level3 text start | ||
4007 | 54 | <level4>level4 text</level4> | ||
4008 | 55 | level3 text end | ||
4009 | 56 | </level3> | ||
4010 | 57 | level2 text end | ||
4011 | 58 | </level2> | ||
4012 | 59 | level1 text end | ||
4013 | 60 | </level1> | ||
4014 | 61 | level0 text", | ||
4015 | 62 | <opt:options> | ||
4016 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
4017 | 64 | </opt:options> | ||
4018 | 65 | ) | ||
4019 | 0 | 66 | ||
4020 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xq' | |||
4021 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xq 1970-01-01 00:00:00 +0000 | |||
4022 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-34.xq 2012-02-23 17:28:26 +0000 | |||
4023 | @@ -0,0 +1,65 @@ | |||
4024 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4025 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4026 | 3 | |||
4027 | 4 | z:parse("<?xml version='1.0'?> | ||
4028 | 5 | level0 text | ||
4029 | 6 | <level1> | ||
4030 | 7 | level1 text start | ||
4031 | 8 | <level2> | ||
4032 | 9 | level2 text start | ||
4033 | 10 | <level3> | ||
4034 | 11 | level3 text start | ||
4035 | 12 | <level4>level4 text</level4> | ||
4036 | 13 | level3 text end | ||
4037 | 14 | </level3> | ||
4038 | 15 | level2 text end | ||
4039 | 16 | </level2> | ||
4040 | 17 | level1 text end | ||
4041 | 18 | </level1> | ||
4042 | 19 | level0 text | ||
4043 | 20 | <level1> | ||
4044 | 21 | level1 text start | ||
4045 | 22 | <level2> | ||
4046 | 23 | level2 text start | ||
4047 | 24 | <level3> | ||
4048 | 25 | level3 text start | ||
4049 | 26 | <level4>level4 text</level4> | ||
4050 | 27 | level3 text end | ||
4051 | 28 | </level3> | ||
4052 | 29 | level2 text end | ||
4053 | 30 | </level2> | ||
4054 | 31 | level1 text end | ||
4055 | 32 | </level1> | ||
4056 | 33 | level0 text | ||
4057 | 34 | <level1> | ||
4058 | 35 | level1 text start | ||
4059 | 36 | <level2> | ||
4060 | 37 | level2 text start | ||
4061 | 38 | <level3> | ||
4062 | 39 | level3 text start | ||
4063 | 40 | <level4>level4 text</level4> | ||
4064 | 41 | level3 text end | ||
4065 | 42 | </level3> | ||
4066 | 43 | level2 text end | ||
4067 | 44 | </level2> | ||
4068 | 45 | level1 text end | ||
4069 | 46 | </level1> | ||
4070 | 47 | level0 text | ||
4071 | 48 | <level1> | ||
4072 | 49 | level1 text start | ||
4073 | 50 | <level2> | ||
4074 | 51 | level2 text start | ||
4075 | 52 | <level3> | ||
4076 | 53 | level3 text start | ||
4077 | 54 | <level4>level4 text</level4> | ||
4078 | 55 | level3 text end | ||
4079 | 56 | </level3> | ||
4080 | 57 | level2 text end | ||
4081 | 58 | </level2> | ||
4082 | 59 | level1 text end | ||
4083 | 60 | </level1> | ||
4084 | 61 | level0 text", | ||
4085 | 62 | <opt:options> | ||
4086 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
4087 | 64 | </opt:options> | ||
4088 | 65 | ) | ||
4089 | 0 | 66 | ||
4090 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xq' | |||
4091 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xq 1970-01-01 00:00:00 +0000 | |||
4092 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-35.xq 2012-02-23 17:28:26 +0000 | |||
4093 | @@ -0,0 +1,65 @@ | |||
4094 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4095 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4096 | 3 | |||
4097 | 4 | z:parse("<?xml version='1.0'?> | ||
4098 | 5 | level0 text | ||
4099 | 6 | <level1> | ||
4100 | 7 | level1 text start | ||
4101 | 8 | <level2> | ||
4102 | 9 | level2 text start | ||
4103 | 10 | <level3> | ||
4104 | 11 | level3 text start | ||
4105 | 12 | <level4>level4 text</level4> | ||
4106 | 13 | level3 text end | ||
4107 | 14 | </level3> | ||
4108 | 15 | level2 text end | ||
4109 | 16 | </level2> | ||
4110 | 17 | level1 text end | ||
4111 | 18 | </level1> | ||
4112 | 19 | level0 text | ||
4113 | 20 | <level1> | ||
4114 | 21 | level1 text start | ||
4115 | 22 | <level2> | ||
4116 | 23 | level2 text start | ||
4117 | 24 | <level3> | ||
4118 | 25 | level3 text start | ||
4119 | 26 | <level4>level4 text</level4> | ||
4120 | 27 | level3 text end | ||
4121 | 28 | </level3> | ||
4122 | 29 | level2 text end | ||
4123 | 30 | </level2> | ||
4124 | 31 | level1 text end | ||
4125 | 32 | </level1> | ||
4126 | 33 | level0 text | ||
4127 | 34 | <level1> | ||
4128 | 35 | level1 text start | ||
4129 | 36 | <level2> | ||
4130 | 37 | level2 text start | ||
4131 | 38 | <level3> | ||
4132 | 39 | level3 text start | ||
4133 | 40 | <level4>level4 text</level4> | ||
4134 | 41 | level3 text end | ||
4135 | 42 | </level3> | ||
4136 | 43 | level2 text end | ||
4137 | 44 | </level2> | ||
4138 | 45 | level1 text end | ||
4139 | 46 | </level1> | ||
4140 | 47 | level0 text | ||
4141 | 48 | <level1> | ||
4142 | 49 | level1 text start | ||
4143 | 50 | <level2> | ||
4144 | 51 | level2 text start | ||
4145 | 52 | <level3> | ||
4146 | 53 | level3 text start | ||
4147 | 54 | <level4>level4 text</level4> | ||
4148 | 55 | level3 text end | ||
4149 | 56 | </level3> | ||
4150 | 57 | level2 text end | ||
4151 | 58 | </level2> | ||
4152 | 59 | level1 text end | ||
4153 | 60 | </level1> | ||
4154 | 61 | level0 text", | ||
4155 | 62 | <opt:options> | ||
4156 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
4157 | 64 | </opt:options> | ||
4158 | 65 | ) | ||
4159 | 0 | 66 | ||
4160 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xq' | |||
4161 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xq 1970-01-01 00:00:00 +0000 | |||
4162 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-36.xq 2012-02-23 17:28:26 +0000 | |||
4163 | @@ -0,0 +1,65 @@ | |||
4164 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4165 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4166 | 3 | |||
4167 | 4 | z:parse("<?xml version='1.0'?> | ||
4168 | 5 | level0 text | ||
4169 | 6 | <level1> | ||
4170 | 7 | level1 text start | ||
4171 | 8 | <level2> | ||
4172 | 9 | level2 text start | ||
4173 | 10 | <level3> | ||
4174 | 11 | level3 text start | ||
4175 | 12 | <level4>level4 text</level4> | ||
4176 | 13 | level3 text end | ||
4177 | 14 | </level3> | ||
4178 | 15 | level2 text end | ||
4179 | 16 | </level2> | ||
4180 | 17 | level1 text end | ||
4181 | 18 | </level1> | ||
4182 | 19 | level0 text | ||
4183 | 20 | <level1> | ||
4184 | 21 | level1 text start | ||
4185 | 22 | <level2> | ||
4186 | 23 | level2 text start | ||
4187 | 24 | <level3> | ||
4188 | 25 | level3 text start | ||
4189 | 26 | <level4>level4 text</level4> | ||
4190 | 27 | level3 text end | ||
4191 | 28 | </level3> | ||
4192 | 29 | level2 text end | ||
4193 | 30 | </level2> | ||
4194 | 31 | level1 text end | ||
4195 | 32 | </level1> | ||
4196 | 33 | level0 text | ||
4197 | 34 | <level1> | ||
4198 | 35 | level1 text start | ||
4199 | 36 | <level2> | ||
4200 | 37 | level2 text start | ||
4201 | 38 | <level3> | ||
4202 | 39 | level3 text start | ||
4203 | 40 | <level4>level4 text</level4> | ||
4204 | 41 | level3 text end | ||
4205 | 42 | </level3> | ||
4206 | 43 | level2 text end | ||
4207 | 44 | </level2> | ||
4208 | 45 | level1 text end | ||
4209 | 46 | </level1> | ||
4210 | 47 | level0 text | ||
4211 | 48 | <level1> | ||
4212 | 49 | level1 text start | ||
4213 | 50 | <level2> | ||
4214 | 51 | level2 text start | ||
4215 | 52 | <level3> | ||
4216 | 53 | level3 text start | ||
4217 | 54 | <level4>level4 text</level4> | ||
4218 | 55 | level3 text end | ||
4219 | 56 | </level3> | ||
4220 | 57 | level2 text end | ||
4221 | 58 | </level2> | ||
4222 | 59 | level1 text end | ||
4223 | 60 | </level1> | ||
4224 | 61 | level0 text", | ||
4225 | 62 | <opt:options> | ||
4226 | 63 | <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> | ||
4227 | 64 | </opt:options> | ||
4228 | 65 | ) | ||
4229 | 0 | 66 | ||
4230 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xq' | |||
4231 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xq 1970-01-01 00:00:00 +0000 | |||
4232 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-37.xq 2012-02-23 17:28:26 +0000 | |||
4233 | @@ -0,0 +1,20 @@ | |||
4234 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4235 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4236 | 3 | |||
4237 | 4 | z:parse("<doc> | ||
4238 | 5 | <foo>0</foo> | ||
4239 | 6 | <foo>1</foo> | ||
4240 | 7 | <foo>2</foo> | ||
4241 | 8 | <foo>3</foo> | ||
4242 | 9 | <foo>4</foo> | ||
4243 | 10 | <foo>5</foo> | ||
4244 | 11 | <foo>6</foo> | ||
4245 | 12 | <foo>7</foo> | ||
4246 | 13 | <foo>8</foo> | ||
4247 | 14 | <foo>9</foo> | ||
4248 | 15 | <foo>10</foo> | ||
4249 | 16 | </doc>", | ||
4250 | 17 | <opt:options> | ||
4251 | 18 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
4252 | 19 | </opt:options> | ||
4253 | 20 | ) | ||
4254 | 0 | 21 | ||
4255 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xq' | |||
4256 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xq 1970-01-01 00:00:00 +0000 | |||
4257 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-38.xq 2012-02-23 17:28:26 +0000 | |||
4258 | @@ -0,0 +1,20 @@ | |||
4259 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4260 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4261 | 3 | |||
4262 | 4 | z:parse("<doc> | ||
4263 | 5 | <foo>0</foo> | ||
4264 | 6 | <foo>1</foo> | ||
4265 | 7 | <foo>2</foo> | ||
4266 | 8 | <foo>3</foo> | ||
4267 | 9 | <foo>4</foo> | ||
4268 | 10 | <foo>5</foo> | ||
4269 | 11 | <foo>6</foo> | ||
4270 | 12 | <foo>7</foo> | ||
4271 | 13 | <foo>8</foo> | ||
4272 | 14 | <foo>9</foo> | ||
4273 | 15 | <foo>10</foo> | ||
4274 | 16 | </doc>", | ||
4275 | 17 | <opt:options> | ||
4276 | 18 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
4277 | 19 | </opt:options> | ||
4278 | 20 | ) | ||
4279 | 0 | 21 | ||
4280 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xq' | |||
4281 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xq 1970-01-01 00:00:00 +0000 | |||
4282 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-39.xq 2012-02-23 17:28:26 +0000 | |||
4283 | @@ -0,0 +1,20 @@ | |||
4284 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4285 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4286 | 3 | |||
4287 | 4 | z:parse("<doc> | ||
4288 | 5 | <foo>0</foo> | ||
4289 | 6 | <foo>1</foo> | ||
4290 | 7 | <foo>2</foo> | ||
4291 | 8 | <foo>3</foo> | ||
4292 | 9 | <foo>4</foo> | ||
4293 | 10 | <foo>5</foo> | ||
4294 | 11 | <foo>6</foo> | ||
4295 | 12 | <foo>7</foo> | ||
4296 | 13 | <foo>8</foo> | ||
4297 | 14 | <foo>9</foo> | ||
4298 | 15 | <foo>10</foo> | ||
4299 | 16 | </doc>", | ||
4300 | 17 | <opt:options> | ||
4301 | 18 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
4302 | 19 | </opt:options> | ||
4303 | 20 | ) | ||
4304 | 0 | 21 | ||
4305 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xq' | |||
4306 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xq 1970-01-01 00:00:00 +0000 | |||
4307 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-40.xq 2012-02-23 17:28:26 +0000 | |||
4308 | @@ -0,0 +1,9 @@ | |||
4309 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4310 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4311 | 3 | |||
4312 | 4 | z:parse("<?xml version='1.0'?> | ||
4313 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4314 | 6 | <opt:options> | ||
4315 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
4316 | 8 | </opt:options> | ||
4317 | 9 | ) | ||
4318 | 0 | 10 | ||
4319 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xq' | |||
4320 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xq 1970-01-01 00:00:00 +0000 | |||
4321 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-41.xq 2012-02-23 17:28:26 +0000 | |||
4322 | @@ -0,0 +1,9 @@ | |||
4323 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4324 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4325 | 3 | |||
4326 | 4 | z:parse("<?xml version='1.0'?> | ||
4327 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4328 | 6 | <opt:options> | ||
4329 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
4330 | 8 | </opt:options> | ||
4331 | 9 | ) | ||
4332 | 0 | 10 | ||
4333 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xq' | |||
4334 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xq 1970-01-01 00:00:00 +0000 | |||
4335 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-42.xq 2012-02-23 17:28:26 +0000 | |||
4336 | @@ -0,0 +1,9 @@ | |||
4337 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4338 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4339 | 3 | |||
4340 | 4 | z:parse("<?xml version='1.0'?> | ||
4341 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4342 | 6 | <opt:options> | ||
4343 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
4344 | 8 | </opt:options> | ||
4345 | 9 | ) | ||
4346 | 0 | 10 | ||
4347 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xq' | |||
4348 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xq 1970-01-01 00:00:00 +0000 | |||
4349 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-43.xq 2012-02-23 17:28:26 +0000 | |||
4350 | @@ -0,0 +1,9 @@ | |||
4351 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4352 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4353 | 3 | |||
4354 | 4 | z:parse("<?xml version='1.0'?> | ||
4355 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4356 | 6 | <opt:options> | ||
4357 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> | ||
4358 | 8 | </opt:options> | ||
4359 | 9 | ) | ||
4360 | 0 | 10 | ||
4361 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xq' | |||
4362 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xq 1970-01-01 00:00:00 +0000 | |||
4363 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-44.xq 2012-02-23 17:28:26 +0000 | |||
4364 | @@ -0,0 +1,9 @@ | |||
4365 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4366 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4367 | 3 | |||
4368 | 4 | z:parse("<?xml version='1.0'?> | ||
4369 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4370 | 6 | <opt:options> | ||
4371 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> | ||
4372 | 8 | </opt:options> | ||
4373 | 9 | ) | ||
4374 | 0 | 10 | ||
4375 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xq' | |||
4376 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xq 1970-01-01 00:00:00 +0000 | |||
4377 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-45.xq 2012-02-23 17:28:26 +0000 | |||
4378 | @@ -0,0 +1,9 @@ | |||
4379 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4380 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4381 | 3 | |||
4382 | 4 | z:parse("<?xml version='1.0'?> | ||
4383 | 5 | <n1:root xmlns:n1='ns' xmlns:m1='ms'><n2:root2 xmlns:n2='ns2' xmlns:m2='ms2'><n1:from1 xmlns:n3='ns3'><from2>Text from2</from2></n1:from1></n2:root2></n1:root>", | ||
4384 | 6 | <opt:options> | ||
4385 | 7 | <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> | ||
4386 | 8 | </opt:options> | ||
4387 | 9 | ) | ||
4388 | 0 | 10 | ||
4389 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xq' | |||
4390 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xq 1970-01-01 00:00:00 +0000 | |||
4391 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-46.xq 2012-02-23 17:28:26 +0000 | |||
4392 | @@ -0,0 +1,37 @@ | |||
4393 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4394 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4395 | 3 | |||
4396 | 4 | z:parse("<?xml version='1.0'?> | ||
4397 | 5 | level0 text | ||
4398 | 6 | <level1/> | ||
4399 | 7 | level0 text | ||
4400 | 8 | <level1/> | ||
4401 | 9 | level0 text | ||
4402 | 10 | <level1/> | ||
4403 | 11 | level0 text | ||
4404 | 12 | <level1/> | ||
4405 | 13 | level0 text | ||
4406 | 14 | <level1/> | ||
4407 | 15 | level0 text | ||
4408 | 16 | <level1/> | ||
4409 | 17 | level0 text | ||
4410 | 18 | <level1/> | ||
4411 | 19 | level0 text | ||
4412 | 20 | <level1/> | ||
4413 | 21 | level0 text | ||
4414 | 22 | <level1/> | ||
4415 | 23 | level0 text | ||
4416 | 24 | <level1/> | ||
4417 | 25 | level0 text | ||
4418 | 26 | <level1/> | ||
4419 | 27 | level0 text | ||
4420 | 28 | <level1/> | ||
4421 | 29 | level0 text | ||
4422 | 30 | <level1/> | ||
4423 | 31 | level0 text | ||
4424 | 32 | <level1/> | ||
4425 | 33 | level0 text", | ||
4426 | 34 | <opt:options> | ||
4427 | 35 | <opt:parse-external-parsed-entity/> | ||
4428 | 36 | </opt:options> | ||
4429 | 37 | ) | ||
4430 | 0 | 38 | ||
4431 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.spec' | |||
4432 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.spec 1970-01-01 00:00:00 +0000 | |||
4433 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.spec 2012-02-23 17:28:26 +0000 | |||
4434 | @@ -0,0 +1,1 @@ | |||
4435 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4436 | 0 | 2 | ||
4437 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.xq' | |||
4438 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.xq 1970-01-01 00:00:00 +0000 | |||
4439 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-47.xq 2012-02-23 17:28:26 +0000 | |||
4440 | @@ -0,0 +1,13 @@ | |||
4441 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4442 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4443 | 3 | |||
4444 | 4 | z:parse("<root> | ||
4445 | 5 | <test/> | ||
4446 | 6 | <test/> | ||
4447 | 7 | </bad> | ||
4448 | 8 | </root> | ||
4449 | 9 | ", | ||
4450 | 10 | <opt:options> | ||
4451 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
4452 | 12 | </opt:options> | ||
4453 | 13 | ) | ||
4454 | 0 | 14 | ||
4455 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.spec' | |||
4456 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.spec 1970-01-01 00:00:00 +0000 | |||
4457 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.spec 2012-02-23 17:28:26 +0000 | |||
4458 | @@ -0,0 +1,1 @@ | |||
4459 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4460 | 0 | 2 | ||
4461 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.xq' | |||
4462 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.xq 1970-01-01 00:00:00 +0000 | |||
4463 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-48.xq 2012-02-23 17:28:26 +0000 | |||
4464 | @@ -0,0 +1,13 @@ | |||
4465 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4466 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4467 | 3 | |||
4468 | 4 | z:parse("<root> | ||
4469 | 5 | <test/> | ||
4470 | 6 | <test/> | ||
4471 | 7 | </bad> | ||
4472 | 8 | </root> | ||
4473 | 9 | ", | ||
4474 | 10 | <opt:options> | ||
4475 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
4476 | 12 | </opt:options> | ||
4477 | 13 | ) | ||
4478 | 0 | 14 | ||
4479 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.spec' | |||
4480 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.spec 1970-01-01 00:00:00 +0000 | |||
4481 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.spec 2012-02-23 17:28:26 +0000 | |||
4482 | @@ -0,0 +1,1 @@ | |||
4483 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4484 | 0 | 2 | ||
4485 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.xq' | |||
4486 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.xq 1970-01-01 00:00:00 +0000 | |||
4487 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-49.xq 2012-02-23 17:28:26 +0000 | |||
4488 | @@ -0,0 +1,13 @@ | |||
4489 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4490 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4491 | 3 | |||
4492 | 4 | z:parse("<root> | ||
4493 | 5 | <test/> | ||
4494 | 6 | <test/> | ||
4495 | 7 | </bad> | ||
4496 | 8 | </root> | ||
4497 | 9 | ", | ||
4498 | 10 | <opt:options> | ||
4499 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> | ||
4500 | 12 | </opt:options> | ||
4501 | 13 | ) | ||
4502 | 0 | 14 | ||
4503 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.spec' | |||
4504 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.spec 1970-01-01 00:00:00 +0000 | |||
4505 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.spec 2012-02-23 17:28:26 +0000 | |||
4506 | @@ -0,0 +1,1 @@ | |||
4507 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4508 | 0 | 2 | ||
4509 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.xq' | |||
4510 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.xq 1970-01-01 00:00:00 +0000 | |||
4511 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-50.xq 2012-02-23 17:28:26 +0000 | |||
4512 | @@ -0,0 +1,13 @@ | |||
4513 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4514 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4515 | 3 | |||
4516 | 4 | z:parse("<root> | ||
4517 | 5 | <test/> | ||
4518 | 6 | <test/> | ||
4519 | 7 | </root> | ||
4520 | 8 | </bad> | ||
4521 | 9 | ", | ||
4522 | 10 | <opt:options> | ||
4523 | 11 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
4524 | 12 | </opt:options> | ||
4525 | 13 | ) | ||
4526 | 0 | 14 | ||
4527 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.spec' | |||
4528 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.spec 1970-01-01 00:00:00 +0000 | |||
4529 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.spec 2012-02-23 17:28:26 +0000 | |||
4530 | @@ -0,0 +1,1 @@ | |||
4531 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4532 | 0 | 2 | ||
4533 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.xq' | |||
4534 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.xq 1970-01-01 00:00:00 +0000 | |||
4535 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-51.xq 2012-02-23 17:28:26 +0000 | |||
4536 | @@ -0,0 +1,11 @@ | |||
4537 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4538 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4539 | 3 | |||
4540 | 4 | z:parse("<root> | ||
4541 | 5 | <test/> | ||
4542 | 6 | <test/> | ||
4543 | 7 | ", | ||
4544 | 8 | <opt:options> | ||
4545 | 9 | <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> | ||
4546 | 10 | </opt:options> | ||
4547 | 11 | ) | ||
4548 | 0 | 12 | ||
4549 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.spec' | |||
4550 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.spec 1970-01-01 00:00:00 +0000 | |||
4551 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.spec 2012-02-23 17:28:26 +0000 | |||
4552 | @@ -0,0 +1,1 @@ | |||
4553 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4554 | 0 | 2 | ||
4555 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.xq' | |||
4556 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.xq 1970-01-01 00:00:00 +0000 | |||
4557 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-52.xq 2012-02-23 17:28:26 +0000 | |||
4558 | @@ -0,0 +1,11 @@ | |||
4559 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4560 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4561 | 3 | |||
4562 | 4 | z:parse("<root> | ||
4563 | 5 | <test/> | ||
4564 | 6 | <test/> | ||
4565 | 7 | ", | ||
4566 | 8 | <opt:options> | ||
4567 | 9 | <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> | ||
4568 | 10 | </opt:options> | ||
4569 | 11 | ) | ||
4570 | 0 | 12 | ||
4571 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xq' | |||
4572 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xq 1970-01-01 00:00:00 +0000 | |||
4573 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-53.xq 2012-02-23 17:28:26 +0000 | |||
4574 | @@ -0,0 +1,13 @@ | |||
4575 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4576 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4577 | 3 | |||
4578 | 4 | x:parse("<mediawiki> | ||
4579 | 5 | <page> | ||
4580 | 6 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
4581 | 7 | |||
4582 | 8 | </page> | ||
4583 | 9 | </mediawiki>", | ||
4584 | 10 | <opt:options> | ||
4585 | 11 | <opt:parse-external-parsed-entity | ||
4586 | 12 | opt:skip-root-nodes="0"/> | ||
4587 | 13 | </opt:options>) | ||
4588 | 0 | 14 | ||
4589 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xq' | |||
4590 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xq 1970-01-01 00:00:00 +0000 | |||
4591 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-54.xq 2012-02-23 17:28:26 +0000 | |||
4592 | @@ -0,0 +1,14 @@ | |||
4593 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4594 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4595 | 3 | import module namespace file = "http://expath.org/ns/file"; | ||
4596 | 4 | |||
4597 | 5 | x:parse("<mediawiki> | ||
4598 | 6 | <page> | ||
4599 | 7 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
4600 | 8 | |||
4601 | 9 | </page> | ||
4602 | 10 | </mediawiki>", | ||
4603 | 11 | <opt:options> | ||
4604 | 12 | <opt:parse-external-parsed-entity | ||
4605 | 13 | opt:skip-root-nodes="1"/> | ||
4606 | 14 | </opt:options>) | ||
4607 | 0 | 15 | ||
4608 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xq' | |||
4609 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xq 1970-01-01 00:00:00 +0000 | |||
4610 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-55.xq 2012-02-23 17:28:26 +0000 | |||
4611 | @@ -0,0 +1,14 @@ | |||
4612 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4613 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4614 | 3 | import module namespace file = "http://expath.org/ns/file"; | ||
4615 | 4 | |||
4616 | 5 | x:parse("<mediawiki> | ||
4617 | 6 | <page> | ||
4618 | 7 | abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab | ||
4619 | 8 | |||
4620 | 9 | </page> | ||
4621 | 10 | </mediawiki>", | ||
4622 | 11 | <opt:options> | ||
4623 | 12 | <opt:parse-external-parsed-entity | ||
4624 | 13 | opt:skip-root-nodes="0"/> | ||
4625 | 14 | </opt:options>) | ||
4626 | 0 | 15 | ||
4627 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xq' | |||
4628 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xq 1970-01-01 00:00:00 +0000 | |||
4629 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-56.xq 2012-02-23 17:28:26 +0000 | |||
4630 | @@ -0,0 +1,14 @@ | |||
4631 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4632 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4633 | 3 | import module namespace file = "http://expath.org/ns/file"; | ||
4634 | 4 | |||
4635 | 5 | x:parse("<mediawiki> | ||
4636 | 6 | <page> | ||
4637 | 7 | abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab | ||
4638 | 8 | |||
4639 | 9 | </page> | ||
4640 | 10 | </mediawiki>", | ||
4641 | 11 | <opt:options> | ||
4642 | 12 | <opt:parse-external-parsed-entity | ||
4643 | 13 | opt:skip-root-nodes="1"/> | ||
4644 | 14 | </opt:options>) | ||
4645 | 0 | 15 | ||
4646 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq' (properties changed: +x to -x) | |||
4647 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq 2011-07-03 13:45:27 +0000 | |||
4648 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq 2012-02-23 17:28:26 +0000 | |||
4649 | @@ -1,6 +1,7 @@ | |||
4650 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4651 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4652 | 2 | 3 | ||
4654 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 4 | x:parse("<?xml version='1.0'?> |
4655 | 4 | <!DOCTYPE note [ | 5 | <!DOCTYPE note [ |
4656 | 5 | <!ELEMENT note (to,from,heading,body)> | 6 | <!ELEMENT note (to,from,heading,body)> |
4657 | 6 | <!ELEMENT to (#PCDATA)> | 7 | <!ELEMENT to (#PCDATA)> |
4658 | @@ -15,4 +16,7 @@ | |||
4659 | 15 | <body>Don't forget me this weekend</body> | 16 | <body>Don't forget me this weekend</body> |
4660 | 16 | </note> | 17 | </note> |
4661 | 17 | ", | 18 | ", |
4663 | 18 | "d") | 19 | <opt:options> |
4664 | 20 | <opt:DTD-validate/> | ||
4665 | 21 | </opt:options> | ||
4666 | 22 | ) | ||
4667 | 19 | 23 | ||
4668 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.spec' (properties changed: +x to -x) | |||
4669 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.xq' (properties changed: +x to -x) | |||
4670 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.xq 2011-07-03 13:45:27 +0000 | |||
4671 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.xq 2012-02-23 17:28:26 +0000 | |||
4672 | @@ -1,6 +1,7 @@ | |||
4673 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4674 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4675 | 2 | 3 | ||
4677 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 4 | x:parse("<?xml version='1.0'?> |
4678 | 4 | <!DOCTYPE note [ | 5 | <!DOCTYPE note [ |
4679 | 5 | <!ELEMENT note (to,from,heading,body)> | 6 | <!ELEMENT note (to,from,heading,body)> |
4680 | 6 | <!ELEMENT to (#PCDATA)> | 7 | <!ELEMENT to (#PCDATA)> |
4681 | @@ -12,4 +13,7 @@ | |||
4682 | 12 | <incorrect>Element not in DTD</incorrect> | 13 | <incorrect>Element not in DTD</incorrect> |
4683 | 13 | </note> | 14 | </note> |
4684 | 14 | ", | 15 | ", |
4686 | 15 | "d") | 16 | <opt:options> |
4687 | 17 | <opt:DTD-validate/> | ||
4688 | 18 | </opt:options> | ||
4689 | 19 | ) | ||
4690 | 16 | 20 | ||
4691 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq' (properties changed: +x to -x) | |||
4692 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq 2011-07-03 13:45:27 +0000 | |||
4693 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq 2012-02-23 17:28:26 +0000 | |||
4694 | @@ -1,8 +1,12 @@ | |||
4695 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4696 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4697 | 2 | 3 | ||
4699 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 4 | x:parse("<?xml version='1.0'?> |
4700 | 4 | <from1>Jani</from1> | 5 | <from1>Jani</from1> |
4701 | 5 | <from2>Jani</from2> | 6 | <from2>Jani</from2> |
4702 | 6 | <from3>Jani</from3> | 7 | <from3>Jani</from3> |
4703 | 7 | ", | 8 | ", |
4705 | 8 | "e") | 9 | <opt:options> |
4706 | 10 | <opt:parse-external-parsed-entity/> | ||
4707 | 11 | </opt:options> | ||
4708 | 12 | ) | ||
4709 | 9 | 13 | ||
4710 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-04.xq' (properties changed: +x to -x) | |||
4711 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-04.xq 2011-07-03 13:45:27 +0000 | |||
4712 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-04.xq 2012-02-23 17:28:26 +0000 | |||
4713 | @@ -1,8 +1,12 @@ | |||
4714 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4715 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4716 | 2 | 3 | ||
4718 | 3 | x:parse-xml-fragment(" | 4 | x:parse(" |
4719 | 4 | <from1>Jani</from1> | 5 | <from1>Jani</from1> |
4720 | 5 | <from2>Jani</from2> | 6 | <from2>Jani</from2> |
4721 | 6 | <from3>Jani</from3> | 7 | <from3>Jani</from3> |
4722 | 7 | ", | 8 | ", |
4724 | 8 | "e") | 9 | <opt:options> |
4725 | 10 | <opt:parse-external-parsed-entity/> | ||
4726 | 11 | </opt:options> | ||
4727 | 12 | ) | ||
4728 | 9 | 13 | ||
4729 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-05.xq' (properties changed: +x to -x) | |||
4730 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-05.xq 2011-07-03 13:45:27 +0000 | |||
4731 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-05.xq 2012-02-23 17:28:26 +0000 | |||
4732 | @@ -1,3 +1,9 @@ | |||
4733 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4736 | 2 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | |
4737 | 3 | x:parse-xml-fragment("<?xml version='1.0'?><a/>", "e") | 3 | |
4738 | 4 | x:parse("<?xml version='1.0'?><a/>", | ||
4739 | 5 | <opt:options> | ||
4740 | 6 | <opt:parse-external-parsed-entity/> | ||
4741 | 7 | </opt:options> | ||
4742 | 8 | ) | ||
4743 | 9 | |||
4744 | 4 | 10 | ||
4745 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.spec' (properties changed: +x to -x) | |||
4746 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.xq' (properties changed: +x to -x) | |||
4747 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.xq 2011-07-03 13:45:27 +0000 | |||
4748 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.xq 2012-02-23 17:28:26 +0000 | |||
4749 | @@ -1,8 +1,12 @@ | |||
4750 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4751 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4752 | 2 | 3 | ||
4754 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 4 | x:parse("<?xml version='1.0'?> |
4755 | 4 | <from1>Jani</from1> | 5 | <from1>Jani</from1> |
4756 | 5 | <from2>Jani</from2> | 6 | <from2>Jani</from2> |
4757 | 6 | <from3>Jani</from3> | 7 | <from3>Jani</from3> |
4758 | 7 | ", | 8 | ", |
4760 | 8 | "d") | 9 | <opt:options> |
4761 | 10 | <opt:DTD-validate/> | ||
4762 | 11 | </opt:options> | ||
4763 | 12 | ) | ||
4764 | 9 | 13 | ||
4765 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq' (properties changed: +x to -x) | |||
4766 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq 2011-07-03 13:45:27 +0000 | |||
4767 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq 2012-02-23 17:28:26 +0000 | |||
4768 | @@ -1,10 +1,14 @@ | |||
4769 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4770 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4771 | 2 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; | 3 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; |
4772 | 3 | 4 | ||
4774 | 4 | x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> | 5 | x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4775 | 5 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> | 6 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> |
4776 | 6 | <weather:temperature>30</weather:temperature> | 7 | <weather:temperature>30</weather:temperature> |
4777 | 7 | <weather:precipitation>20</weather:precipitation> | 8 | <weather:precipitation>20</weather:precipitation> |
4778 | 8 | </weather:weather> | 9 | </weather:weather> |
4779 | 9 | ", | 10 | ", |
4781 | 10 | "s") | 11 | <opt:options> |
4782 | 12 | <opt:schema-validate opt:mode="lax"/> | ||
4783 | 13 | </opt:options> | ||
4784 | 14 | ) | ||
4785 | 11 | 15 | ||
4786 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.spec' (properties changed: +x to -x) | |||
4787 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.xq' (properties changed: +x to -x) | |||
4788 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.xq 2011-07-03 13:45:27 +0000 | |||
4789 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.xq 2012-02-23 17:28:26 +0000 | |||
4790 | @@ -1,10 +1,15 @@ | |||
4791 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4792 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4793 | 2 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; | 3 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; |
4794 | 3 | 4 | ||
4796 | 4 | x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> | 5 | x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4797 | 5 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> | 6 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> |
4798 | 6 | <weather:incorrect>30</weather:incorrect> | 7 | <weather:incorrect>30</weather:incorrect> |
4799 | 7 | <weather:precipitation>20</weather:precipitation> | 8 | <weather:precipitation>20</weather:precipitation> |
4800 | 8 | </weather:weather> | 9 | </weather:weather> |
4801 | 9 | ", | 10 | ", |
4803 | 10 | "s") | 11 | <opt:options> |
4804 | 12 | <opt:schema-validate opt:mode="strict"/> | ||
4805 | 13 | </opt:options> | ||
4806 | 14 | ) | ||
4807 | 15 | |||
4808 | 11 | 16 | ||
4809 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.spec' (properties changed: +x to -x) | |||
4810 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.xq' (properties changed: +x to -x) | |||
4811 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.xq 2011-07-03 13:45:27 +0000 | |||
4812 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.xq 2012-02-23 17:28:26 +0000 | |||
4813 | @@ -1,6 +1,10 @@ | |||
4814 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4815 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4816 | 2 | 3 | ||
4818 | 3 | x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> | 4 | x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4819 | 4 | <atomic:root xmlns:atomic='http://www.w3.org/XQueryTest'> | 5 | <atomic:root xmlns:atomic='http://www.w3.org/XQueryTest'> |
4820 | 5 | <atomic:duration>P1Y2M3DT10H30M</atomic:duration>", | 6 | <atomic:duration>P1Y2M3DT10H30M</atomic:duration>", |
4822 | 6 | "e") | 7 | <opt:options> |
4823 | 8 | <opt:parse-external-parsed-entity/> | ||
4824 | 9 | </opt:options> | ||
4825 | 10 | ) | ||
4826 | 7 | 11 | ||
4827 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-10.xq' (properties changed: +x to -x) | |||
4828 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-10.xq 2011-07-03 13:45:27 +0000 | |||
4829 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-10.xq 2012-02-23 17:28:26 +0000 | |||
4830 | @@ -1,6 +1,6 @@ | |||
4831 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4832 | 2 | 2 | ||
4834 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 3 | x:parse("<?xml version='1.0'?> |
4835 | 4 | <root> | 4 | <root> |
4836 | 5 | <from1>Jani</from1> | 5 | <from1>Jani</from1> |
4837 | 6 | 6 | ||
4838 | @@ -8,4 +8,4 @@ | |||
4839 | 8 | 8 | ||
4840 | 9 | <from3>Jani</from3> | 9 | <from3>Jani</from3> |
4841 | 10 | </root>", | 10 | </root>", |
4843 | 11 | "") | 11 | () ) |
4844 | 12 | 12 | ||
4845 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-11.xq' (properties changed: +x to -x) | |||
4846 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-11.xq 2011-07-03 13:45:27 +0000 | |||
4847 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-11.xq 2012-02-23 17:28:26 +0000 | |||
4848 | @@ -1,6 +1,7 @@ | |||
4849 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4850 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4851 | 2 | 3 | ||
4853 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | 4 | x:parse("<?xml version='1.0'?> |
4854 | 4 | <!DOCTYPE note [ | 5 | <!DOCTYPE note [ |
4855 | 5 | <!ELEMENT note (to,from,heading,body)> | 6 | <!ELEMENT note (to,from,heading,body)> |
4856 | 6 | <!ELEMENT to (#PCDATA)> | 7 | <!ELEMENT to (#PCDATA)> |
4857 | @@ -12,4 +13,8 @@ | |||
4858 | 12 | <incorrect>Element not in DTD</incorrect> | 13 | <incorrect>Element not in DTD</incorrect> |
4859 | 13 | </note> | 14 | </note> |
4860 | 14 | ", | 15 | ", |
4862 | 15 | "dF") | 16 | <opt:options> |
4863 | 17 | <opt:DTD-validate/> | ||
4864 | 18 | <opt:no-error/> | ||
4865 | 19 | </opt:options> | ||
4866 | 20 | ) | ||
4867 | 16 | 21 | ||
4868 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-12.xq' (properties changed: +x to -x) | |||
4869 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-12.xq 2011-07-09 15:49:26 +0000 | |||
4870 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-12.xq 2012-02-23 17:28:26 +0000 | |||
4871 | @@ -1,8 +1,12 @@ | |||
4872 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4873 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4874 | 2 | 3 | ||
4876 | 3 | let $var := z:parse-xml-fragment("<?xml version='1.0'?> | 4 | let $var := z:parse("<?xml version='1.0'?> |
4877 | 4 | <from1>Jani</from1> | 5 | <from1>Jani</from1> |
4878 | 5 | <from2>Jani</from2> | 6 | <from2>Jani</from2> |
4879 | 6 | <from3>Jani</from3>", | 7 | <from3>Jani</from3>", |
4881 | 7 | "e") | 8 | <opt:options> |
4882 | 9 | <opt:parse-external-parsed-entity/> | ||
4883 | 10 | </opt:options> | ||
4884 | 11 | ) | ||
4885 | 8 | return <fragment>{ $var }<count>{ count($var) }</count></fragment> | 12 | return <fragment>{ $var }<count>{ count($var) }</count></fragment> |
4886 | 9 | \ No newline at end of file | 13 | \ No newline at end of file |
4887 | 10 | 14 | ||
4888 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-13.xq' | |||
4889 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-13.xq 2011-07-12 17:24:41 +0000 | |||
4890 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-13.xq 2012-02-23 17:28:26 +0000 | |||
4891 | @@ -1,4 +1,10 @@ | |||
4892 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4893 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4894 | 2 | 3 | ||
4896 | 3 | for $var in z:parse-xml-fragment("<from1>Jani</from1><from2>Jani</from2><from3>Jani</from3>", "urn:foo", "e") | 4 | for $var in z:parse("<from1>Jani</from1><from2>Jani</from2><from3>Jani</from3>", |
4897 | 5 | <opt:options> | ||
4898 | 6 | <opt:base-uri opt:value="urn:foo"/> | ||
4899 | 7 | <opt:parse-external-parsed-entity/> | ||
4900 | 8 | </opt:options> | ||
4901 | 9 | ) | ||
4902 | 4 | return <fragment base="{fn:base-uri($var)}">{ $var }</fragment> | 10 | return <fragment base="{fn:base-uri($var)}">{ $var }</fragment> |
4903 | 5 | 11 | ||
4904 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-14.xq' (properties changed: +x to -x) | |||
4905 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-14.xq 2011-07-15 16:39:51 +0000 | |||
4906 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-14.xq 2012-02-23 17:28:26 +0000 | |||
4907 | @@ -1,6 +1,7 @@ | |||
4908 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4909 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4910 | 2 | 3 | ||
4912 | 3 | x:parse-xml-fragment("<?xml version='1.0' encoding='UTF-8'?> | 4 | x:parse("<?xml version='1.0' encoding='UTF-8'?> |
4913 | 4 | <!-- Comment-1 --> | 5 | <!-- Comment-1 --> |
4914 | 5 | <?a-pi pi-1?> | 6 | <?a-pi pi-1?> |
4915 | 6 | <!-- Comment-2 --> | 7 | <!-- Comment-2 --> |
4916 | @@ -37,4 +38,7 @@ | |||
4917 | 37 | <?a-pi pi-6?> | 38 | <?a-pi pi-6?> |
4918 | 38 | <!-- Comment-7 --> | 39 | <!-- Comment-7 --> |
4919 | 39 | ", | 40 | ", |
4921 | 40 | "e") | 41 | <opt:options> |
4922 | 42 | <opt:parse-external-parsed-entity/> | ||
4923 | 43 | </opt:options> | ||
4924 | 44 | ) | ||
4925 | 41 | 45 | ||
4926 | === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-15.xq' (properties changed: +x to -x) | |||
4927 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-15.xq 2011-07-15 16:39:51 +0000 | |||
4928 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-15.xq 2012-02-23 17:28:26 +0000 | |||
4929 | @@ -1,3 +1,9 @@ | |||
4930 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4933 | 2 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | |
4934 | 3 | x:parse-xml-fragment("<a/>", "e") | 3 | |
4935 | 4 | x:parse("<a/>", | ||
4936 | 5 | <opt:options> | ||
4937 | 6 | <opt:parse-external-parsed-entity/> | ||
4938 | 7 | </opt:options> | ||
4939 | 8 | ) | ||
4940 | 9 | |||
4941 | 4 | 10 | ||
4942 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.spec' | |||
4943 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.spec 2011-08-10 02:50:23 +0000 | |||
4944 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.spec 1970-01-01 00:00:00 +0000 | |||
4945 | @@ -1,1 +0,0 @@ | |||
4946 | 1 | Error: http://www.zorba-xquery.com/errors:ZXQD0003 | ||
4947 | 2 | 0 | ||
4948 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq' | |||
4949 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq 1970-01-01 00:00:00 +0000 | |||
4950 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq 2012-02-23 17:28:26 +0000 | |||
4951 | @@ -0,0 +1,14 @@ | |||
4952 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4953 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4954 | 3 | |||
4955 | 4 | x:parse("<?xml version='1.0'?> | ||
4956 | 5 | <!DOCTYPE note [ | ||
4957 | 6 | <!ELEMENT note (#PCDATA)> | ||
4958 | 7 | <!ATTLIST note nmt NMTOKENS #REQUIRED> | ||
4959 | 8 | ]> | ||
4960 | 9 | <note nmt='aaa'/> | ||
4961 | 10 | ", | ||
4962 | 11 | <opt:options> | ||
4963 | 12 | <opt:DTD-validate/> | ||
4964 | 13 | </opt:options> | ||
4965 | 14 | ) | ||
4966 | 0 | 15 | ||
4967 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq' | |||
4968 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq 2011-08-10 02:50:23 +0000 | |||
4969 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-16.xq 1970-01-01 00:00:00 +0000 | |||
4970 | @@ -1,8 +0,0 @@ | |||
4971 | 1 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; | ||
4972 | 2 | |||
4973 | 3 | x:parse-xml-fragment("<?xml version='1.0'?> | ||
4974 | 4 | <from1>Jani</from1> | ||
4975 | 5 | <from2>Jani</from2> | ||
4976 | 6 | <from3>Jani</from3> | ||
4977 | 7 | ", | ||
4978 | 8 | "eEdDsSlLwWfF") | ||
4979 | 9 | 0 | ||
4980 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec' | |||
4981 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec 1970-01-01 00:00:00 +0000 | |||
4982 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec 2012-02-23 17:28:26 +0000 | |||
4983 | @@ -0,0 +1,1 @@ | |||
4984 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0006 | ||
4985 | 0 | 2 | ||
4986 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec' | |||
4987 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec 2011-08-10 02:50:23 +0000 | |||
4988 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.spec 1970-01-01 00:00:00 +0000 | |||
4989 | @@ -1,1 +0,0 @@ | |||
4990 | 1 | Error: http://www.zorba-xquery.com/errors:ZXQD0003 | ||
4991 | 2 | 0 | ||
4992 | === added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.xq' | |||
4993 | --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.xq 1970-01-01 00:00:00 +0000 | |||
4994 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-17.xq 2012-02-23 17:28:26 +0000 | |||
4995 | @@ -0,0 +1,18 @@ | |||
4996 | 1 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; | ||
4997 | 2 | import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; | ||
4998 | 3 | |||
4999 | 4 | z:parse("<root><a id='0'> | ||
5000 | 5 | 0 |
The branch doesn't compile on my machine: zorba_simplesto re.dir/ functions/ func_nodes. cpp.o wcandillon/ tmp/parse- fragment/ build/src/ functions/ func_nodes. cpp:26: wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:211: error: stray '#' in program wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: stray '#' in program wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: stray '#' in program wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:211: error: expected ',' or '...' before numeric constant wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:211: error: expected `)' before ';' token wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:211: error: ISO C++ forbids declaration of 'aAttr' with no type wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:211: error: expected ';' before ')' token wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: expected ',' or '...' before numeric constant wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: expected `)' before ';' token wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: ISO C++ forbids declaration of 'aLangAttr' with no type wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: expected unqualified-id before 'const' wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: ISO C++ forbids declaration of 'aRequestLang' with no type wcandillon/ tmp/parse- fragment/ build/src/ runtime/ nodes/nodes. h:212: error: expected ';' before ')' token
[ 0%] Building CXX object src/CMakeFiles/
In file included from /Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
/Users/
@Matthias, are you experiencing the same issue on mac?