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 | MESSAGE(STATUS "Looking for LibXml2") |
6 | FIND_PACKAGE(LibXml2) |
7 | IF(LIBXML2_FOUND) |
8 | - MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES}) |
9 | - |
10 | - INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) |
11 | - SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES}) |
12 | - SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS}) |
13 | + # Now check LibXml2's version |
14 | + FILE(STRINGS ${LIBXML2_INCLUDE_DIR}/libxml/xmlversion.h LIBXML2_VERSION_TMP REGEX |
15 | + "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\".*\"") |
16 | + STRING(REGEX REPLACE "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\"(.*)\"" "\\1" |
17 | + LIBXML2_VERSION ${LIBXML2_VERSION_TMP}) |
18 | + |
19 | + IF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") |
20 | + MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES}) |
21 | + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) |
22 | + SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES}) |
23 | + SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS}) |
24 | + ELSE(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") |
25 | + MESSAGE(FATAL_ERROR "The libxml2 library version 2.7.0 or higher is required in order to build Zorba.") |
26 | + ENDIF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0") |
27 | + |
28 | ELSE(LIBXML2_FOUND) |
29 | MESSAGE(FATAL_ERROR "The libxml2 library and headers are required in order to build simple store.") |
30 | ENDIF(LIBXML2_FOUND) |
31 | |
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 | |
37 | version 2.2 |
38 | |
39 | + * 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 | + * LibXml2 version 2.7.0 or higher is now required in order to build Zorba. |
41 | * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr) |
42 | * Fixed bug 923015 (clone() not implemented for full-text expressions) |
43 | * No-copy optimization: avoids copying nodes during node-constructor expressions. |
44 | |
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 | URI "http://www.zorba-xquery.com/modules/schema") |
50 | DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1 |
51 | URI "http://www.zorba-xquery.com/modules/string") |
52 | +DECLARE_ZORBA_SCHEMA(FILE xml-options.xsd URI "http://www.zorba-xquery.com/modules/xml-options") |
53 | DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0 |
54 | URI "http://www.zorba-xquery.com/modules/xml") |
55 | DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 |
56 | |
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 | +<?xml version="1.0"?> |
62 | +<!-- |
63 | + - Copyright 2006-2012 The FLWOR Foundation. |
64 | + - |
65 | + - Licensed under the Apache License, Version 2.0 (the "License"); |
66 | + - you may not use this file except in compliance with the License. |
67 | + - You may obtain a copy of the License at |
68 | + - |
69 | + - http://www.apache.org/licenses/LICENSE-2.0 |
70 | + - |
71 | + - Unless required by applicable law or agreed to in writing, software |
72 | + - distributed under the License is distributed on an "AS IS" BASIS, |
73 | + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
74 | + - See the License for the specific language governing permissions and |
75 | + - limitations under the License. |
76 | +--> |
77 | +<schema xmlns="http://www.w3.org/2001/XMLSchema" |
78 | + targetNamespace="http://www.zorba-xquery.com/modules/xml-options" |
79 | + elementFormDefault="qualified" attributeFormDefault="qualified"> |
80 | + |
81 | + <element name="options"> |
82 | + <complexType> |
83 | + <all> |
84 | + |
85 | + <element name="base-uri" minOccurs="0" maxOccurs="1"> |
86 | + <complexType> |
87 | + <attribute name="value" type="anyURI" use="required"/> |
88 | + </complexType> |
89 | + </element> |
90 | + <element name="no-error" minOccurs="0" maxOccurs="1"> |
91 | + <complexType/> |
92 | + </element> |
93 | + <element name="strip-boundary-space" minOccurs="0" maxOccurs="1"> |
94 | + <complexType/> |
95 | + </element> |
96 | + <element name="schema-validate" minOccurs="0" maxOccurs="1"> |
97 | + <complexType> |
98 | + <attribute name="mode" default="strict"> |
99 | + <simpleType> |
100 | + <restriction base="string"> |
101 | + <enumeration value="strict"/> |
102 | + <enumeration value="lax"/> |
103 | + </restriction> |
104 | + </simpleType> |
105 | + </attribute> |
106 | + </complexType> |
107 | + </element> |
108 | + <element name="DTD-validate" minOccurs="0" maxOccurs="1"> |
109 | + <complexType/> |
110 | + </element> |
111 | + <element name="DTD-load" minOccurs="0" maxOccurs="1"> |
112 | + <complexType/> |
113 | + </element> |
114 | + <element name="default-DTD-attributes" minOccurs="0" maxOccurs="1"> |
115 | + <complexType/> |
116 | + </element> |
117 | + <element name="parse-external-parsed-entity" minOccurs="0" maxOccurs="1"> |
118 | + <complexType> |
119 | + <attribute name="skip-root-nodes" use="optional"> |
120 | + <simpleType> |
121 | + <restriction base="int"> |
122 | + <minInclusive value="0"/> |
123 | + </restriction> |
124 | + </simpleType> |
125 | + </attribute> |
126 | + <attribute name="skip-top-level-text-nodes" type="boolean" use="optional"/> |
127 | + </complexType> |
128 | + </element> |
129 | + <element name="substitute-entities" minOccurs="0" maxOccurs="1"> |
130 | + <complexType/> |
131 | + </element> |
132 | + <element name="xinclude-substitutions" minOccurs="0" maxOccurs="1"> |
133 | + <complexType/> |
134 | + </element> |
135 | + <element name="remove-redundant-ns" minOccurs="0" maxOccurs="1"> |
136 | + <complexType/> |
137 | + </element> |
138 | + <element name="no-CDATA" minOccurs="0" maxOccurs="1"> |
139 | + <complexType/> |
140 | + </element> |
141 | + <element name="no-xinclude-nodes" minOccurs="0" maxOccurs="1"> |
142 | + <complexType/> |
143 | + </element> |
144 | + |
145 | + </all> |
146 | + </complexType> |
147 | + </element> |
148 | + |
149 | +</schema> |
150 | |
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 @@ |
155 | -xquery version "1.0"; |
156 | +xquery version "3.0"; |
157 | |
158 | (: |
159 | : Copyright 2006-2010 The FLWOR Foundation. |
160 | @@ -23,13 +23,14 @@ |
161 | : external parsed entities, described by |
162 | : <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed |
163 | : Parsed Entities</a>. The functions can also perform Schema and DTD |
164 | - : validation of the input documents. |
165 | + : validation of the input documents. |
166 | : </p> |
167 | : |
168 | : @see <a href="http://www.w3.org/TR/xml/#wf-entities">XML 1.0 Well-Formed |
169 | : Parsed Entities</a> |
170 | : @see <a href="http://www.w3.org/TR/xpath-functions-30/#func-parse-xml"> |
171 | : fn:parse-xml() function in XPath and XQuery Functions and Operators 3.0</a> |
172 | + : @see <a href="http://xmlsoft.org/html/libxml-parser.html">LibXml2 parser</a> |
173 | : |
174 | : @author Nicolae Brinza |
175 | : @project data processing/data converters |
176 | @@ -37,6 +38,8 @@ |
177 | :) |
178 | module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml"; |
179 | |
180 | +import schema namespace parse-xml-options = "http://www.zorba-xquery.com/modules/xml-options"; |
181 | + |
182 | declare namespace zerr = "http://www.zorba-xquery.com/errors"; |
183 | declare namespace err = "http://www.w3.org/xqt-errors"; |
184 | |
185 | @@ -48,21 +51,65 @@ |
186 | : A function to parse XML files and fragments (i.e. |
187 | : <a href="http://www.w3.org/TR/xml/#wf-entities">external general parsed |
188 | : entities</a>). The functions takes two arguments: the first one is the |
189 | - : string to be parsed and the second argument is a flags string |
190 | - : (eEdDsSlLwWfF]*(;[\p{L}]*)?) selecting the options described below. |
191 | - : <br/> |
192 | - : <br/> |
193 | - : |
194 | - : The convention for the flags is that a lower-case letter enables |
195 | - : an option and the corresponding upper-case letter disables it; specifying |
196 | - : both is an error; specifying neither leaves it implementation-defined |
197 | - : whether the option is enabled or disabled. Specifying the same option twice |
198 | - : is not an error, but specifying inconsistent options (for example "eE") is |
199 | - : a dynamic error. The options are: |
200 | - : |
201 | + : string to be parsed and the second argument is an <options/> element that |
202 | + : passes a list of options to the parsing function. They are described below. |
203 | + : The options element must conform to the xml-options.xsd schema. Some of these |
204 | + : will be passed to the underlying library (LibXml2) and further documentation |
205 | + : for them can be found at <a href="http://xmlsoft.org/html/libxml-parser.html"> |
206 | + : LibXml2 parser</a>. |
207 | + : |
208 | + : The list of available options: |
209 | + : |
210 | : <ul> |
211 | : <li> |
212 | - : eE - enables or disables processing of XML external entities. If the option |
213 | + : <base-uri/> - the element must have a "value" attribute, which will provide |
214 | + : the baseURI that will be used as the baseURI for every node returned by this |
215 | + : function. |
216 | + : </li> |
217 | + : |
218 | + : <li> |
219 | + : <no-error/> - if present, the option will disable fatal error processing. Any |
220 | + : failure to parse or validate the input in the requested manner will result |
221 | + : in the function returning an empty sequence and no error will raised. |
222 | + : </li> |
223 | + : |
224 | + : <li> |
225 | + : <strip-boundary-space/> - if present, it will enable the removal of blank nodes from the input. |
226 | + : </li> |
227 | + : |
228 | + : <li> |
229 | + : <schema-validate/> - if present, it will request that the input string be Schema |
230 | + : validated. The element accepts an attribute named "mode" which can have two |
231 | + : values: "strict and "lax". Enabling the option will produce a result that is |
232 | + : equivalent to processing the input with the option disabled, and then copying |
233 | + : the result using the XQuery "validate strict|lax" expression. This option can not |
234 | + : be used together with either the <DTD-validate/> or the <parse-external-parsed-entity/> |
235 | + : option. Doing so will raise a zerr:ZXQD0003 error. |
236 | + : </li> |
237 | + : |
238 | + : <li> |
239 | + : <DTD-validate/> - the option will enable the DTD-based validation. If this |
240 | + : option is enabled and the input references a DTD, then the input must be a |
241 | + : well-formed and DTD-valid XML document. The <DTD-load/> option must be used for |
242 | + : external DTD files to be loaded. If the option is enabled and the input does |
243 | + : not reference a DTD then the option is ignored. If the option is disabled, the |
244 | + : input is not required to reference a DTD and if it does reference a DTD then |
245 | + : the DTD is ignored for validation purposes. This option can not |
246 | + : be used together with either the <schema-validate/> or the <parse-external-parsed-entity> |
247 | + : option. Doing so will raise a zerr:ZXQD0003 error. |
248 | + : </li> |
249 | + : |
250 | + : <li> |
251 | + : <DTD-load/> - if present, it will enable loading of external DTD files. |
252 | + : </li> |
253 | + : |
254 | + : <li> |
255 | + : <default-DTD-attributes/> - if present, it will enable the default DTD attributes. |
256 | + : </li> |
257 | + : |
258 | + : <li> |
259 | + : <parse-external-parsed-entity/> - if present, it will enable the processing of XML |
260 | + : external entities. If the option |
261 | : is enabled, the input must conform to the syntax extParsedEnt (production |
262 | : [78] in XML 1.0, see <a href="http://www.w3.org/TR/xml/#wf-entities"> |
263 | : Well-Formed Parsed Entities</a>). The result of the function call is a list |
264 | @@ -70,52 +117,45 @@ |
265 | : external entity: that is, elements, processing instructions, comments, and |
266 | : text nodes. CDATA sections and character references are expanded, and |
267 | : adjacent characters are merged so the result contains no adjacent text |
268 | - : nodes. If this option is enabled, none of the options d, s, or l may be |
269 | - : enabled. If the option is disabled, the input must be a well-formed XML |
270 | + : nodes. If the option is disabled, the input must be a well-formed XML |
271 | : document conforming to the Document production |
272 | : (<a href="http://www.w3.org/TR/xml/#sec-well-formed">production [1] in XML 1.0</a>). |
273 | - : </li> |
274 | - : |
275 | - : <li> |
276 | - : dD - enables or disables DTD-based validation. If this option is enabled and |
277 | - : the input references a DTD, then the input must be a well-formed and |
278 | - : DTD-valid XML document. If the option is enabled and the input does not |
279 | - : reference a DTD then the option is ignored. If the option is disabled, the |
280 | - : input is not required to reference a DTD and if it does reference a DTD then |
281 | - : the DTD is ignored for validation purposes (though it will still be read for |
282 | - : purposes such as expanding entity references and identifying ID attributes). |
283 | - : </li> |
284 | - : |
285 | - : <li> |
286 | - : sS - enables or disables strict XSD-based validation. If this option is |
287 | - : enabled, the result is equivalent to processing the input with the option |
288 | - : disabled, and then copying the result using the XQuery "validate strict" |
289 | - : expression. |
290 | - : </li> |
291 | - : |
292 | - : <li> |
293 | - : lL - enables or disables lax XSD-based validation. If this option is enabled, |
294 | - : the result is equivalent to processing the input with the option disabled, |
295 | - : and then copying the result using the XQuery "validate lax " expression. |
296 | - : </li> |
297 | - : |
298 | - : <li> |
299 | - : wW - enables or disables whitespace stripping. If the option is enabled, |
300 | - : any whitespace-only text nodes that remain after any DTD-based or XSD-based |
301 | - : processing are stripped from the input; if it is disabled, such |
302 | - : whitespace-only text nodes are retained. |
303 | - : </li> |
304 | - : |
305 | - : <li> |
306 | - : fF - enables or disables fatal error processing. If fatal error processing |
307 | - : is enabled, then any failure to parse the input in the manner requested |
308 | - : results in a dynamic error. If fatal error processing is disabled, then any |
309 | - : failure to parse the input (and also, in the case of fn:doc, a failure to |
310 | - : obtain the input by dereferencing the supplied URI) results in the function |
311 | - : returning an empty sequence and raising no error. |
312 | - : </li> |
313 | + : This option can not be used together with either the <schema-validate/> or the <DTD-validate/> |
314 | + : option. Doing so will raise a zerr:ZXQD0003 error. |
315 | + : The <parse-external-parsed-entity/> option has two parameters, given by attributes. The first |
316 | + : attribute is "skip-root-nodes" and it can have a non-negative value. Specifying the paramter |
317 | + : tells the parser to skip the given number of root nodes and return only their children. E.g. |
318 | + : skip-root-nodes="1" is equivalent to parse-xml($xml-string)/node()/node() . skip-root-nodes="2" is equivalent |
319 | + : to parse-xml($xml-string)/node()/node()/node() , etc. The second attribute is "skip-top-level-text-nodes" with a |
320 | + : boolean value. Specifying "true" will tell the parser to skip top level text nodes, returning |
321 | + : only the top level elements, comments, PIs, etc. This parameter works in combination with |
322 | + : the "skip-root-nodes" paramter, thus top level text nodes are skipped after "skip-root-nodes" has |
323 | + : been applied. |
324 | + : </li> |
325 | + : |
326 | + : <li> |
327 | + : <substitute-entities/> - if present, it will enable the XML entities substitutions. |
328 | + : </li> |
329 | + : |
330 | + : <li> |
331 | + : <remove-redundant-ns/> - if present, the parser will remove redundant namespaces declarations. |
332 | + : </li> |
333 | + : |
334 | + : <li> |
335 | + : <no-CDATA/> - if present, the parser will merge CDATA nodes as text nodes. |
336 | + : </li> |
337 | + : |
338 | + : <li> |
339 | + : <xinclude-substitutions/> - if present, it will enable the XInclude substitutions. |
340 | + : </li> |
341 | + : |
342 | + : <li> |
343 | + : <no-xinclude-nodes/> - if present, the parser will not generate XInclude START/END nodes. |
344 | + : </li> |
345 | + : |
346 | : </ul> |
347 | : |
348 | + : |
349 | : @param $xml-string The string that holds the XML to be parsed. If empty, |
350 | : the function will return an empty sequence |
351 | : @param $options The options for the parsing |
352 | @@ -131,42 +171,16 @@ |
353 | : document has not passed it. |
354 | : |
355 | : @error err:XQDY0027 The error will be raised if schema validation was enabled |
356 | - : and the input document has not passed it. |
357 | - : |
358 | - :) |
359 | -declare function parse-xml:parse-xml-fragment( |
360 | - $xml-string as xs:string?, |
361 | - $options as xs:string) as node()* external; |
362 | - |
363 | - |
364 | -(:~ |
365 | - : A function to parse XML files and fragments. The behavior is the |
366 | - : same as the parse-xml-fragment with two arguments. |
367 | - : |
368 | - : @param $xml-string The string that holds the XML to be parsed. If empty, |
369 | - : the function will return an empty sequence |
370 | - : @param $base-uri The baseURI that will be used as the baseURI for every |
371 | - : node returned by this function. |
372 | - : @param $options The options for the parsing (see parse-xml-fragment#2) |
373 | - : @return The parsed XML as a document node or a list of nodes, or an empty |
374 | - : sequence. |
375 | - : |
376 | - : @error zerr:ZXQD0003 The error will be raised if the options to the function |
377 | - : are inconsistent. |
378 | - : |
379 | - : @error err:FODC0006 The error will be raised if the input string is not a |
380 | - : valid XML document or fragment (external general parsed |
381 | - : entity) or if DTD validation was enabled and the |
382 | - : document has not passed it. |
383 | - : |
384 | - : @error err:XQDY0027 The error will be raised if schema validation was enabled |
385 | - : and the input document has not passed it. |
386 | - : |
387 | - : @error err:FODC0007 This error will be raised if $base-uri parameter passed |
388 | - : to the function is not a valid absolute URI. |
389 | - : |
390 | - :) |
391 | -declare function parse-xml:parse-xml-fragment( |
392 | - $xml-string as xs:string?, |
393 | - $base-uri as xs:string, |
394 | - $options as xs:string) as node()* external; |
395 | + : and the input document has not passed it or if the parsing options are not |
396 | + : conformant to the xml-options.xsd schema. |
397 | + : |
398 | + : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-03.xq |
399 | + : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-01.xq |
400 | + : @example test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-07.xq |
401 | + : |
402 | + :) |
403 | + |
404 | +declare function parse-xml:parse( |
405 | + $xml-string as xs:string?, |
406 | + $options as element()?) as node()* external; |
407 | + |
408 | |
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 | |
415 | ********************************************************************************/ |
416 | XmlDataManagerImpl::XmlDataManagerImpl() |
417 | - : |
418 | + : |
419 | theDocManager(0), |
420 | theColManager(0), |
421 | theW3CColManager(0) |
422 | @@ -151,7 +151,7 @@ |
423 | DocumentManager* |
424 | XmlDataManagerImpl::getDocumentManager() const |
425 | { |
426 | - if (!theDocManager) |
427 | + if (!theDocManager) |
428 | { |
429 | theDocManager = new DocumentManagerImpl(theContext, theFactory); |
430 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); |
431 | @@ -166,7 +166,7 @@ |
432 | CollectionManager* |
433 | XmlDataManagerImpl::getCollectionManager() const |
434 | { |
435 | - if (!theColManager) |
436 | + if (!theColManager) |
437 | { |
438 | theColManager = new CollectionManagerImpl( |
439 | theContext, |
440 | @@ -185,7 +185,7 @@ |
441 | CollectionManager* |
442 | XmlDataManagerImpl::getW3CCollectionManager() const |
443 | { |
444 | - if (!theW3CColManager) |
445 | + if (!theW3CColManager) |
446 | { |
447 | theW3CColManager = new CollectionManagerImpl( |
448 | theContext, |
449 | @@ -280,7 +280,7 @@ |
450 | ZORBA_DM_TRY |
451 | { |
452 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, |
453 | - "parse-xml-fragment"); |
454 | + "parse"); |
455 | |
456 | // create a streamable string item |
457 | std::vector<ItemSequence_t> lArgs; |
458 | @@ -315,7 +315,7 @@ |
459 | ZORBA_DM_TRY |
460 | { |
461 | Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS, |
462 | - "parse-xml-fragment"); |
463 | + "parse"); |
464 | |
465 | // create a streamable string item |
466 | std::vector<ItemSequence_t> lArgs; |
467 | @@ -382,15 +382,15 @@ |
468 | theDiagnosticHandler = aDiagnosticHandler; |
469 | theUserDiagnosticHandler = true; |
470 | |
471 | - if (theColManager) |
472 | + if (theColManager) |
473 | { |
474 | theColManager->registerDiagnosticHandler(theDiagnosticHandler); |
475 | } |
476 | - if (theDocManager) |
477 | + if (theDocManager) |
478 | { |
479 | theDocManager->registerDiagnosticHandler(theDiagnosticHandler); |
480 | } |
481 | - if (theW3CColManager) |
482 | + if (theW3CColManager) |
483 | { |
484 | theW3CColManager->registerDiagnosticHandler(theDiagnosticHandler); |
485 | } |
486 | @@ -400,17 +400,17 @@ |
487 | /******************************************************************************* |
488 | |
489 | ********************************************************************************/ |
490 | -void XmlDataManagerImpl::registerStemmerProvider(StemmerProvider const *p) |
491 | +void XmlDataManagerImpl::registerStemmerProvider(StemmerProvider const *p) |
492 | { |
493 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) |
494 | - if ( theStemmerProviderWrapper ) |
495 | + if ( theStemmerProviderWrapper ) |
496 | { |
497 | if ( theStemmerProviderWrapper->get_provider() == p ) |
498 | return; |
499 | delete theStemmerProviderWrapper; |
500 | theStemmerProviderWrapper = nullptr; |
501 | } |
502 | - if ( p ) |
503 | + if ( p ) |
504 | { |
505 | theStemmerProviderWrapper = new internal::StemmerProviderWrapper( p ); |
506 | theStore->setStemmerProvider( theStemmerProviderWrapper ); |
507 | @@ -421,7 +421,7 @@ |
508 | /******************************************************************************* |
509 | |
510 | ********************************************************************************/ |
511 | -void XmlDataManagerImpl::registerTokenizerProvider(TokenizerProvider const *p) |
512 | +void XmlDataManagerImpl::registerTokenizerProvider(TokenizerProvider const *p) |
513 | { |
514 | SYNC_CODE(AutoLatch lock(theLatch, Latch::WRITE);) |
515 | theStore->setTokenizerProvider( p ); |
516 | |
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 | </diagnostic> |
522 | |
523 | <diagnostic code="ZXQD0003" name="INCONSISTENT_PARSE_FRAGMENT_OPTIONS"> |
524 | - <value>inconsistent options to the parse-xml-fragment() function: $1</value> |
525 | + <value>inconsistent options to the parse-xml() function: $1</value> |
526 | </diagnostic> |
527 | |
528 | <diagnostic code="ZXQD0004" name="INVALID_PARAMETER"> |
529 | @@ -2569,6 +2569,10 @@ |
530 | <entry key="BadXMLDocument_2o"> |
531 | <value>malformed XML document${ at "2"}</value> |
532 | </entry> |
533 | + |
534 | + <entry key="BadXMLNoOpeningTag"> |
535 | + <value>closing tag without matching opening tag</value> |
536 | + </entry> |
537 | |
538 | <entry key="BadXMLForXQDoc_3"> |
539 | <value>can not parse as XML for xqdoc: $3</value> |
540 | @@ -3490,12 +3494,8 @@ |
541 | <value>xqueryx content is empty</value> |
542 | </entry> |
543 | |
544 | - <entry key="ParseFragmentOptionDSLNotAllowed"> |
545 | - <value>if the e option is specified, none of the options d, s, or l may be enabled</value> |
546 | - </entry> |
547 | - |
548 | <entry key="ParseFragmentOptionCombinationNotAllowed"> |
549 | - <value>specifying both $2 and $3 is an error</value> |
550 | + <value>only one of the <schemaValidate/>, <DTDValidate/> or <parseExternalParsedEntity/> options can be specified</value> |
551 | </entry> |
552 | |
553 | </subvalues> |
554 | |
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 | { "ZWST0006", "\"$1\": function caching might not give the intended result because the function is declared as $2" }, |
560 | { "ZXQD0001", "\"$1\": prefix not declared when calling function \"$2\" from $3" }, |
561 | { "ZXQD0002", "\"$1\": $2" }, |
562 | - { "ZXQD0003", "inconsistent options to the parse-xml-fragment() function: $1" }, |
563 | + { "ZXQD0003", "inconsistent options to the parse-xml() function: $1" }, |
564 | { "ZXQD0004", "invalid parameter: $1" }, |
565 | { "ZXQD0005", "key with type $1 not subtype or castable to target type $2 of map ($3)" }, |
566 | { "ZXQD0006", "\"$1\": invalid UTF-8 byte sequence" }, |
567 | @@ -461,6 +461,7 @@ |
568 | { "~BadWordNetPtr_2", "\"$2\": invalid pointer type" }, |
569 | { "~BadXMLDocument_2o", "malformed XML document${ at \"2\"}" }, |
570 | { "~BadXMLForXQDoc_3", "can not parse as XML for xqdoc: $3" }, |
571 | + { "~BadXMLNoOpeningTag", "closing tag without matching opening tag" }, |
572 | { "~BadXQueryVersion", "unsupported XQuery version" }, |
573 | { "~Base64BadChar", "invalid Base64 character" }, |
574 | { "~Base64Equals", "in Base64, '=' must be at the end and followed by one of [AEIMQUYcgkosw048]" }, |
575 | @@ -581,8 +582,7 @@ |
576 | { "~OperationNotDef_23", "$2 not defined for type \"$3\"" }, |
577 | { "~OperationNotPossibleWithTypes_234", "\"$2\": operation not possible with parameters of type \"$3\" and \"$4\"" }, |
578 | { "~OuterForClause11", "\"outer-for\" clause only available in XQuery 1.1 or later" }, |
579 | - { "~ParseFragmentOptionCombinationNotAllowed", "specifying both $2 and $3 is an error" }, |
580 | - { "~ParseFragmentOptionDSLNotAllowed", "if the e option is specified, none of the options d, s, or l may be enabled" }, |
581 | + { "~ParseFragmentOptionCombinationNotAllowed", "only one of the <schemaValidate/>, <DTDValidate/> or <parseExternalParsedEntity/> options can be specified" }, |
582 | { "~ParserInitFailed", "parser initialization failed" }, |
583 | { "~ParserNoCreateTree", "XML tree creation failed" }, |
584 | { "~PromotionImpossible", "promotion not possible" }, |
585 | |
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 | |
591 | |
592 | |
593 | -PlanIter_t fn_zorba_xml_parse_xml_fragment::codegen( |
594 | +PlanIter_t fn_zorba_xml_parse::codegen( |
595 | CompilerCB*, |
596 | static_context* sctx, |
597 | const QueryLoc& loc, |
598 | @@ -46,26 +46,12 @@ |
599 | { |
600 | |
601 | |
602 | - DECL_WITH_KIND(sctx, fn_zorba_xml_parse_xml_fragment, |
603 | - (createQName("http://www.zorba-xquery.com/modules/xml","","parse-xml-fragment"), |
604 | - GENV_TYPESYSTEM.STRING_TYPE_QUESTION, |
605 | - GENV_TYPESYSTEM.STRING_TYPE_ONE, |
606 | - GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), |
607 | - FunctionConsts::FN_ZORBA_XML_PARSE_XML_FRAGMENT_2); |
608 | - |
609 | - } |
610 | - |
611 | - |
612 | - { |
613 | - |
614 | - |
615 | - DECL_WITH_KIND(sctx, fn_zorba_xml_parse_xml_fragment, |
616 | - (createQName("http://www.zorba-xquery.com/modules/xml","","parse-xml-fragment"), |
617 | - GENV_TYPESYSTEM.STRING_TYPE_QUESTION, |
618 | - GENV_TYPESYSTEM.STRING_TYPE_ONE, |
619 | - GENV_TYPESYSTEM.STRING_TYPE_ONE, |
620 | - GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), |
621 | - FunctionConsts::FN_ZORBA_XML_PARSE_XML_FRAGMENT_3); |
622 | + DECL_WITH_KIND(sctx, fn_zorba_xml_parse, |
623 | + (createQName("http://www.zorba-xquery.com/modules/xml","","parse"), |
624 | + GENV_TYPESYSTEM.STRING_TYPE_QUESTION, |
625 | + GENV_TYPESYSTEM.ELEMENT_TYPE_QUESTION, |
626 | + GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR), |
627 | + FunctionConsts::FN_ZORBA_XML_PARSE_2); |
628 | |
629 | } |
630 | |
631 | |
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 | |
637 | |
638 | |
639 | -//fn-zorba-xml:parse-xml-fragment |
640 | -class fn_zorba_xml_parse_xml_fragment : public function |
641 | +//fn-zorba-xml:parse |
642 | +class fn_zorba_xml_parse : public function |
643 | { |
644 | public: |
645 | - fn_zorba_xml_parse_xml_fragment(const signature& sig, FunctionConsts::FunctionKind kind) |
646 | + fn_zorba_xml_parse(const signature& sig, FunctionConsts::FunctionKind kind) |
647 | : |
648 | function(sig, kind) |
649 | { |
650 | |
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 | FN_FORMAT_NUMBER_3, |
656 | FN_FORMAT_INTEGER_2, |
657 | FN_FORMAT_INTEGER_3, |
658 | - FN_ZORBA_XML_PARSE_XML_FRAGMENT_2, |
659 | - FN_ZORBA_XML_PARSE_XML_FRAGMENT_3, |
660 | + FN_ZORBA_XML_PARSE_2, |
661 | FN_PARSE_XML_1, |
662 | FN_PARSE_XML_2, |
663 | FN_SERIALIZE_1, |
664 | |
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 | #define ZORBA_RUNTIME_PARSING_AND_SERIALIZING_FRAGMENT_ISTREAM_H |
670 | |
671 | #include <iostream> |
672 | +#include <libxml/parser.h> |
673 | +#include <store/api/iterator.h> |
674 | |
675 | namespace zorba { |
676 | |
677 | /** |
678 | - * A class to hold an input stream for the parse-xml-fragment function |
679 | - * Author: Zorba Team |
680 | + * A class to hold an input stream for the parse-xml:parse() function |
681 | + * Author: Nicolae Brinza |
682 | */ |
683 | class FragmentIStream : public std::istream |
684 | { |
685 | public: |
686 | + static const unsigned int BUFFER_SIZE = 4096; |
687 | + static const unsigned int LOOKAHEAD_BYTES = 3; // lookahead fetching is implemented, but currently not used |
688 | + static const unsigned int PARSED_NODES_BATCH_SIZE = 1024; |
689 | + |
690 | +public: |
691 | FragmentIStream() |
692 | : |
693 | std::istream(NULL), |
694 | theIss(NULL), |
695 | theStream(NULL), |
696 | theBuffer(NULL), |
697 | - buffer_size(0), |
698 | - current_offset(0) |
699 | + bytes_in_buffer(0), |
700 | + current_offset(0), |
701 | + current_element_depth(0), |
702 | + root_elements_to_skip(0), |
703 | + ctxt(NULL), |
704 | + first_start_doc(true), |
705 | + forced_parser_stop(false), |
706 | + reached_eof(false), |
707 | + parsed_nodes_count(0), |
708 | + children(NULL) |
709 | { |
710 | }; |
711 | |
712 | + bool stream_is_consumed() |
713 | + { |
714 | + return reached_eof && current_offset >= bytes_in_buffer; |
715 | + } |
716 | + |
717 | void reset() |
718 | { |
719 | if (theBuffer) |
720 | + { |
721 | delete[] theBuffer; |
722 | + } |
723 | + |
724 | if (theIss) |
725 | + { |
726 | delete theIss; |
727 | + } |
728 | + |
729 | + if (ctxt) |
730 | + { |
731 | + xmlCtxtReset(ctxt); |
732 | + xmlFreeParserCtxt(ctxt); |
733 | + } |
734 | |
735 | theIss = NULL; |
736 | theStream = NULL; |
737 | theBuffer = NULL; |
738 | - buffer_size = 0; |
739 | + bytes_in_buffer = 0; |
740 | current_offset = 0; |
741 | + current_element_depth = 0; |
742 | + root_elements_to_skip = 0; |
743 | + ctxt = NULL; |
744 | + first_start_doc = true; |
745 | + forced_parser_stop = false; |
746 | + reached_eof = false; |
747 | + parsed_nodes_count = 0; |
748 | + children = NULL; |
749 | } |
750 | |
751 | virtual ~FragmentIStream() |
752 | { |
753 | - if (theBuffer) |
754 | - delete[] theBuffer; |
755 | - if (theIss) |
756 | - delete theIss; |
757 | + reset(); |
758 | } |
759 | |
760 | public: |
761 | std::istringstream* theIss; |
762 | std::istream* theStream; |
763 | char* theBuffer; |
764 | - unsigned long buffer_size; |
765 | + unsigned long bytes_in_buffer; |
766 | unsigned long current_offset; |
767 | + int current_element_depth; |
768 | + int root_elements_to_skip; |
769 | + xmlParserCtxtPtr ctxt; |
770 | + bool first_start_doc; |
771 | + bool forced_parser_stop; |
772 | + bool reached_eof; |
773 | + unsigned int parsed_nodes_count; |
774 | + store::Iterator_t children; |
775 | }; |
776 | |
777 | } |
778 | |
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 | #include "store/api/store.h" |
784 | #include "store/api/item.h" |
785 | #include "store/api/item_factory.h" |
786 | +#include "store/api/load_properties.h" |
787 | |
788 | #include "system/globalenv.h" |
789 | |
790 | #include "types/schema/schema.h" |
791 | #include "types/schema/validate.h" |
792 | |
793 | + |
794 | namespace zorba |
795 | { |
796 | |
797 | /******************************************************************************* |
798 | - 14.9.1 fn-zorba-xml:parse-xml-fragment |
799 | + 14.9.1 fn-zorba-xml:parse |
800 | ********************************************************************************/ |
801 | |
802 | -class ParseXmlFragmentOptions |
803 | -{ |
804 | -public: |
805 | - // all options are false by default, except for enableFatelErrorProcessing which is true |
806 | - bool enableExternalEntitiesProcessing; |
807 | - bool enableDTDValidation; |
808 | - bool enableStrictSchemaValidation; |
809 | - bool enableLaxSchemaValidation; |
810 | - bool enableWhitespaceStripping; |
811 | - bool enableFatelErrorProcessing; |
812 | - |
813 | -public: |
814 | - ParseXmlFragmentOptions() : |
815 | - enableExternalEntitiesProcessing(false), |
816 | - enableDTDValidation(false), |
817 | - enableStrictSchemaValidation(false), |
818 | - enableLaxSchemaValidation(false), |
819 | - enableWhitespaceStripping(false), |
820 | - enableFatelErrorProcessing(true) // only enableFatelErrorProcessing is set to true |
821 | - { |
822 | - } |
823 | - |
824 | - void reset() |
825 | - { |
826 | - enableExternalEntitiesProcessing = false; |
827 | - enableDTDValidation = false; |
828 | - enableStrictSchemaValidation = false; |
829 | - enableLaxSchemaValidation = false; |
830 | - enableWhitespaceStripping = false; |
831 | - enableFatelErrorProcessing = true; // only enableFatelErrorProcessing is set to true |
832 | - } |
833 | - |
834 | - static ParseXmlFragmentOptions parseOptions(const zstring& options, const QueryLoc& loc) |
835 | - { |
836 | - ParseXmlFragmentOptions opt; |
837 | - |
838 | - if (options.find("e") != zstring::npos && options.find("E") != zstring::npos) |
839 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
840 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "e", "E"), ERROR_LOC( loc )); |
841 | - |
842 | - if (options.find("d") != zstring::npos && options.find("D") != zstring::npos) |
843 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
844 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "d", "D"), ERROR_LOC( loc )); |
845 | - |
846 | - if (options.find("s") != zstring::npos && options.find("S") != zstring::npos) |
847 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
848 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "s", "S"), ERROR_LOC( loc )); |
849 | - |
850 | - if (options.find("l") != zstring::npos && options.find("L") != zstring::npos) |
851 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
852 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "l", "L"), ERROR_LOC( loc )); |
853 | - |
854 | - if (options.find("w") != zstring::npos && options.find("W") != zstring::npos) |
855 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
856 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "w", "W"), ERROR_LOC( loc )); |
857 | - |
858 | - if (options.find("f") != zstring::npos && options.find("F") != zstring::npos) |
859 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
860 | - ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed), "f", "F"), ERROR_LOC( loc )); |
861 | - |
862 | - if (options.find("e") != zstring::npos) |
863 | - opt.enableExternalEntitiesProcessing = true; |
864 | - if (options.find("d") != zstring::npos) |
865 | - opt.enableDTDValidation = true; |
866 | - if (options.find("s") != zstring::npos) |
867 | - opt.enableStrictSchemaValidation = true; |
868 | - if (options.find("l") != zstring::npos) |
869 | - opt.enableLaxSchemaValidation = true; |
870 | - if (options.find("w") != zstring::npos) |
871 | - opt.enableWhitespaceStripping = true; |
872 | - if (options.find("f") != zstring::npos) |
873 | - opt.enableFatelErrorProcessing = true; |
874 | - |
875 | - if (options.find("E") != zstring::npos) |
876 | - opt.enableExternalEntitiesProcessing = false; |
877 | - if (options.find("D") != zstring::npos) |
878 | - opt.enableDTDValidation = false; |
879 | - if (options.find("S") != zstring::npos) |
880 | - opt.enableStrictSchemaValidation = false; |
881 | - if (options.find("L") != zstring::npos) |
882 | - opt.enableLaxSchemaValidation = false; |
883 | - if (options.find("W") != zstring::npos) |
884 | - opt.enableWhitespaceStripping = false; |
885 | - if (options.find("F") != zstring::npos) |
886 | - opt.enableFatelErrorProcessing = false; |
887 | - |
888 | - if (opt.enableExternalEntitiesProcessing |
889 | - && |
890 | - (opt.enableDTDValidation || opt.enableStrictSchemaValidation || opt.enableLaxSchemaValidation)) |
891 | - { |
892 | - throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
893 | - ERROR_PARAMS(ZED(ParseFragmentOptionDSLNotAllowed)), ERROR_LOC( loc )); |
894 | - } |
895 | - |
896 | - return opt; |
897 | - } |
898 | -}; |
899 | - |
900 | +store::Item_t getFirstAttribute(store::Item_t node) |
901 | +{ |
902 | + store::Item_t attr; |
903 | + store::Iterator_t attributes = node->getAttributes(); |
904 | + attributes->open(); |
905 | + attributes->next(attr); |
906 | + attributes->close(); |
907 | + return attr; |
908 | +} |
909 | + |
910 | +void processOptions(store::Item_t item, store::LoadProperties& props, static_context* theSctx, const QueryLoc& loc) |
911 | +{ |
912 | + URI lValidatedBaseUri; |
913 | + store::Item_t child, tempItem; |
914 | + |
915 | + if (item.getp() == NULL) |
916 | + return; |
917 | + |
918 | +#ifndef ZORBA_NO_XMLSCHEMA |
919 | + tempItem = NULL; // used as the effectiveValidationValue()'s typeName |
920 | + Validator::effectiveValidationValue( |
921 | + item, |
922 | + item, |
923 | + tempItem, |
924 | + theSctx->get_typemanager(), |
925 | + ParseConstants::val_strict, |
926 | + theSctx, |
927 | + loc); |
928 | +#endif |
929 | + |
930 | + store::Iterator_t children = item->getChildren(); |
931 | + children->open(); |
932 | + |
933 | + while (children->next(child)) |
934 | + { |
935 | + if (child->getNodeKind() != store::StoreConsts::elementNode) |
936 | + continue; |
937 | + |
938 | + if (child->getNodeName()->getLocalName() == "base-uri") |
939 | + { |
940 | + store::Item_t attr = getFirstAttribute(child); |
941 | + |
942 | + try { |
943 | + lValidatedBaseUri = URI(attr->getStringValue()); |
944 | + } catch (ZorbaException const& /* e */) { |
945 | + throw XQUERY_EXCEPTION( |
946 | + err::FODC0007, |
947 | + ERROR_PARAMS( attr->getStringValue() ), |
948 | + ERROR_LOC( loc ) |
949 | + ); |
950 | + } |
951 | + |
952 | + if (!lValidatedBaseUri.is_absolute()) { |
953 | + throw XQUERY_EXCEPTION( |
954 | + err::FODC0007, |
955 | + ERROR_PARAMS( lValidatedBaseUri.toString() ), |
956 | + ERROR_LOC( loc ) |
957 | + ); |
958 | + } |
959 | + |
960 | + props.setBaseUri(attr->getStringValue()); |
961 | + } |
962 | + else if (child->getNodeName()->getLocalName() == "no-error") |
963 | + props.setNoError(true); |
964 | + else if (child->getNodeName()->getLocalName() == "strip-boundary-space") |
965 | + props.setStripWhitespace(true); |
966 | + else if (child->getNodeName()->getLocalName() == "schema-validate") |
967 | + { |
968 | + store::Item_t attr = getFirstAttribute(child); |
969 | + if (attr->getStringValue() == "strict") |
970 | + props.setSchemaStrictValidate(true); |
971 | + else |
972 | + props.setSchemaLaxValidate(true); |
973 | + } |
974 | + else if (child->getNodeName()->getLocalName() == "DTD-validate") |
975 | + props.setDTDValidate(true); |
976 | + else if (child->getNodeName()->getLocalName() == "DTD-load") |
977 | + props.setDTDLoad(true); |
978 | + else if (child->getNodeName()->getLocalName() == "default-DTD-attributes") |
979 | + props.setDefaultDTDAttributes(true); |
980 | + else if (child->getNodeName()->getLocalName() == "parse-external-parsed-entity") |
981 | + { |
982 | + props.setParseExternalParsedEntity(true); |
983 | + store::Item_t attr; |
984 | + store::Iterator_t attribs = child->getAttributes(); |
985 | + attribs->open(); |
986 | + while (attribs->next(attr)) |
987 | + { |
988 | + if (attr->getNodeName()->getLocalName() == "skip-root-nodes") |
989 | + props.setSkipRootNodes(ztd::aton<xs_int>(attr->getStringValue().c_str())); |
990 | + else if (attr->getNodeName()->getLocalName() == "skip-top-level-text-nodes") |
991 | + props.setSkipTopLevelTextNodes(true); |
992 | + } |
993 | + attribs->close(); |
994 | + } |
995 | + else if (child->getNodeName()->getLocalName() == "substitute-entities") |
996 | + props.setSubstituteEntities(true); |
997 | + else if (child->getNodeName()->getLocalName() == "xinclude-substitutions") |
998 | + props.setXincludeSubstitutions(true); |
999 | + else if (child->getNodeName()->getLocalName() == "remove-redundant-ns") |
1000 | + props.setRemoveRedundantNS(true); |
1001 | + else if (child->getNodeName()->getLocalName() == "no-CDATA") |
1002 | + props.setNoCDATA(true); |
1003 | + else if (child->getNodeName()->getLocalName() == "no-xinclude-nodes") |
1004 | + props.setNoXIncludeNodes(true); |
1005 | + } |
1006 | + |
1007 | + children->close(); |
1008 | + |
1009 | + if (props.getSchemaLaxValidate() + props.getSchemaStrictValidate() + |
1010 | + props.getDTDValidate() + props.getParseExternalParsedEntity() > 1) |
1011 | + { |
1012 | + throw XQUERY_EXCEPTION(zerr::ZXQD0003_INCONSISTENT_PARSE_FRAGMENT_OPTIONS, |
1013 | + ERROR_PARAMS(ZED(ParseFragmentOptionCombinationNotAllowed)), ERROR_LOC( loc )); |
1014 | + } |
1015 | +} |
1016 | |
1017 | /******************************************************************************* |
1018 | |
1019 | @@ -145,8 +165,7 @@ |
1020 | { |
1021 | PlanIteratorState::reset(planState); |
1022 | theFragmentStream.reset(); |
1023 | - theProperties.setEnableDtd(false); |
1024 | - theProperties.setEnableExtParsedEntity(false); |
1025 | + theProperties.reset(); |
1026 | theProperties.setStoreDocument(false); |
1027 | baseUri = ""; |
1028 | docUri = ""; |
1029 | @@ -161,9 +180,7 @@ |
1030 | { |
1031 | store::Store& lStore = GENV.getStore(); |
1032 | zstring docString; |
1033 | - URI lValidatedBaseUri; |
1034 | store::Item_t tempItem; |
1035 | - ParseXmlFragmentOptions parseOptions; |
1036 | bool validated = true; |
1037 | |
1038 | FnParseXmlFragmentIteratorState* state; |
1039 | @@ -182,87 +199,61 @@ |
1040 | state->theFragmentStream.theStream = state->theFragmentStream.theIss; |
1041 | } |
1042 | |
1043 | - // optional base URI argument |
1044 | - if (theChildren.size() == 3) |
1045 | - { |
1046 | - consumeNext(result, theChildren[1].getp(), planState); |
1047 | - ZORBA_ASSERT(result); |
1048 | - |
1049 | - try { |
1050 | - lValidatedBaseUri = URI(result->getStringValue()); |
1051 | - } catch (ZorbaException const& /* e */) { |
1052 | - throw XQUERY_EXCEPTION( |
1053 | - err::FODC0007, |
1054 | - ERROR_PARAMS( result->getStringValue() ), |
1055 | - ERROR_LOC( loc ) |
1056 | - ); |
1057 | - } |
1058 | - |
1059 | - if (!lValidatedBaseUri.is_absolute()) { |
1060 | - throw XQUERY_EXCEPTION( |
1061 | - err::FODC0007, |
1062 | - ERROR_PARAMS( lValidatedBaseUri.toString() ), |
1063 | - ERROR_LOC( loc ) |
1064 | - ); |
1065 | - } |
1066 | - |
1067 | - result->getStringValue2(state->baseUri); |
1068 | - |
1069 | - // read options |
1070 | - consumeNext(tempItem, theChildren[2].getp(), planState); |
1071 | - parseOptions = ParseXmlFragmentOptions::parseOptions(tempItem->getStringValue(), loc); |
1072 | - |
1073 | - } else { |
1074 | - // read options |
1075 | - consumeNext(tempItem, theChildren[1].getp(), planState); |
1076 | - parseOptions = ParseXmlFragmentOptions::parseOptions(tempItem->getStringValue(), loc); |
1077 | - |
1078 | - state->baseUri = theSctx->get_base_uri(); |
1079 | - } |
1080 | + // read options |
1081 | + consumeNext(tempItem, theChildren[1].getp(), planState); |
1082 | + state->theProperties.setBaseUri(theSctx->get_base_uri()); |
1083 | + state->theProperties.setStoreDocument(false); |
1084 | + processOptions(tempItem, state->theProperties, theSctx, loc); |
1085 | |
1086 | // baseURI serves both as the base URI used by the XML parser |
1087 | // to resolve relative entity references within the document, |
1088 | // and as the base URI of the document node that is returned. |
1089 | - state->docUri = state->baseUri; |
1090 | - |
1091 | - // The DTD and ExternalEntitiesProcessing options/props cannot both be true at the same time |
1092 | - if (parseOptions.enableDTDValidation) |
1093 | - state->theProperties.setEnableDtd(true); |
1094 | - if (parseOptions.enableExternalEntitiesProcessing) |
1095 | - state->theProperties.setEnableExtParsedEntity(true); |
1096 | - state->theProperties.setStoreDocument(false); |
1097 | - |
1098 | - if (state->theProperties.getEnableExtParsedEntity()) |
1099 | + state->baseUri = state->theProperties.getBaseUri(); |
1100 | + state->docUri = state->theProperties.getBaseUri(); |
1101 | + |
1102 | + |
1103 | + //////////////////////////////////////////////////////////////////////// |
1104 | + // External parsed entity processing |
1105 | + //////////////////////////////////////////////////////////////////////// |
1106 | + if (state->theProperties.getParseExternalParsedEntity()) |
1107 | { |
1108 | - // state->theFragmentStream.root_elements_to_skip = 0; |
1109 | + state->theFragmentStream.root_elements_to_skip = state->theProperties.getSkipRootNodes(); |
1110 | |
1111 | - while (state->theFragmentStream.theBuffer == NULL |
1112 | - || |
1113 | - state->theFragmentStream.current_offset < state->theFragmentStream.buffer_size) |
1114 | + while ( ! state->theFragmentStream.stream_is_consumed()) |
1115 | { |
1116 | try { |
1117 | result = lStore.loadDocument(state->baseUri, state->docUri, state->theFragmentStream, state->theProperties); |
1118 | } catch (ZorbaException const& e) { |
1119 | - if (parseOptions.enableFatelErrorProcessing) |
1120 | - throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse-xml-fragment()", e.what()), ERROR_LOC( loc )); |
1121 | + if ( ! state->theProperties.getNoError()) |
1122 | + throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse()", e.what()), ERROR_LOC( loc )); |
1123 | else |
1124 | result = NULL; |
1125 | } |
1126 | |
1127 | - if (result != NULL) |
1128 | + if (result == NULL) |
1129 | + continue; |
1130 | + |
1131 | + // Return the children of document node |
1132 | + state->theFragmentStream.children = result->getChildren(); |
1133 | + while (state->theFragmentStream.children->next(result) && result != NULL) |
1134 | { |
1135 | - result->getChildren()->next(result); |
1136 | + if (state->theProperties.getSkipTopLevelTextNodes() && result->getNodeKind() == store::StoreConsts::textNode) |
1137 | + continue; |
1138 | + |
1139 | STACK_PUSH(true, state); |
1140 | } |
1141 | } |
1142 | } |
1143 | + //////////////////////////////////////////////////////////////////////// |
1144 | + // XML document processing |
1145 | + //////////////////////////////////////////////////////////////////////// |
1146 | else // if (!state->theProperties.getEnableExtParsedEntity()) |
1147 | { |
1148 | try { |
1149 | result = lStore.loadDocument(state->baseUri, state->docUri, *state->theFragmentStream.theStream, state->theProperties); |
1150 | } catch (ZorbaException const& e) { |
1151 | - if (parseOptions.enableFatelErrorProcessing) |
1152 | - throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse-xml-fragment()", e.what()), ERROR_LOC( loc )); |
1153 | + if ( ! state->theProperties.getNoError()) |
1154 | + throw XQUERY_EXCEPTION( err::FODC0006, ERROR_PARAMS("parse-xml:parse()", e.what()), ERROR_LOC( loc )); |
1155 | else |
1156 | result = NULL; |
1157 | } |
1158 | @@ -270,7 +261,7 @@ |
1159 | if (result != NULL) |
1160 | { |
1161 | #ifndef ZORBA_NO_XMLSCHEMA |
1162 | - if (parseOptions.enableStrictSchemaValidation || parseOptions.enableLaxSchemaValidation) |
1163 | + if (state->theProperties.getSchemaLaxValidate() || state->theProperties.getSchemaStrictValidate()) |
1164 | { |
1165 | try |
1166 | { |
1167 | @@ -280,13 +271,13 @@ |
1168 | result, |
1169 | tempItem, |
1170 | theSctx->get_typemanager(), |
1171 | - parseOptions.enableLaxSchemaValidation ? ParseConstants::val_lax : ParseConstants::val_strict, |
1172 | + state->theProperties.getSchemaLaxValidate() ? ParseConstants::val_lax : ParseConstants::val_strict, |
1173 | theSctx, |
1174 | this->loc); |
1175 | } |
1176 | catch (ZorbaException& /*e*/) |
1177 | { |
1178 | - if (parseOptions.enableFatelErrorProcessing) |
1179 | + if ( ! state->theProperties.getNoError()) |
1180 | throw; |
1181 | else |
1182 | { |
1183 | @@ -298,11 +289,6 @@ |
1184 | #endif |
1185 | // Ignore the schema validation options if Zorba is built without schema support |
1186 | |
1187 | - if (result != NULL && validated && parseOptions.enableWhitespaceStripping) |
1188 | - { |
1189 | - // TODO: whitespace stripping |
1190 | - } |
1191 | - |
1192 | STACK_PUSH(validated, state); |
1193 | } // if (result != NULL) |
1194 | } // if (state->theProperties.getEnableExtParsedEntity()) |
1195 | |
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 | namespace zorba { |
1202 | |
1203 | /** |
1204 | - * fn-zorba-xml:parse-xml-fragment |
1205 | + * fn-zorba-xml:parse |
1206 | * Author: Zorba Team |
1207 | */ |
1208 | class FnParseXmlFragmentIteratorState : public PlanIteratorState |
1209 | |
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 | state->theIsChildReset = false; |
1215 | |
1216 | CONSUME(startPosItem, 1); |
1217 | - startPos = |
1218 | + startPos = |
1219 | static_cast<xs_long>(startPosItem->getDoubleValue().round().getNumber()) - 1; |
1220 | |
1221 | if (theChildren.size() == 3) |
1222 | { |
1223 | CONSUME(lengthItem, 2); |
1224 | - state->theRemaining = |
1225 | + state->theRemaining = |
1226 | static_cast<xs_long>(lengthItem->getDoubleValue().round().getNumber()); |
1227 | } |
1228 | |
1229 | @@ -1033,7 +1033,7 @@ |
1230 | } |
1231 | |
1232 | bool FnDeepEqualIterator::nextImpl( |
1233 | - store::Item_t& result, |
1234 | + store::Item_t& result, |
1235 | PlanState& planState) const |
1236 | { |
1237 | PlanIteratorState* state; |
1238 | @@ -1061,7 +1061,7 @@ |
1239 | break; |
1240 | } |
1241 | |
1242 | - if (arg1->isFunction() || arg2->isFunction()) |
1243 | + if (arg1->isFunction() || arg2->isFunction()) |
1244 | { |
1245 | throw XQUERY_EXCEPTION( |
1246 | err::FOTY0015, |
1247 | @@ -1161,12 +1161,12 @@ |
1248 | DEFAULT_STACK_INIT(PlanIteratorState, state, planState); |
1249 | |
1250 | |
1251 | - for (;;) |
1252 | + for (;;) |
1253 | { |
1254 | // load items |
1255 | - for (i = 0; i < 2; i++) |
1256 | + for (i = 0; i < 2; i++) |
1257 | { |
1258 | - if (item [i] == NULL) |
1259 | + if (item [i] == NULL) |
1260 | { |
1261 | if (!CONSUME (item[i], i)) |
1262 | { |
1263 | @@ -1178,7 +1178,7 @@ |
1264 | |
1265 | // advance, output |
1266 | order = GENV_STORE.compareNodes(item[0].getp(), item[1].getp()); |
1267 | - if ( order == 0 ) |
1268 | + if ( order == 0 ) |
1269 | { |
1270 | result = item[0]; |
1271 | STACK_PUSH (true, state); |
1272 | @@ -1739,7 +1739,7 @@ |
1273 | planState.theGlobalDynCtx->theDocLoadingUserTime += |
1274 | zorbatm::get_cputime_elapsed(t0user, t1user); |
1275 | |
1276 | - planState.theGlobalDynCtx->theDocLoadingTime += |
1277 | + planState.theGlobalDynCtx->theDocLoadingTime += |
1278 | zorbatm::get_walltime_elapsed(t0, t1); |
1279 | } |
1280 | |
1281 | @@ -1833,7 +1833,7 @@ |
1282 | // Prepare a LoadProperties for loading the stream into the store |
1283 | store::LoadProperties lLoadProperties; |
1284 | lLoadProperties.setStoreDocument(true); |
1285 | - lLoadProperties.setEnableDtd( aSctx->is_feature_set( feature::dtd ) ); |
1286 | + lLoadProperties.setDTDValidate( aSctx->is_feature_set( feature::dtd ) ); |
1287 | |
1288 | // Resolve URI to a stream |
1289 | zstring lErrorMessage; |
1290 | |
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 | |
1296 | <!-- |
1297 | /******************************************************************************* |
1298 | - * 14.9.1 fn:parse-xml-fragment |
1299 | + * 14.9.1 parse-xml:parse |
1300 | ********************************************************************************/ |
1301 | --> |
1302 | <zorba:iterator name="FnParseXmlFragmentIterator"> |
1303 | |
1304 | - <zorba:description author="Zorba Team">fn-zorba-xml:parse-xml-fragment</zorba:description> |
1305 | + <zorba:description author="Zorba Team">fn-zorba-xml:parse</zorba:description> |
1306 | |
1307 | <zorba:function> |
1308 | - <zorba:signature localname="parse-xml-fragment" prefix="fn-zorba-xml"> |
1309 | - <zorba:param>xs:string?</zorba:param> <!-- string to parse --> |
1310 | - <zorba:param>xs:string</zorba:param> <!-- parse-xml options --> |
1311 | + <zorba:signature localname="parse" prefix="fn-zorba-xml"> |
1312 | + <zorba:param>xs:string?</zorba:param> <!-- string to parse --> |
1313 | + <zorba:param>element()?</zorba:param> <!-- parse() options --> |
1314 | <zorba:output>node()*</zorba:output> |
1315 | </zorba:signature> |
1316 | |
1317 | - <zorba:signature localname="parse-xml-fragment" prefix="fn-zorba-xml"> |
1318 | - <zorba:param>xs:string?</zorba:param> <!-- string to parse --> |
1319 | - <zorba:param>xs:string</zorba:param> <!-- baseURI --> |
1320 | - <zorba:param>xs:string</zorba:param> <!-- parse-xml options --> |
1321 | - <zorba:output>node()*</zorba:output> |
1322 | - </zorba:signature> |
1323 | - |
1324 | <zorba:methods> |
1325 | <zorba:accessesDynCtx returnValue="true"/> |
1326 | </zorba:methods> |
1327 | |
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 | { |
1333 | private: |
1334 | bool theStoreDocument; |
1335 | - bool theEnableDtdLoader; |
1336 | - bool theEnableExtParsedEntityLoader; |
1337 | + zstring theBaseUri; |
1338 | + bool theNoError; |
1339 | + bool theStripWhitespace; |
1340 | + bool theSchemaLaxValidate; |
1341 | + bool theSchemaStrictValidate; |
1342 | + bool theDTDValidate; |
1343 | + bool theDTDLoad; |
1344 | + bool theDefaultDTDAttributes; |
1345 | + bool theParseExternalParsedEntity; |
1346 | + unsigned int theSkipRootNodes; |
1347 | + bool theSkipTopLevelTextNodes; |
1348 | + bool theSubstituteEntities; |
1349 | + bool theXincludeSubstitutions; |
1350 | + bool theRemoveRedundantNS; |
1351 | + bool theNoCDATA; |
1352 | + bool theNoXIncludeNodes; |
1353 | |
1354 | public: |
1355 | - LoadProperties() : theStoreDocument(true), theEnableDtdLoader(false), theEnableExtParsedEntityLoader(false) {} |
1356 | - virtual ~LoadProperties() {} |
1357 | + LoadProperties() |
1358 | + : |
1359 | + theStoreDocument(true), |
1360 | + theBaseUri(""), |
1361 | + theNoError(false), |
1362 | + theStripWhitespace(false), |
1363 | + theSchemaLaxValidate(false), |
1364 | + theSchemaStrictValidate(false), |
1365 | + theDTDValidate(false), |
1366 | + theDTDLoad(false), |
1367 | + theDefaultDTDAttributes(false), |
1368 | + theParseExternalParsedEntity(false), |
1369 | + theSkipRootNodes(0), |
1370 | + theSkipTopLevelTextNodes(false), |
1371 | + theSubstituteEntities(false), |
1372 | + theXincludeSubstitutions(false), |
1373 | + theRemoveRedundantNS(false), |
1374 | + theNoCDATA(false), |
1375 | + theNoXIncludeNodes(false) |
1376 | + { |
1377 | + } |
1378 | + |
1379 | + virtual ~LoadProperties() |
1380 | + { |
1381 | + } |
1382 | + |
1383 | + void reset() |
1384 | + { |
1385 | + theStoreDocument = true; |
1386 | + theBaseUri = ""; |
1387 | + theNoError = false; |
1388 | + theStripWhitespace = false; |
1389 | + theSchemaLaxValidate = false; |
1390 | + theSchemaStrictValidate = false; |
1391 | + theDTDValidate = false; |
1392 | + theDTDLoad = false; |
1393 | + theDefaultDTDAttributes = false; |
1394 | + theParseExternalParsedEntity = false; |
1395 | + theSkipRootNodes = 0; |
1396 | + theSkipTopLevelTextNodes = false; |
1397 | + theSubstituteEntities = false; |
1398 | + theXincludeSubstitutions = false; |
1399 | + theRemoveRedundantNS = false; |
1400 | + theNoCDATA = false; |
1401 | + theNoXIncludeNodes = false; |
1402 | + } |
1403 | |
1404 | /** |
1405 | * Set the property storeDocument, it specifies whether the document |
1406 | @@ -60,40 +118,168 @@ |
1407 | return theStoreDocument; |
1408 | } |
1409 | |
1410 | - /** |
1411 | - * Set the property enableDtd, it specifies whether the document's |
1412 | - * dtd should be enabled when loading |
1413 | - */ |
1414 | - void setEnableDtd(bool aEnableDtdLoader) |
1415 | - { |
1416 | - theEnableDtdLoader = aEnableDtdLoader; |
1417 | - } |
1418 | - |
1419 | - /** |
1420 | - * Get the property enableDtd, it specifies whether the document's |
1421 | - * dtd should be enabled when loading |
1422 | - */ |
1423 | - bool getEnableDtd() const |
1424 | - { |
1425 | - return theEnableDtdLoader; |
1426 | - } |
1427 | - |
1428 | - /** |
1429 | - * Set the property enableExtParsedEntity, it specifies whether the document |
1430 | - * should be parsed as an enxternal general parsed entity |
1431 | - */ |
1432 | - void setEnableExtParsedEntity(bool aEnableExtParsedEntityLoader) |
1433 | - { |
1434 | - theEnableExtParsedEntityLoader = aEnableExtParsedEntityLoader; |
1435 | - } |
1436 | - |
1437 | - /** |
1438 | - * Get the property enableDtd, it specifies whether the document |
1439 | - * should be parsed as an enxternal general parsed entity |
1440 | - */ |
1441 | - bool getEnableExtParsedEntity() const |
1442 | - { |
1443 | - return theEnableExtParsedEntityLoader; |
1444 | + // theBaseUri |
1445 | + void setBaseUri(const zstring& aBaseUri) |
1446 | + { |
1447 | + theBaseUri = aBaseUri; |
1448 | + } |
1449 | + zstring getBaseUri() const |
1450 | + { |
1451 | + return theBaseUri; |
1452 | + } |
1453 | + |
1454 | + // theNoError |
1455 | + void setNoError(bool aNoError) |
1456 | + { |
1457 | + theNoError = aNoError; |
1458 | + } |
1459 | + bool getNoError() const |
1460 | + { |
1461 | + return theNoError; |
1462 | + } |
1463 | + |
1464 | + // theStripWhitespace |
1465 | + void setStripWhitespace(bool aStripWhitespace) |
1466 | + { |
1467 | + theStripWhitespace = aStripWhitespace; |
1468 | + } |
1469 | + bool getStripWhitespace() const |
1470 | + { |
1471 | + return theStripWhitespace; |
1472 | + } |
1473 | + |
1474 | + // theSchemaLaxValidate |
1475 | + void setSchemaLaxValidate(bool aSchemaLaxValidate) |
1476 | + { |
1477 | + theSchemaLaxValidate = aSchemaLaxValidate; |
1478 | + if (theSchemaLaxValidate) |
1479 | + theSchemaStrictValidate = false; |
1480 | + } |
1481 | + bool getSchemaLaxValidate() const |
1482 | + { |
1483 | + return theSchemaLaxValidate; |
1484 | + } |
1485 | + |
1486 | + // theSchemaStrictValidate |
1487 | + void setSchemaStrictValidate(bool aSchemaStrictValidate) |
1488 | + { |
1489 | + theSchemaStrictValidate = aSchemaStrictValidate; |
1490 | + if (theSchemaStrictValidate) |
1491 | + theSchemaLaxValidate = false; |
1492 | + } |
1493 | + bool getSchemaStrictValidate() const |
1494 | + { |
1495 | + return theSchemaStrictValidate; |
1496 | + } |
1497 | + |
1498 | + // theDTDValidate |
1499 | + void setDTDValidate(bool aDTDValidate) |
1500 | + { |
1501 | + theDTDValidate = aDTDValidate; |
1502 | + } |
1503 | + bool getDTDValidate() const |
1504 | + { |
1505 | + return theDTDValidate; |
1506 | + } |
1507 | + |
1508 | + // theDTDLoad |
1509 | + void setDTDLoad(bool aDTDLoad) |
1510 | + { |
1511 | + theDTDLoad = aDTDLoad; |
1512 | + } |
1513 | + bool getDTDLoad() const |
1514 | + { |
1515 | + return theDTDLoad; |
1516 | + } |
1517 | + |
1518 | + // theDefaultDTDAttributes |
1519 | + void setDefaultDTDAttributes(bool aDefaultDTDAttributes) |
1520 | + { |
1521 | + theDefaultDTDAttributes = aDefaultDTDAttributes; |
1522 | + } |
1523 | + bool getDefaultDTDAttributes() const |
1524 | + { |
1525 | + return theDefaultDTDAttributes; |
1526 | + } |
1527 | + |
1528 | + // theParseExternalParsedEntity |
1529 | + void setParseExternalParsedEntity(bool aParseExternalParsedEntity) |
1530 | + { |
1531 | + theParseExternalParsedEntity = aParseExternalParsedEntity; |
1532 | + } |
1533 | + bool getParseExternalParsedEntity() const |
1534 | + { |
1535 | + return theParseExternalParsedEntity; |
1536 | + } |
1537 | + |
1538 | + // theSkipRootNodes |
1539 | + void setSkipRootNodes(unsigned int aSkipRootNodes) |
1540 | + { |
1541 | + theSkipRootNodes = aSkipRootNodes; |
1542 | + } |
1543 | + unsigned int getSkipRootNodes() const |
1544 | + { |
1545 | + return theSkipRootNodes; |
1546 | + } |
1547 | + |
1548 | + // theSkipTopLevelTextNodes |
1549 | + void setSkipTopLevelTextNodes(bool aSkipTopLevelTextNodes) |
1550 | + { |
1551 | + theSkipTopLevelTextNodes = aSkipTopLevelTextNodes; |
1552 | + } |
1553 | + bool getSkipTopLevelTextNodes() const |
1554 | + { |
1555 | + return theSkipTopLevelTextNodes; |
1556 | + } |
1557 | + |
1558 | + // theSubstituteEntities |
1559 | + void setSubstituteEntities(bool aSubstituteEntities) |
1560 | + { |
1561 | + theSubstituteEntities = aSubstituteEntities; |
1562 | + } |
1563 | + bool getSubstituteEntities() const |
1564 | + { |
1565 | + return theSubstituteEntities; |
1566 | + } |
1567 | + |
1568 | + // theXincludeSubstitutions |
1569 | + void setXincludeSubstitutions(bool aXincludeSubstitutions) |
1570 | + { |
1571 | + theXincludeSubstitutions = aXincludeSubstitutions; |
1572 | + } |
1573 | + bool getXincludeSubstitutions() const |
1574 | + { |
1575 | + return theXincludeSubstitutions; |
1576 | + } |
1577 | + |
1578 | + // theRemoveRedundantNS |
1579 | + void setRemoveRedundantNS(bool aRemoveRedundantNS) |
1580 | + { |
1581 | + theRemoveRedundantNS = aRemoveRedundantNS; |
1582 | + } |
1583 | + bool getRemoveRedundantNS() const |
1584 | + { |
1585 | + return theRemoveRedundantNS; |
1586 | + } |
1587 | + |
1588 | + // theNoCDATA |
1589 | + void setNoCDATA(bool aNoCDATA) |
1590 | + { |
1591 | + theNoCDATA = aNoCDATA; |
1592 | + } |
1593 | + bool getNoCDATA() const |
1594 | + { |
1595 | + return theNoCDATA; |
1596 | + } |
1597 | + |
1598 | + // theNoXIncludeNodes |
1599 | + void setNoXIncludeNodes(bool aNoXIncludeNodes) |
1600 | + { |
1601 | + theNoXIncludeNodes = aNoXIncludeNodes; |
1602 | + } |
1603 | + bool getNoXIncludeNodes() const |
1604 | + { |
1605 | + return theNoXIncludeNodes; |
1606 | } |
1607 | }; |
1608 | |
1609 | |
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 | #include <libxml/xmlstring.h> |
1615 | |
1616 | #include "store/api/item.h" |
1617 | +#include "store/api/load_properties.h" |
1618 | |
1619 | #include "store/naive/ordpath.h" |
1620 | |
1621 | @@ -74,6 +75,8 @@ |
1622 | static const ulong INPUT_CHUNK_SIZE = 8192; |
1623 | |
1624 | protected: |
1625 | + const store::LoadProperties & theLoadProperties; |
1626 | + |
1627 | xmlParserCtxtPtr ctxt; |
1628 | |
1629 | xmlSAXHandler theSaxHandler; |
1630 | @@ -89,12 +92,19 @@ |
1631 | |
1632 | bool theBuildDataGuide; |
1633 | |
1634 | + |
1635 | +protected: |
1636 | + void applyLoadOptions(const store::LoadProperties& props, xmlParserCtxtPtr ctxt); |
1637 | + |
1638 | + |
1639 | public: |
1640 | XmlLoader( |
1641 | BasicItemFactory* factory, |
1642 | XQueryDiagnostics* xqueryDiagnostics, |
1643 | + const store::LoadProperties& loadProperties, |
1644 | bool dataguide) |
1645 | : |
1646 | + theLoadProperties(loadProperties), |
1647 | ctxt(NULL), |
1648 | theFactory(factory), |
1649 | theXQueryDiagnostics(xqueryDiagnostics), |
1650 | @@ -156,6 +166,7 @@ |
1651 | FastXmlLoader( |
1652 | BasicItemFactory* factory, |
1653 | XQueryDiagnostics* xqueryDiagnostics, |
1654 | + const store::LoadProperties& loadProperties, |
1655 | bool dataguide); |
1656 | |
1657 | ~FastXmlLoader(); |
1658 | @@ -245,6 +256,7 @@ |
1659 | FragmentXmlLoader( |
1660 | BasicItemFactory* factory, |
1661 | XQueryDiagnostics* xqueryDiagnostics, |
1662 | + const store::LoadProperties& loadProperties, |
1663 | bool dataguide); |
1664 | |
1665 | ~FragmentXmlLoader(); |
1666 | @@ -255,7 +267,15 @@ |
1667 | std::istream& xmlStream); |
1668 | |
1669 | protected: |
1670 | - static void checkStopParsing(void* ctx); |
1671 | + bool fillBuffer(FragmentIStream* theFragmentStream); |
1672 | + |
1673 | + unsigned long getCurrentInputOffset() const; |
1674 | + |
1675 | + static void checkStopParsing(void* ctx, bool force = false); |
1676 | + |
1677 | + static void startDocument(void * ctx); |
1678 | + |
1679 | + static void endDocument(void * ctx); |
1680 | |
1681 | static void startElement( |
1682 | void * ctx, |
1683 | @@ -295,7 +315,6 @@ |
1684 | |
1685 | protected: |
1686 | FragmentIStream* theFragmentStream; |
1687 | - int element_depth; |
1688 | }; |
1689 | |
1690 | /******************************************************************************* |
1691 | @@ -331,8 +350,6 @@ |
1692 | zorba::Stack<PathStepInfo> thePathStack; |
1693 | std::stack<NsBindingsContext*> theBindingsStack; |
1694 | |
1695 | - bool theParseExtParsedEntity; |
1696 | - |
1697 | #ifdef DATAGUIDE |
1698 | zorba::Stack<ElementGuideNode*> theGuideStack; |
1699 | #endif |
1700 | @@ -341,8 +358,8 @@ |
1701 | DtdXmlLoader( |
1702 | BasicItemFactory* factory, |
1703 | XQueryDiagnostics* xqueryDiagnostics, |
1704 | - bool dataguide, |
1705 | - bool parseExtParsedEntity); |
1706 | + const store::LoadProperties& loadProperties, |
1707 | + bool dataguide); |
1708 | |
1709 | ~DtdXmlLoader(); |
1710 | |
1711 | |
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 | /******************************************************************************* |
1717 | |
1718 | ********************************************************************************/ |
1719 | +void XmlLoader::applyLoadOptions(const store::LoadProperties& props, xmlParserCtxtPtr ctxt) |
1720 | +{ |
1721 | + int options = 0; |
1722 | + |
1723 | + if (props.getStripWhitespace()) |
1724 | + options |= XML_PARSE_NOBLANKS; |
1725 | + |
1726 | + if (props.getDTDValidate()) |
1727 | + options |= XML_PARSE_DTDVALID; |
1728 | + |
1729 | + if (props.getDTDLoad()) |
1730 | + options |= XML_PARSE_DTDLOAD; |
1731 | + |
1732 | + if (props.getDefaultDTDAttributes()) |
1733 | + options |= XML_PARSE_DTDATTR; |
1734 | + |
1735 | + if (props.getSubstituteEntities()) |
1736 | + options |= XML_PARSE_NOENT; |
1737 | + |
1738 | + if (props.getXincludeSubstitutions()) |
1739 | + options |= XML_PARSE_XINCLUDE; |
1740 | + |
1741 | + if (props.getRemoveRedundantNS()) |
1742 | + options |= XML_PARSE_NSCLEAN; |
1743 | + |
1744 | + if (props.getNoCDATA()) |
1745 | + options |= XML_PARSE_NOCDATA; |
1746 | + |
1747 | + if (props.getNoXIncludeNodes()) |
1748 | + options |= XML_PARSE_NOXINCNODE; |
1749 | + |
1750 | + xmlCtxtUseOptions(ctxt, options); |
1751 | +} |
1752 | + |
1753 | + |
1754 | +/******************************************************************************* |
1755 | + |
1756 | +********************************************************************************/ |
1757 | FragmentXmlLoader::FragmentXmlLoader( |
1758 | BasicItemFactory* factory, |
1759 | XQueryDiagnostics* xqueryDiagnostics, |
1760 | + const store::LoadProperties& loadProperties, |
1761 | bool dataguide) |
1762 | : |
1763 | - FastXmlLoader(factory, xqueryDiagnostics, dataguide) |
1764 | + FastXmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide) |
1765 | { |
1766 | theOrdPath.init(); |
1767 | |
1768 | @@ -109,6 +148,39 @@ |
1769 | { |
1770 | } |
1771 | |
1772 | +bool FragmentXmlLoader::fillBuffer(FragmentIStream* theFragmentStream) |
1773 | +{ |
1774 | + if (theFragmentStream->ctxt->input->length > 0 && theFragmentStream->current_offset < theFragmentStream->bytes_in_buffer) |
1775 | + { |
1776 | + memmove(theFragmentStream->theBuffer, theFragmentStream->theBuffer + theFragmentStream->current_offset, |
1777 | + theFragmentStream->bytes_in_buffer - theFragmentStream->current_offset); |
1778 | + } |
1779 | + theFragmentStream->bytes_in_buffer -= theFragmentStream->current_offset; |
1780 | + |
1781 | + std::streamsize numChars = readPacket(*theFragmentStream->theStream, theFragmentStream->theBuffer + theFragmentStream->bytes_in_buffer, |
1782 | + FragmentIStream::BUFFER_SIZE+FragmentIStream::LOOKAHEAD_BYTES - theFragmentStream->bytes_in_buffer); |
1783 | + if (numChars < 0) |
1784 | + { |
1785 | + theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR)); |
1786 | + throw 0; // the argument to throw is not used by the catch clause |
1787 | + } |
1788 | + |
1789 | + if (theFragmentStream->theStream->eof()) |
1790 | + theFragmentStream->reached_eof = true; |
1791 | + |
1792 | + theFragmentStream->bytes_in_buffer += numChars; |
1793 | + theFragmentStream->current_offset = 0; |
1794 | + theFragmentStream->ctxt->input->base = (xmlChar*)(theFragmentStream->theBuffer); |
1795 | + theFragmentStream->ctxt->input->length = (theFragmentStream->bytes_in_buffer < FragmentIStream::BUFFER_SIZE? theFragmentStream->bytes_in_buffer : FragmentIStream::BUFFER_SIZE); |
1796 | + theFragmentStream->ctxt->input->cur = theFragmentStream->ctxt->input->base; |
1797 | + theFragmentStream->ctxt->input->end = theFragmentStream->ctxt->input->base + theFragmentStream->ctxt->input->length; |
1798 | + theFragmentStream->ctxt->checkIndex = 0; |
1799 | + |
1800 | + if (theFragmentStream->bytes_in_buffer < FragmentIStream::BUFFER_SIZE+FragmentIStream::LOOKAHEAD_BYTES) |
1801 | + theFragmentStream->theBuffer[theFragmentStream->bytes_in_buffer] = 0; |
1802 | + |
1803 | + return !theFragmentStream->stream_is_consumed(); |
1804 | +} |
1805 | |
1806 | store::Item_t FragmentXmlLoader::loadXml( |
1807 | const zstring& baseUri, |
1808 | @@ -138,88 +210,105 @@ |
1809 | { |
1810 | theFragmentStream = static_cast<FragmentIStream*>(&stream); |
1811 | |
1812 | - // Prepare the input buffer |
1813 | + // Prepare the input buffer and the parser context |
1814 | if (theFragmentStream->theBuffer == NULL) |
1815 | { |
1816 | - theFragmentStream->theStream->seekg(0, std::ios::end); |
1817 | - std::streamoff fileSize = theFragmentStream->theStream->tellg(); |
1818 | - theFragmentStream->theStream->seekg(0, std::ios::beg); |
1819 | - |
1820 | - theFragmentStream->theBuffer = new char[static_cast<unsigned int>(fileSize+1)]; |
1821 | - theFragmentStream->theBuffer[fileSize] = 0; |
1822 | - |
1823 | - std::streamsize numChars = readPacket(*theFragmentStream->theStream, |
1824 | - theFragmentStream->theBuffer, |
1825 | - fileSize); |
1826 | - theFragmentStream->buffer_size = numChars; |
1827 | - if (numChars < 0) |
1828 | - { |
1829 | - theXQueryDiagnostics-> |
1830 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR)); |
1831 | - |
1832 | - abortload(); |
1833 | - return NULL; |
1834 | - } |
1835 | - else if (numChars == 0) |
1836 | - { |
1837 | - theXQueryDiagnostics-> |
1838 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, |
1839 | - ERROR_PARAMS(ZED(NoInputData)))); |
1840 | - |
1841 | - abortload(); |
1842 | - return NULL; |
1843 | - } |
1844 | - } |
1845 | - |
1846 | - // Create the LibXml parser context |
1847 | - ctxt = xmlCreatePushParserCtxt(&theSaxHandler, this, NULL, 0, 0); |
1848 | - // ctxt = xmlCreate |
1849 | - if (ctxt == NULL) |
1850 | - { |
1851 | - theXQueryDiagnostics-> |
1852 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
1853 | - ERROR_PARAMS(ZED(ParserInitFailed)))); |
1854 | - |
1855 | - abortload(); |
1856 | - return NULL; |
1857 | - } |
1858 | - |
1859 | - // Delete the initial empty input stream |
1860 | - xmlFreeInputStream(inputPop(ctxt)); |
1861 | - |
1862 | - // Create the LibXml parser input |
1863 | - xmlParserInputPtr input = xmlNewInputStream(ctxt); |
1864 | - if (input == NULL) |
1865 | - { |
1866 | - theXQueryDiagnostics-> |
1867 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
1868 | - ERROR_PARAMS(ZED(ParserInitFailed)))); |
1869 | - |
1870 | - abortload(); |
1871 | - return NULL; |
1872 | - } |
1873 | - |
1874 | - // Initialize the parser input |
1875 | - input->filename = (const char*)(xmlCanonicPath((const xmlChar*)theDocUri.c_str())); |
1876 | - input->base = (xmlChar*)(theFragmentStream->theBuffer + theFragmentStream->current_offset); |
1877 | - input->cur = (xmlChar*)(theFragmentStream->theBuffer + theFragmentStream->current_offset); |
1878 | - input->length = theFragmentStream->buffer_size - theFragmentStream->current_offset; |
1879 | - input->end = input->base + input->length; |
1880 | - xmlPushInput(ctxt, input); |
1881 | - |
1882 | - // Reset element_depth |
1883 | - element_depth = 0; |
1884 | - |
1885 | - // Finally call the parser |
1886 | - if (xmlParseExtParsedEnt(ctxt)==-1) |
1887 | - { |
1888 | - theXQueryDiagnostics-> |
1889 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
1890 | - ERROR_PARAMS(ZED(ParserNoCreateTree)))); |
1891 | - |
1892 | - abortload(); |
1893 | - return NULL; |
1894 | - } |
1895 | + // Allocate input buffer |
1896 | + theFragmentStream->theBuffer = new char[FragmentIStream::BUFFER_SIZE + FragmentIStream::LOOKAHEAD_BYTES+1]; |
1897 | + theFragmentStream->theBuffer[FragmentIStream::BUFFER_SIZE + FragmentIStream::LOOKAHEAD_BYTES] = 0; |
1898 | + |
1899 | + // Create the LibXml parser context |
1900 | + theFragmentStream->ctxt = xmlCreatePushParserCtxt(&theSaxHandler, this, NULL, 0, 0); |
1901 | + if (theFragmentStream->ctxt == NULL) |
1902 | + { |
1903 | + theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) ))); |
1904 | + throw 0; // the argument to throw is not used by the catch clause |
1905 | + } |
1906 | + |
1907 | + // Apply parser options |
1908 | + applyLoadOptions(theLoadProperties, theFragmentStream->ctxt); |
1909 | + |
1910 | + // Delete the initial empty input stream |
1911 | + xmlFreeInputStream(inputPop(theFragmentStream->ctxt)); |
1912 | + |
1913 | + // Create the LibXml parser input |
1914 | + xmlParserInputPtr input = xmlNewInputStream(theFragmentStream->ctxt); |
1915 | + if (input == NULL) |
1916 | + { |
1917 | + theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) ))); |
1918 | + throw 0; // the argument to throw is not used by the catch clause |
1919 | + } |
1920 | + |
1921 | + // Initialize the parser input (only filename and the pointer to the current char) |
1922 | + theFragmentStream->theBuffer[0] = ' '; // This assignment is needed for LibXml2-2.7.6, which tries to read the buffer when xmlPushInput() is called |
1923 | + input->cur = (xmlChar*)(theFragmentStream->theBuffer); |
1924 | + input->filename = (const char*)(xmlCanonicPath((const xmlChar*)theDocUri.c_str())); |
1925 | + xmlPushInput(theFragmentStream->ctxt, input); |
1926 | + } |
1927 | + |
1928 | + theFragmentStream->ctxt->userData = this; // the loader has changed, update the address |
1929 | + theFragmentStream->ctxt->disableSAX = false; // xmlStopParser() sets disableSAX to true |
1930 | + theFragmentStream->parsed_nodes_count = 0; |
1931 | + theFragmentStream->forced_parser_stop = false; |
1932 | + |
1933 | + if ( ! theFragmentStream->first_start_doc) |
1934 | + { |
1935 | + theFragmentStream->ctxt->instate = XML_PARSER_CONTENT; |
1936 | + FragmentXmlLoader::startDocument(theFragmentStream->ctxt->userData); |
1937 | + } |
1938 | + |
1939 | + while ( ! theFragmentStream->forced_parser_stop && fillBuffer(theFragmentStream)) |
1940 | + { |
1941 | + // 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 | + |
1943 | + // This case needs to be handled here, otherwise LibXml2 will segfault |
1944 | + if (theFragmentStream->ctxt->input->cur[0] == '<' && |
1945 | + theFragmentStream->ctxt->input->cur[1] == '/' && |
1946 | + theFragmentStream->current_element_depth == 0) |
1947 | + { |
1948 | + theXQueryDiagnostics->add_error(theDocUri.empty() ? |
1949 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ))) : |
1950 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLNoOpeningTag ), theDocUri)) |
1951 | + ); |
1952 | + throw 0; // the argument to throw is not used by the catch clause |
1953 | + } |
1954 | + |
1955 | + xmlParseChunk(theFragmentStream->ctxt, (const char*)theFragmentStream->ctxt->input->cur, |
1956 | + theFragmentStream->ctxt->input->length, 0); |
1957 | + |
1958 | + if (theFragmentStream->ctxt->input->base == (xmlChar*)(theFragmentStream->theBuffer) |
1959 | + && |
1960 | + theFragmentStream->current_offset < getCurrentInputOffset()) |
1961 | + theFragmentStream->current_offset = getCurrentInputOffset(); |
1962 | + |
1963 | + // 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 | + if (theXQueryDiagnostics->errors().empty() |
1965 | + && |
1966 | + theFragmentStream->current_offset == 0) |
1967 | + { |
1968 | + // The input has been reset by xmlStopParser() |
1969 | + theFragmentStream->ctxt->input->base = (xmlChar*)(theFragmentStream->theBuffer); |
1970 | + theFragmentStream->ctxt->input->cur = theFragmentStream->ctxt->input->base; |
1971 | + xmlParseCharData(theFragmentStream->ctxt, 0); |
1972 | + } |
1973 | + |
1974 | + if ( ! theXQueryDiagnostics->errors().empty()) |
1975 | + throw 0; // the argument to throw is not used by the catch clause |
1976 | + } |
1977 | + |
1978 | + // this happens when there are tags that have not been closed |
1979 | + if (theFragmentStream->stream_is_consumed() |
1980 | + && |
1981 | + theFragmentStream->current_element_depth > 0) |
1982 | + { |
1983 | + theXQueryDiagnostics->add_error(theDocUri.empty() ? |
1984 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : |
1985 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) |
1986 | + ); |
1987 | + throw 0; |
1988 | + } |
1989 | + |
1990 | + FragmentXmlLoader::endDocument(theFragmentStream->ctxt->userData); // this would not be called otherwise |
1991 | } |
1992 | catch (...) |
1993 | { |
1994 | @@ -228,49 +317,36 @@ |
1995 | return NULL; |
1996 | } |
1997 | |
1998 | - bool ok = ctxt->wellFormed != 0; |
1999 | - |
2000 | // The doc may be well formed, but it may have other kinds of errors, e.g., unresolved ns prefixes. |
2001 | if (!theXQueryDiagnostics->errors().empty()) |
2002 | { |
2003 | abortload(); |
2004 | return NULL; |
2005 | } |
2006 | - else if (!ok ) |
2007 | + else if ( ! theFragmentStream->ctxt->wellFormed) |
2008 | { |
2009 | - if (!theDocUri.empty()) |
2010 | - { |
2011 | - theXQueryDiagnostics-> |
2012 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2013 | - ERROR_PARAMS(ZED(BadXMLDocument_2o), theDocUri))); |
2014 | - } |
2015 | - else |
2016 | - { |
2017 | - theXQueryDiagnostics-> |
2018 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2019 | - ERROR_PARAMS(ZED(BadXMLDocument_2o)))); |
2020 | - } |
2021 | + theXQueryDiagnostics->add_error(theDocUri.empty() ? |
2022 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : |
2023 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) |
2024 | + ); |
2025 | abortload(); |
2026 | return NULL; |
2027 | } |
2028 | - else if ( ctxt->lastError.code != XML_ERR_OK ) |
2029 | + else if (theFragmentStream->ctxt->lastError.code != XML_ERR_OK) |
2030 | { |
2031 | - if ( ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE || |
2032 | - ctxt->lastError.code != XML_ERR_NO_DTD ) |
2033 | + if (theFragmentStream->ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE |
2034 | + || |
2035 | + theFragmentStream->ctxt->lastError.code != XML_ERR_NO_DTD ) |
2036 | { |
2037 | - theXQueryDiagnostics-> |
2038 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2039 | - ERROR_PARAMS(ZED(BadXMLDocument_2o)))); |
2040 | - |
2041 | + theXQueryDiagnostics->add_error(theDocUri.empty() ? |
2042 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ))) : |
2043 | + NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri)) |
2044 | + ); |
2045 | abortload(); |
2046 | return NULL; |
2047 | } |
2048 | } |
2049 | |
2050 | - xmlCtxtReset(ctxt); |
2051 | - xmlFreeParserCtxt(ctxt); |
2052 | - ctxt = NULL; |
2053 | - |
2054 | thePathStack.pop(); |
2055 | assert(thePathStack.empty()); |
2056 | |
2057 | @@ -280,23 +356,59 @@ |
2058 | return resultNode; |
2059 | } |
2060 | |
2061 | - |
2062 | -void FragmentXmlLoader::checkStopParsing(void* ctx) |
2063 | -{ |
2064 | - FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2065 | - ZORBA_LOADER_CHECK_ERROR(loader); |
2066 | - |
2067 | - if (loader.element_depth == 0) |
2068 | - { |
2069 | - /* if (loader.ctxt->inputNr <= 1) |
2070 | - loader.theFragmentStream->current_offset = loader.theFragmentStream->buffer_size; |
2071 | - else */ |
2072 | - loader.theFragmentStream->current_offset += (loader.ctxt->input->cur - loader.ctxt->input->base) |
2073 | - + loader.ctxt->input->consumed; |
2074 | - xmlStopParser(loader.ctxt); |
2075 | - } |
2076 | -} |
2077 | - |
2078 | +unsigned long FragmentXmlLoader::getCurrentInputOffset() const |
2079 | +{ |
2080 | + unsigned long offset = theFragmentStream->ctxt->input->cur |
2081 | + - theFragmentStream->ctxt->input->base |
2082 | + + theFragmentStream->ctxt->input->consumed; |
2083 | + |
2084 | + return offset; |
2085 | +} |
2086 | + |
2087 | +void FragmentXmlLoader::checkStopParsing(void* ctx, bool force) |
2088 | +{ |
2089 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2090 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2091 | + |
2092 | + unsigned long offset = loader.getCurrentInputOffset(); |
2093 | + |
2094 | + if (force |
2095 | + || |
2096 | + loader.theFragmentStream->current_element_depth == 0 |
2097 | + || |
2098 | + (offset >= loader.theFragmentStream->bytes_in_buffer |
2099 | + && |
2100 | + loader.theFragmentStream->reached_eof) |
2101 | + || |
2102 | + (loader.theFragmentStream->current_element_depth <= loader.theFragmentStream->root_elements_to_skip |
2103 | + && |
2104 | + loader.theFragmentStream->parsed_nodes_count >= FragmentIStream::PARSED_NODES_BATCH_SIZE)) |
2105 | + { |
2106 | + loader.theFragmentStream->current_offset = offset; |
2107 | + xmlStopParser(loader.theFragmentStream->ctxt); |
2108 | + loader.theFragmentStream->ctxt->errNo = XML_SCHEMAV_MISC; // fake error to force stopping |
2109 | + loader.theFragmentStream->forced_parser_stop = true; |
2110 | + } |
2111 | + |
2112 | + loader.theFragmentStream->parsed_nodes_count++; |
2113 | +} |
2114 | + |
2115 | +void FragmentXmlLoader::startDocument(void * ctx) |
2116 | +{ |
2117 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2118 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2119 | + FastXmlLoader::startDocument(ctx); |
2120 | + if (loader.theFragmentStream->first_start_doc) |
2121 | + { |
2122 | + loader.theFragmentStream->first_start_doc = false; |
2123 | + FragmentXmlLoader::checkStopParsing(ctx, true); |
2124 | + } |
2125 | +} |
2126 | + |
2127 | +void FragmentXmlLoader::endDocument(void * ctx) |
2128 | +{ |
2129 | + FastXmlLoader::endDocument(ctx); |
2130 | +} |
2131 | |
2132 | void FragmentXmlLoader::startElement( |
2133 | void * ctx, |
2134 | @@ -309,27 +421,34 @@ |
2135 | int nb_defaulted, |
2136 | const xmlChar ** attributes) |
2137 | { |
2138 | - FastXmlLoader::startElement(ctx, localname, prefix, URI, nb_namespaces, namespaces, nb_attributes, nb_defaulted, attributes); |
2139 | - |
2140 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2141 | ZORBA_LOADER_CHECK_ERROR(loader); |
2142 | - loader.element_depth++; |
2143 | + loader.theFragmentStream->current_element_depth++; |
2144 | + if (loader.theFragmentStream->current_element_depth > loader.theFragmentStream->root_elements_to_skip) |
2145 | + { |
2146 | + const xmlChar** nsTab = namespaces; |
2147 | + |
2148 | + if (loader.theFragmentStream->current_element_depth == loader.theFragmentStream->root_elements_to_skip + 1) |
2149 | + { |
2150 | + nsTab = loader.theFragmentStream->ctxt->nsTab; |
2151 | + nb_namespaces = loader.theFragmentStream->ctxt->nsNr/2; |
2152 | + } |
2153 | + |
2154 | + FastXmlLoader::startElement(ctx, localname, prefix, URI, nb_namespaces, nsTab, nb_attributes, nb_defaulted, attributes); |
2155 | + } |
2156 | } |
2157 | |
2158 | - |
2159 | void FragmentXmlLoader::endElement( |
2160 | void * ctx, |
2161 | const xmlChar * localname, |
2162 | const xmlChar * prefix, |
2163 | const xmlChar * URI) |
2164 | { |
2165 | - FastXmlLoader::endElement(ctx, localname, prefix, URI); |
2166 | - |
2167 | FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2168 | ZORBA_LOADER_CHECK_ERROR(loader); |
2169 | - |
2170 | - loader.element_depth--; |
2171 | - |
2172 | + if (loader.theFragmentStream->current_element_depth > loader.theFragmentStream->root_elements_to_skip) |
2173 | + FastXmlLoader::endElement(ctx, localname, prefix, URI); |
2174 | + loader.theFragmentStream->current_element_depth--; |
2175 | checkStopParsing(ctx); |
2176 | } |
2177 | |
2178 | @@ -338,7 +457,10 @@ |
2179 | const xmlChar * ch, |
2180 | int len) |
2181 | { |
2182 | - FastXmlLoader::characters(ctx, ch, len); |
2183 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2184 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2185 | + if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) |
2186 | + FastXmlLoader::characters(ctx, ch, len); |
2187 | checkStopParsing(ctx); |
2188 | } |
2189 | |
2190 | @@ -347,7 +469,10 @@ |
2191 | void * ctx, |
2192 | const xmlChar * value) |
2193 | { |
2194 | - FastXmlLoader::comment(ctx, value); |
2195 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2196 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2197 | + if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) |
2198 | + FastXmlLoader::comment(ctx, value); |
2199 | checkStopParsing(ctx); |
2200 | } |
2201 | |
2202 | @@ -357,7 +482,10 @@ |
2203 | const xmlChar * value, |
2204 | int len) |
2205 | { |
2206 | - FastXmlLoader::cdataBlock(ctx, value, len); |
2207 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2208 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2209 | + if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) |
2210 | + FastXmlLoader::cdataBlock(ctx, value, len); |
2211 | checkStopParsing(ctx); |
2212 | } |
2213 | |
2214 | @@ -367,7 +495,10 @@ |
2215 | const xmlChar * target, |
2216 | const xmlChar * data) |
2217 | { |
2218 | - FastXmlLoader::processingInstruction(ctx, target, data); |
2219 | + FragmentXmlLoader& loader = *(static_cast<FragmentXmlLoader*>(ctx)); |
2220 | + ZORBA_LOADER_CHECK_ERROR(loader); |
2221 | + if (loader.theFragmentStream->current_element_depth >= loader.theFragmentStream->root_elements_to_skip) |
2222 | + FastXmlLoader::processingInstruction(ctx, target, data); |
2223 | checkStopParsing(ctx); |
2224 | } |
2225 | |
2226 | @@ -378,14 +509,13 @@ |
2227 | DtdXmlLoader::DtdXmlLoader( |
2228 | BasicItemFactory* factory, |
2229 | XQueryDiagnostics* xqueryDiagnostics, |
2230 | - bool dataguide, |
2231 | - bool parseExtParsedEntity) |
2232 | + const store::LoadProperties& loadProperties, |
2233 | + bool dataguide) |
2234 | : |
2235 | - XmlLoader(factory, xqueryDiagnostics, dataguide), |
2236 | + XmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide), |
2237 | theTree(NULL), |
2238 | theRootNode(NULL), |
2239 | - theNodeStack(2048), |
2240 | - theParseExtParsedEntity(parseExtParsedEntity) |
2241 | + theNodeStack(2048) |
2242 | { |
2243 | theOrdPath.init(); |
2244 | |
2245 | @@ -511,10 +641,7 @@ |
2246 | Return the number of bytes actually read, throw an exception if any I/O |
2247 | error occured. |
2248 | ********************************************************************************/ |
2249 | -std::streamsize DtdXmlLoader::readPacket( |
2250 | - std::istream& stream, |
2251 | - char* buf, |
2252 | - std::streamoff size) |
2253 | +std::streamsize DtdXmlLoader::readPacket(std::istream& stream, char* buf, std::streamoff size) |
2254 | { |
2255 | try |
2256 | { |
2257 | @@ -626,23 +753,26 @@ |
2258 | } |
2259 | |
2260 | // Set the LibXml DTD validation options |
2261 | + /* |
2262 | int options = XML_PARSE_COMPACT; |
2263 | options |= XML_PARSE_DTDVALID; |
2264 | options |= XML_PARSE_DTDLOAD; |
2265 | + */ |
2266 | //options |= XML_PARSE_SAX1; |
2267 | //xmlSAXDefaultVersion(1); |
2268 | |
2269 | + // xmlCtxtUseOptions(ctxt, options); |
2270 | + |
2271 | xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; |
2272 | xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; |
2273 | |
2274 | - xmlCtxtUseOptions(ctxt, options); |
2275 | + // Apply loader options |
2276 | + applyLoadOptions(theLoadProperties, ctxt); |
2277 | |
2278 | if ( xmlParseDocument(ctxt)==-1 ) |
2279 | { |
2280 | // std::cout << " xmlParseDocument: Error: Unable to create tree: " << ctxt->lastError.message << std::endl; |
2281 | - theXQueryDiagnostics-> |
2282 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2283 | - ERROR_PARAMS(ZED(ParserNoCreateTree)))); |
2284 | + theXQueryDiagnostics->add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,ERROR_PARAMS( ZED( ParserNoCreateTree ) ))); |
2285 | abortload(); |
2286 | return NULL; |
2287 | } |
2288 | @@ -667,15 +797,21 @@ |
2289 | { |
2290 | if (!theDocUri.empty()) |
2291 | { |
2292 | - theXQueryDiagnostics-> |
2293 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2294 | - ERROR_PARAMS(ZED(BadXMLDocument_2o), theDocUri))); |
2295 | + theXQueryDiagnostics->add_error( |
2296 | + NEW_ZORBA_EXCEPTION( |
2297 | + zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2298 | + ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri ) |
2299 | + ) |
2300 | + ); |
2301 | } |
2302 | else |
2303 | { |
2304 | - theXQueryDiagnostics-> |
2305 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2306 | - ERROR_PARAMS(ZED(BadXMLDocument_2o)))); |
2307 | + theXQueryDiagnostics->add_error( |
2308 | + NEW_ZORBA_EXCEPTION( |
2309 | + zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2310 | + ERROR_PARAMS( ZED( BadXMLDocument_2o ) ) |
2311 | + ) |
2312 | + ); |
2313 | } |
2314 | |
2315 | abortload(); |
2316 | @@ -691,9 +827,12 @@ |
2317 | if ( ctxt->lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE || |
2318 | ctxt->lastError.code != XML_ERR_NO_DTD ) |
2319 | { |
2320 | - theXQueryDiagnostics-> |
2321 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2322 | - ERROR_PARAMS(ZED(BadXMLDocument_2o)))); |
2323 | + theXQueryDiagnostics->add_error( |
2324 | + NEW_ZORBA_EXCEPTION( |
2325 | + zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2326 | + ERROR_PARAMS( ZED( BadXMLDocument_2o ) ) |
2327 | + ) |
2328 | + ); |
2329 | abortload(); |
2330 | return NULL; |
2331 | |
2332 | @@ -704,10 +843,12 @@ |
2333 | xmlDoc *doc = ctxt->myDoc; |
2334 | if (doc == NULL) |
2335 | { |
2336 | - theXQueryDiagnostics-> |
2337 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2338 | - ERROR_PARAMS(ZED(ParserNoCreateTree)))); |
2339 | - |
2340 | + theXQueryDiagnostics->add_error( |
2341 | + NEW_ZORBA_EXCEPTION( |
2342 | + zerr::ZSTR0021_LOADER_PARSING_ERROR, |
2343 | + ERROR_PARAMS( ZED( ParserNoCreateTree ) ) |
2344 | + ) |
2345 | + ); |
2346 | abortload(); |
2347 | return NULL; |
2348 | } |
2349 | @@ -859,8 +1000,9 @@ |
2350 | } |
2351 | catch (...) |
2352 | { |
2353 | - loader.theXQueryDiagnostics-> |
2354 | - add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR)); |
2355 | + loader.theXQueryDiagnostics->add_error( |
2356 | + NEW_ZORBA_EXCEPTION( zerr::ZXQP0003_INTERNAL_ERROR ) |
2357 | + ); |
2358 | } |
2359 | } |
2360 | |
2361 | |
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 | FastXmlLoader::FastXmlLoader( |
2367 | BasicItemFactory* factory, |
2368 | XQueryDiagnostics* xqueryDiagnostics, |
2369 | + const store::LoadProperties& loadProperties, |
2370 | bool dataguide) |
2371 | : |
2372 | - XmlLoader(factory, xqueryDiagnostics, dataguide), |
2373 | + XmlLoader(factory, xqueryDiagnostics, loadProperties, dataguide), |
2374 | theTree(NULL), |
2375 | theRootNode(NULL), |
2376 | theNodeStack(2048) |
2377 | @@ -298,6 +299,9 @@ |
2378 | static_cast<int>(numChars), |
2379 | docUri.c_str()); |
2380 | |
2381 | + // Apply loader options |
2382 | + applyLoadOptions(theLoadProperties, ctxt); |
2383 | + |
2384 | if (ctxt == NULL) |
2385 | { |
2386 | theXQueryDiagnostics-> |
2387 | |
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 | std::cerr << "Reference: " << (*iter).second |
2393 | << "is still in the nodes to references map" << std::endl; |
2394 | } |
2395 | - ZORBA_FATAL(0, theNodeToReferencesMap.size() + |
2396 | + ZORBA_FATAL(0, theNodeToReferencesMap.size() + |
2397 | " node references still in the nodes to references map"); |
2398 | } |
2399 | |
2400 | @@ -360,7 +360,7 @@ |
2401 | RefNodeMap::iterator end = theReferencesToNodeMap.end(); |
2402 | for (; iter != end; ++iter) |
2403 | { |
2404 | - std::cerr << "Reference: " << (*iter).first |
2405 | + std::cerr << "Reference: " << (*iter).first |
2406 | << "is still in the references to nodes map" << std::endl; |
2407 | } |
2408 | ZORBA_FATAL(0, theReferencesToNodeMap.size() + |
2409 | @@ -486,18 +486,20 @@ |
2410 | XmlLoader* SimpleStore::getXmlLoader(XQueryDiagnostics* aXQueryDiagnostics, |
2411 | const store::LoadProperties& loadProperties) |
2412 | { |
2413 | - if (loadProperties.getEnableExtParsedEntity()) |
2414 | + if (loadProperties.getParseExternalParsedEntity()) |
2415 | return new FragmentXmlLoader(theItemFactory, |
2416 | aXQueryDiagnostics, |
2417 | + loadProperties, |
2418 | store::Properties::instance()->buildDataguide()); |
2419 | - else if (loadProperties.getEnableDtd()) |
2420 | + else if (loadProperties.getDTDValidate()) |
2421 | return new DtdXmlLoader(theItemFactory, |
2422 | aXQueryDiagnostics, |
2423 | - store::Properties::instance()->buildDataguide(), |
2424 | - loadProperties.getEnableExtParsedEntity()); |
2425 | + loadProperties, |
2426 | + store::Properties::instance()->buildDataguide()); |
2427 | else |
2428 | return new FastXmlLoader(theItemFactory, |
2429 | aXQueryDiagnostics, |
2430 | + loadProperties, |
2431 | store::Properties::instance()->buildDataguide()); |
2432 | } |
2433 | |
2434 | @@ -983,7 +985,7 @@ |
2435 | return NULL; |
2436 | |
2437 | store::Collection_t collection; |
2438 | - if (theCollections->get(aName, collection, aDynamicCollection)) |
2439 | + if (theCollections->get(aName, collection, aDynamicCollection)) |
2440 | { |
2441 | return collection; |
2442 | } |
2443 | @@ -1311,7 +1313,7 @@ |
2444 | Computes the Structural Reference for the given node. |
2445 | ********************************************************************************/ |
2446 | bool SimpleStore::getStructuralInformation( |
2447 | - store::Item_t& result, |
2448 | + store::Item_t& result, |
2449 | const store::Item* node) |
2450 | { |
2451 | #ifdef TEXT_ORDPATH |
2452 | @@ -1351,7 +1353,7 @@ |
2453 | |
2454 | /******************************************************************************* |
2455 | Computes the reference of the given node. |
2456 | - |
2457 | + |
2458 | @param node XDM node |
2459 | @return the identifier as an item of type xs:anyURI |
2460 | ********************************************************************************/ |
2461 | @@ -1384,7 +1386,7 @@ |
2462 | |
2463 | /******************************************************************************* |
2464 | Returns the node which is identified by the given reference. |
2465 | - |
2466 | + |
2467 | @param reference an xs:anyURI item |
2468 | @result the node identified by the reference, or NULL if no node with the given |
2469 | reference exists |
2470 | @@ -1413,7 +1415,7 @@ |
2471 | |
2472 | /******************************************************************************* |
2473 | Returns whether a reference has already been generated for the given node. |
2474 | - |
2475 | + |
2476 | @param item XDM node |
2477 | @return whether a reference has already been generated for the given node. |
2478 | ********************************************************************************/ |
2479 | @@ -1425,7 +1427,7 @@ |
2480 | |
2481 | /******************************************************************************* |
2482 | Removes a node from the reference-to-nodes and nodes-to-references maps. |
2483 | - |
2484 | + |
2485 | @param node XDM node |
2486 | @return whether the node was registered or not. |
2487 | ********************************************************************************/ |
2488 | |
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 | |
2494 | |
2495 | bool NodeXQType::is_subtype( |
2496 | - const TypeManager* tm, |
2497 | + const TypeManager* tm, |
2498 | const NodeXQType& supertype, |
2499 | const QueryLoc& loc) const |
2500 | { |
2501 | @@ -443,7 +443,7 @@ |
2502 | |
2503 | |
2504 | bool NodeXQType::is_supertype( |
2505 | - const TypeManager* tm, |
2506 | + const TypeManager* tm, |
2507 | const store::Item* subitem, |
2508 | const QueryLoc& loc) const |
2509 | { |
2510 | @@ -488,14 +488,30 @@ |
2511 | } |
2512 | } |
2513 | |
2514 | - if (m_node_kind != store::StoreConsts::elementNode && |
2515 | - m_node_kind != store::StoreConsts::attributeNode) |
2516 | + // document-node( E ) matches any document node that contains exactly one element |
2517 | + // node, optionally accompanied by one or more comment and processing instruction |
2518 | + // nodes, if E is an ElementTest or SchemaElementTest that matches the element node. |
2519 | + bool is_element_test = ( |
2520 | + m_node_kind == store::StoreConsts::documentNode && |
2521 | + m_content_type != NULL && |
2522 | + m_content_type->type_kind() == XQType::NODE_TYPE_KIND && |
2523 | + dynamic_cast<const NodeXQType*>(m_content_type.getp())->m_schema_test == false); |
2524 | + |
2525 | + if (m_node_kind != store::StoreConsts::elementNode && |
2526 | + m_node_kind != store::StoreConsts::attributeNode && |
2527 | + !is_element_test) |
2528 | return true; |
2529 | |
2530 | if (m_content_type == NULL || |
2531 | m_content_type->type_kind() == XQType::ANY_TYPE_KIND) |
2532 | return true; |
2533 | |
2534 | + if (is_element_test) |
2535 | + { |
2536 | + xqtref_t documentNodeType = tm->create_value_type(subitem, loc); |
2537 | + return TypeOps::is_subtype(tm, *documentNodeType, *this); |
2538 | + } |
2539 | + |
2540 | xqtref_t subContentType = tm->create_named_type(subitem->getType(), |
2541 | TypeConstants::QUANT_ONE, |
2542 | loc, |
2543 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2549 | +<from1>Jani</from1> |
2550 | \ No newline at end of file |
2551 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2557 | + |
2558 | + <from1>Jani1</from1> |
2559 | + <from2>Jani2</from2> |
2560 | + <from3>Jani3</from3> |
2561 | + |
2562 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2568 | +Jani1Jani2Jani3 |
2569 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2575 | +<root> |
2576 | + <root2> |
2577 | + <from1>Jani1</from1> |
2578 | + </root2> |
2579 | + <root2> |
2580 | + <from2>Jani2</from2> |
2581 | + </root2> |
2582 | + <root2> |
2583 | + <from3>Jani3</from3> |
2584 | + </root2> |
2585 | +</root> |
2586 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2592 | + |
2593 | + <root2> |
2594 | + <from1>Jani1</from1> |
2595 | + </root2> |
2596 | + <root2> |
2597 | + <from2>Jani2</from2> |
2598 | + </root2> |
2599 | + <root2> |
2600 | + <from3>Jani3</from3> |
2601 | + </root2> |
2602 | + |
2603 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2609 | + |
2610 | + <from1>Jani1</from1> |
2611 | + |
2612 | + <from2>Jani2</from2> |
2613 | + |
2614 | + <from3>Jani3</from3> |
2615 | + |
2616 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2622 | +Jani1Jani2Jani3 |
2623 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2629 | +<root><from1>Jani1</from1></root> |
2630 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2636 | +<from1>Jani1</from1> |
2637 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2643 | +Jani1 |
2644 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2650 | + |
2651 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2657 | +Jani1 |
2658 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2664 | +<from1>Jani1</from1> |
2665 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2671 | +Jani1 |
2672 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2678 | +Jani1 |
2679 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2685 | +Jani1 |
2686 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2692 | +root3 text<from1>Jani1</from1> |
2693 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2699 | +Jani1 |
2700 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2706 | +<level1> |
2707 | + <level2> |
2708 | + <level3> |
2709 | + <level4>level4 text</level4> |
2710 | + </level3> |
2711 | + </level2> |
2712 | +</level1> |
2713 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2719 | + |
2720 | + <level2> |
2721 | + <level3> |
2722 | + <level4>level4 text</level4> |
2723 | + </level3> |
2724 | + </level2> |
2725 | + |
2726 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2732 | + |
2733 | + <level3> |
2734 | + <level4>level4 text</level4> |
2735 | + </level3> |
2736 | + |
2737 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2743 | + |
2744 | + <level4>level4 text</level4> |
2745 | + |
2746 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2752 | +level4 text |
2753 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2759 | + |
2760 | + <level4>level4 text</level4> |
2761 | + level3 end |
2762 | + |
2763 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2769 | +<level1> |
2770 | + level1 text start |
2771 | + <level2> |
2772 | + level2 text start |
2773 | + <level3> |
2774 | + level3 text start |
2775 | + <level4>level4 text</level4> |
2776 | + level3 text end |
2777 | + </level3> |
2778 | + level2 text end |
2779 | + </level2> |
2780 | + level1 text end |
2781 | +</level1> |
2782 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2788 | + |
2789 | + level1 text start |
2790 | + <level2> |
2791 | + level2 text start |
2792 | + <level3> |
2793 | + level3 text start |
2794 | + <level4>level4 text</level4> |
2795 | + level3 text end |
2796 | + </level3> |
2797 | + level2 text end |
2798 | + </level2> |
2799 | + level1 text end |
2800 | + |
2801 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2807 | + |
2808 | + level2 text start |
2809 | + <level3> |
2810 | + level3 text start |
2811 | + <level4>level4 text</level4> |
2812 | + level3 text end |
2813 | + </level3> |
2814 | + level2 text end |
2815 | + |
2816 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2822 | + |
2823 | + level3 text start |
2824 | + <level4>level4 text</level4> |
2825 | + level3 text end |
2826 | + |
2827 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2833 | +level4 text |
2834 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2840 | + |
2841 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2847 | + |
2848 | +level0 text |
2849 | +<level1> |
2850 | + level1 text start |
2851 | + <level2> |
2852 | + level2 text start |
2853 | + <level3> |
2854 | + level3 text start |
2855 | + <level4>level4 text</level4> |
2856 | + level3 text end |
2857 | + </level3> |
2858 | + level2 text end |
2859 | + </level2> |
2860 | + level1 text end |
2861 | +</level1> |
2862 | +level0 text |
2863 | +<level1> |
2864 | + level1 text start |
2865 | + <level2> |
2866 | + level2 text start |
2867 | + <level3> |
2868 | + level3 text start |
2869 | + <level4>level4 text</level4> |
2870 | + level3 text end |
2871 | + </level3> |
2872 | + level2 text end |
2873 | + </level2> |
2874 | + level1 text end |
2875 | +</level1> |
2876 | +level0 text |
2877 | +<level1> |
2878 | + level1 text start |
2879 | + <level2> |
2880 | + level2 text start |
2881 | + <level3> |
2882 | + level3 text start |
2883 | + <level4>level4 text</level4> |
2884 | + level3 text end |
2885 | + </level3> |
2886 | + level2 text end |
2887 | + </level2> |
2888 | + level1 text end |
2889 | +</level1> |
2890 | +level0 text |
2891 | +<level1> |
2892 | + level1 text start |
2893 | + <level2> |
2894 | + level2 text start |
2895 | + <level3> |
2896 | + level3 text start |
2897 | + <level4>level4 text</level4> |
2898 | + level3 text end |
2899 | + </level3> |
2900 | + level2 text end |
2901 | + </level2> |
2902 | + level1 text end |
2903 | +</level1> |
2904 | +level0 text |
2905 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2911 | + |
2912 | + level1 text start |
2913 | + <level2> |
2914 | + level2 text start |
2915 | + <level3> |
2916 | + level3 text start |
2917 | + <level4>level4 text</level4> |
2918 | + level3 text end |
2919 | + </level3> |
2920 | + level2 text end |
2921 | + </level2> |
2922 | + level1 text end |
2923 | + |
2924 | + level1 text start |
2925 | + <level2> |
2926 | + level2 text start |
2927 | + <level3> |
2928 | + level3 text start |
2929 | + <level4>level4 text</level4> |
2930 | + level3 text end |
2931 | + </level3> |
2932 | + level2 text end |
2933 | + </level2> |
2934 | + level1 text end |
2935 | + |
2936 | + level1 text start |
2937 | + <level2> |
2938 | + level2 text start |
2939 | + <level3> |
2940 | + level3 text start |
2941 | + <level4>level4 text</level4> |
2942 | + level3 text end |
2943 | + </level3> |
2944 | + level2 text end |
2945 | + </level2> |
2946 | + level1 text end |
2947 | + |
2948 | + level1 text start |
2949 | + <level2> |
2950 | + level2 text start |
2951 | + <level3> |
2952 | + level3 text start |
2953 | + <level4>level4 text</level4> |
2954 | + level3 text end |
2955 | + </level3> |
2956 | + level2 text end |
2957 | + </level2> |
2958 | + level1 text end |
2959 | + |
2960 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
2966 | + |
2967 | + level2 text start |
2968 | + <level3> |
2969 | + level3 text start |
2970 | + <level4>level4 text</level4> |
2971 | + level3 text end |
2972 | + </level3> |
2973 | + level2 text end |
2974 | + |
2975 | + level2 text start |
2976 | + <level3> |
2977 | + level3 text start |
2978 | + <level4>level4 text</level4> |
2979 | + level3 text end |
2980 | + </level3> |
2981 | + level2 text end |
2982 | + |
2983 | + level2 text start |
2984 | + <level3> |
2985 | + level3 text start |
2986 | + <level4>level4 text</level4> |
2987 | + level3 text end |
2988 | + </level3> |
2989 | + level2 text end |
2990 | + |
2991 | + level2 text start |
2992 | + <level3> |
2993 | + level3 text start |
2994 | + <level4>level4 text</level4> |
2995 | + level3 text end |
2996 | + </level3> |
2997 | + level2 text end |
2998 | + |
2999 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3005 | + |
3006 | + level3 text start |
3007 | + <level4>level4 text</level4> |
3008 | + level3 text end |
3009 | + |
3010 | + level3 text start |
3011 | + <level4>level4 text</level4> |
3012 | + level3 text end |
3013 | + |
3014 | + level3 text start |
3015 | + <level4>level4 text</level4> |
3016 | + level3 text end |
3017 | + |
3018 | + level3 text start |
3019 | + <level4>level4 text</level4> |
3020 | + level3 text end |
3021 | + |
3022 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3028 | +level4 textlevel4 textlevel4 textlevel4 text |
3029 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3035 | + |
3036 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3042 | +<doc> |
3043 | + <foo>0</foo> |
3044 | + <foo>1</foo> |
3045 | + <foo>2</foo> |
3046 | + <foo>3</foo> |
3047 | + <foo>4</foo> |
3048 | + <foo>5</foo> |
3049 | + <foo>6</foo> |
3050 | + <foo>7</foo> |
3051 | + <foo>8</foo> |
3052 | + <foo>9</foo> |
3053 | + <foo>10</foo> |
3054 | +</doc> |
3055 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3061 | + |
3062 | + <foo>0</foo> |
3063 | + <foo>1</foo> |
3064 | + <foo>2</foo> |
3065 | + <foo>3</foo> |
3066 | + <foo>4</foo> |
3067 | + <foo>5</foo> |
3068 | + <foo>6</foo> |
3069 | + <foo>7</foo> |
3070 | + <foo>8</foo> |
3071 | + <foo>9</foo> |
3072 | + <foo>10</foo> |
3073 | + |
3074 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3080 | +012345678910 |
3081 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3087 | + |
3088 | +<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 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3095 | +<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 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3102 | +<n1:from1 xmlns:n1="ns" xmlns:m1="ms" xmlns:n2="ns2" xmlns:m2="ms2" xmlns:n3="ns3"><from2>Text from2</from2></n1:from1> |
3103 | \ No newline at end of file |
3104 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3110 | +<from2 xmlns:n1="ns" xmlns:m1="ms" xmlns:n2="ns2" xmlns:m2="ms2" xmlns:n3="ns3">Text from2</from2> |
3111 | \ No newline at end of file |
3112 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3118 | +Text from2 |
3119 | \ No newline at end of file |
3120 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3126 | + |
3127 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3133 | + |
3134 | +level0 text |
3135 | +<level1/> |
3136 | +level0 text |
3137 | +<level1/> |
3138 | +level0 text |
3139 | +<level1/> |
3140 | +level0 text |
3141 | +<level1/> |
3142 | +level0 text |
3143 | +<level1/> |
3144 | +level0 text |
3145 | +<level1/> |
3146 | +level0 text |
3147 | +<level1/> |
3148 | +level0 text |
3149 | +<level1/> |
3150 | +level0 text |
3151 | +<level1/> |
3152 | +level0 text |
3153 | +<level1/> |
3154 | +level0 text |
3155 | +<level1/> |
3156 | +level0 text |
3157 | +<level1/> |
3158 | +level0 text |
3159 | +<level1/> |
3160 | +level0 text |
3161 | +<level1/> |
3162 | +level0 text |
3163 | \ No newline at end of file |
3164 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3170 | +<mediawiki> |
3171 | + <page> |
3172 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
3173 | + |
3174 | + </page> |
3175 | +</mediawiki> |
3176 | + |
3177 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3183 | + |
3184 | + <page> |
3185 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
3186 | + |
3187 | + </page> |
3188 | + |
3189 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3195 | +<mediawiki> |
3196 | + <page> |
3197 | +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab |
3198 | + |
3199 | + </page> |
3200 | +</mediawiki> |
3201 | + |
3202 | |
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 | +<?xml version="1.0" encoding="UTF-8"?> |
3208 | + |
3209 | + <page> |
3210 | +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab |
3211 | + |
3212 | + </page> |
3213 | + |
3214 | |
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 | <?xml version="1.0" encoding="UTF-8"?> |
3227 | <fragment><from1>Jani</from1> |
3228 | <from2>Jani</from2> |
3229 | -<from3>Jani</from3><count>5</count></fragment> |
3230 | \ No newline at end of file |
3231 | +<from3>Jani</from3><count>6</count></fragment> |
3232 | \ No newline at end of file |
3233 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3242 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3243 | + |
3244 | +z:parse("<?xml version='1.0'?><root><from1>Jani</from1></root>", |
3245 | + <opt:options> |
3246 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3247 | + </opt:options> |
3248 | +) |
3249 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3255 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3256 | + |
3257 | +z:parse("<?xml version='1.0'?> |
3258 | +<root> |
3259 | + <from1>Jani1</from1> |
3260 | + <from2>Jani2</from2> |
3261 | + <from3>Jani3</from3> |
3262 | +</root>", |
3263 | + <opt:options> |
3264 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3265 | + </opt:options> |
3266 | +) |
3267 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3273 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3274 | + |
3275 | +z:parse("<?xml version='1.0'?> |
3276 | +<root> |
3277 | + <from1>Jani1</from1> |
3278 | + <from2>Jani2</from2> |
3279 | + <from3>Jani3</from3> |
3280 | +</root>", |
3281 | + <opt:options> |
3282 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3283 | + </opt:options> |
3284 | +) |
3285 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3291 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3292 | + |
3293 | +z:parse("<?xml version='1.0'?> |
3294 | +<root> |
3295 | + <root2> |
3296 | + <from1>Jani1</from1> |
3297 | + </root2> |
3298 | + <root2> |
3299 | + <from2>Jani2</from2> |
3300 | + </root2> |
3301 | + <root2> |
3302 | + <from3>Jani3</from3> |
3303 | + </root2> |
3304 | +</root>", |
3305 | + <opt:options> |
3306 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
3307 | + </opt:options> |
3308 | +) |
3309 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3315 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3316 | + |
3317 | +z:parse("<?xml version='1.0'?> |
3318 | +<root> |
3319 | + <root2> |
3320 | + <from1>Jani1</from1> |
3321 | + </root2> |
3322 | + <root2> |
3323 | + <from2>Jani2</from2> |
3324 | + </root2> |
3325 | + <root2> |
3326 | + <from3>Jani3</from3> |
3327 | + </root2> |
3328 | +</root>", |
3329 | + <opt:options> |
3330 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3331 | + </opt:options> |
3332 | +) |
3333 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3339 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3340 | + |
3341 | +z:parse("<?xml version='1.0'?> |
3342 | +<root> |
3343 | + <root2> |
3344 | + <from1>Jani1</from1> |
3345 | + </root2> |
3346 | + <root2> |
3347 | + <from2>Jani2</from2> |
3348 | + </root2> |
3349 | + <root2> |
3350 | + <from3>Jani3</from3> |
3351 | + </root2> |
3352 | +</root>", |
3353 | + <opt:options> |
3354 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3355 | + </opt:options> |
3356 | +) |
3357 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3363 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3364 | + |
3365 | +z:parse("<?xml version='1.0'?> |
3366 | +<root> |
3367 | + <root2> |
3368 | + <from1>Jani1</from1> |
3369 | + </root2> |
3370 | + <root2> |
3371 | + <from2>Jani2</from2> |
3372 | + </root2> |
3373 | + <root2> |
3374 | + <from3>Jani3</from3> |
3375 | + </root2> |
3376 | +</root>", |
3377 | + <opt:options> |
3378 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3379 | + </opt:options> |
3380 | +) |
3381 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3387 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3388 | + |
3389 | +z:parse("<?xml version='1.0'?> |
3390 | +<root><from1>Jani1</from1></root>", |
3391 | + <opt:options> |
3392 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
3393 | + </opt:options> |
3394 | +) |
3395 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3401 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3402 | + |
3403 | +z:parse("<?xml version='1.0'?> |
3404 | +<root><from1>Jani1</from1></root>", |
3405 | + <opt:options> |
3406 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3407 | + </opt:options> |
3408 | +) |
3409 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3415 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3416 | + |
3417 | +z:parse("<?xml version='1.0'?> |
3418 | +<root><from1>Jani1</from1></root>", |
3419 | + <opt:options> |
3420 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3421 | + </opt:options> |
3422 | +) |
3423 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3429 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3430 | + |
3431 | +z:parse("<?xml version='1.0'?> |
3432 | +<root><from1>Jani1</from1></root>", |
3433 | + <opt:options> |
3434 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3435 | + </opt:options> |
3436 | +) |
3437 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3443 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3444 | + |
3445 | +z:parse("<?xml version='1.0'?> |
3446 | +<root><root2><from1>Jani1</from1></root2></root>", |
3447 | + <opt:options> |
3448 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3449 | + </opt:options> |
3450 | +) |
3451 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3457 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3458 | + |
3459 | +z:parse("<?xml version='1.0'?> |
3460 | +<root><root2><root3><from1>Jani1</from1></root3></root2></root>", |
3461 | + <opt:options> |
3462 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3463 | + </opt:options> |
3464 | +) |
3465 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3471 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3472 | + |
3473 | +z:parse("<?xml version='1.0'?> |
3474 | +<root><root2><root3><from1>Jani1</from1></root3></root2></root>", |
3475 | + <opt:options> |
3476 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
3477 | + </opt:options> |
3478 | +) |
3479 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3485 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3486 | + |
3487 | +z:parse("<?xml version='1.0'?><root>root1 text<root2>root2 text<root3>root3 text<from1>Jani1</from1></root3></root2></root>", |
3488 | + <opt:options> |
3489 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
3490 | + </opt:options> |
3491 | +) |
3492 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3498 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3499 | + |
3500 | +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 | + <opt:options> |
3502 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
3503 | + </opt:options> |
3504 | +) |
3505 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3511 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3512 | + |
3513 | +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 | + <opt:options> |
3515 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3516 | + </opt:options> |
3517 | +) |
3518 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3524 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3525 | + |
3526 | +z:parse("<?xml version='1.0'?> |
3527 | +<root>Jani0<from1>Jani1</from1></root>", |
3528 | + <opt:options> |
3529 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3530 | + </opt:options> |
3531 | +) |
3532 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3538 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3539 | + |
3540 | +z:parse("<?xml version='1.0'?> |
3541 | +<level1> |
3542 | + <level2> |
3543 | + <level3> |
3544 | + <level4>level4 text</level4> |
3545 | + </level3> |
3546 | + </level2> |
3547 | +</level1>", |
3548 | + <opt:options> |
3549 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
3550 | + </opt:options> |
3551 | +) |
3552 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3558 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3559 | + |
3560 | +z:parse("<?xml version='1.0'?> |
3561 | +<level1> |
3562 | + <level2> |
3563 | + <level3> |
3564 | + <level4>level4 text</level4> |
3565 | + </level3> |
3566 | + </level2> |
3567 | +</level1>", |
3568 | + <opt:options> |
3569 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3570 | + </opt:options> |
3571 | +) |
3572 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3578 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3579 | + |
3580 | +z:parse("<?xml version='1.0'?> |
3581 | +<level1> |
3582 | + <level2> |
3583 | + <level3> |
3584 | + <level4>level4 text</level4> |
3585 | + </level3> |
3586 | + </level2> |
3587 | +</level1>", |
3588 | + <opt:options> |
3589 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3590 | + </opt:options> |
3591 | +) |
3592 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3598 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3599 | + |
3600 | +z:parse("<?xml version='1.0'?> |
3601 | +<level1> |
3602 | + <level2> |
3603 | + <level3> |
3604 | + <level4>level4 text</level4> |
3605 | + </level3> |
3606 | + </level2> |
3607 | +</level1>", |
3608 | + <opt:options> |
3609 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3610 | + </opt:options> |
3611 | +) |
3612 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3618 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3619 | + |
3620 | +z:parse("<?xml version='1.0'?> |
3621 | +<level1> |
3622 | + <level2> |
3623 | + <level3> |
3624 | + <level4>level4 text</level4> |
3625 | + </level3> |
3626 | + </level2> |
3627 | +</level1>", |
3628 | + <opt:options> |
3629 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
3630 | + </opt:options> |
3631 | +) |
3632 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3638 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3639 | + |
3640 | +z:parse("<?xml version='1.0'?> |
3641 | +<level1> |
3642 | + <level2> |
3643 | + <level3> |
3644 | + <level4>level4 text</level4> |
3645 | + level3 end |
3646 | + </level3> |
3647 | + </level2> |
3648 | +</level1>", |
3649 | + <opt:options> |
3650 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3651 | + </opt:options> |
3652 | +) |
3653 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3659 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3660 | + |
3661 | +z:parse("<?xml version='1.0'?> |
3662 | +<level1> |
3663 | + level1 text start |
3664 | + <level2> |
3665 | + level2 text start |
3666 | + <level3> |
3667 | + level3 text start |
3668 | + <level4>level4 text</level4> |
3669 | + level3 text end |
3670 | + </level3> |
3671 | + level2 text end |
3672 | + </level2> |
3673 | + level1 text end |
3674 | +</level1>", |
3675 | + <opt:options> |
3676 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
3677 | + </opt:options> |
3678 | +) |
3679 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3685 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3686 | + |
3687 | +z:parse("<?xml version='1.0'?> |
3688 | +<level1> |
3689 | + level1 text start |
3690 | + <level2> |
3691 | + level2 text start |
3692 | + <level3> |
3693 | + level3 text start |
3694 | + <level4>level4 text</level4> |
3695 | + level3 text end |
3696 | + </level3> |
3697 | + level2 text end |
3698 | + </level2> |
3699 | + level1 text end |
3700 | +</level1>", |
3701 | + <opt:options> |
3702 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3703 | + </opt:options> |
3704 | +) |
3705 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3711 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3712 | + |
3713 | +z:parse("<?xml version='1.0'?> |
3714 | +<level1> |
3715 | + level1 text start |
3716 | + <level2> |
3717 | + level2 text start |
3718 | + <level3> |
3719 | + level3 text start |
3720 | + <level4>level4 text</level4> |
3721 | + level3 text end |
3722 | + </level3> |
3723 | + level2 text end |
3724 | + </level2> |
3725 | + level1 text end |
3726 | +</level1>", |
3727 | + <opt:options> |
3728 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
3729 | + </opt:options> |
3730 | +) |
3731 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3737 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3738 | + |
3739 | +z:parse("<?xml version='1.0'?> |
3740 | +<level1> |
3741 | + level1 text start |
3742 | + <level2> |
3743 | + level2 text start |
3744 | + <level3> |
3745 | + level3 text start |
3746 | + <level4>level4 text</level4> |
3747 | + level3 text end |
3748 | + </level3> |
3749 | + level2 text end |
3750 | + </level2> |
3751 | + level1 text end |
3752 | +</level1>", |
3753 | + <opt:options> |
3754 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
3755 | + </opt:options> |
3756 | +) |
3757 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3763 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3764 | + |
3765 | +z:parse("<?xml version='1.0'?> |
3766 | +<level1> |
3767 | + level1 text start |
3768 | + <level2> |
3769 | + level2 text start |
3770 | + <level3> |
3771 | + level3 text start |
3772 | + <level4>level4 text</level4> |
3773 | + level3 text end |
3774 | + </level3> |
3775 | + level2 text end |
3776 | + </level2> |
3777 | + level1 text end |
3778 | +</level1>", |
3779 | + <opt:options> |
3780 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
3781 | + </opt:options> |
3782 | +) |
3783 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3789 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3790 | + |
3791 | +z:parse("<?xml version='1.0'?> |
3792 | +<level1> |
3793 | + level1 text start |
3794 | + <level2> |
3795 | + level2 text start |
3796 | + <level3> |
3797 | + level3 text start |
3798 | + <level4>level4 text</level4> |
3799 | + level3 text end |
3800 | + </level3> |
3801 | + level2 text end |
3802 | + </level2> |
3803 | + level1 text end |
3804 | +</level1>", |
3805 | + <opt:options> |
3806 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> |
3807 | + </opt:options> |
3808 | +) |
3809 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3815 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3816 | + |
3817 | +z:parse("<?xml version='1.0'?> |
3818 | +level0 text |
3819 | +<level1> |
3820 | + level1 text start |
3821 | + <level2> |
3822 | + level2 text start |
3823 | + <level3> |
3824 | + level3 text start |
3825 | + <level4>level4 text</level4> |
3826 | + level3 text end |
3827 | + </level3> |
3828 | + level2 text end |
3829 | + </level2> |
3830 | + level1 text end |
3831 | +</level1> |
3832 | +level0 text |
3833 | +<level1> |
3834 | + level1 text start |
3835 | + <level2> |
3836 | + level2 text start |
3837 | + <level3> |
3838 | + level3 text start |
3839 | + <level4>level4 text</level4> |
3840 | + level3 text end |
3841 | + </level3> |
3842 | + level2 text end |
3843 | + </level2> |
3844 | + level1 text end |
3845 | +</level1> |
3846 | +level0 text |
3847 | +<level1> |
3848 | + level1 text start |
3849 | + <level2> |
3850 | + level2 text start |
3851 | + <level3> |
3852 | + level3 text start |
3853 | + <level4>level4 text</level4> |
3854 | + level3 text end |
3855 | + </level3> |
3856 | + level2 text end |
3857 | + </level2> |
3858 | + level1 text end |
3859 | +</level1> |
3860 | +level0 text |
3861 | +<level1> |
3862 | + level1 text start |
3863 | + <level2> |
3864 | + level2 text start |
3865 | + <level3> |
3866 | + level3 text start |
3867 | + <level4>level4 text</level4> |
3868 | + level3 text end |
3869 | + </level3> |
3870 | + level2 text end |
3871 | + </level2> |
3872 | + level1 text end |
3873 | +</level1> |
3874 | +level0 text", |
3875 | + <opt:options> |
3876 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
3877 | + </opt:options> |
3878 | +) |
3879 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3885 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3886 | + |
3887 | +z:parse("<?xml version='1.0'?> |
3888 | +level0 text |
3889 | +<level1> |
3890 | + level1 text start |
3891 | + <level2> |
3892 | + level2 text start |
3893 | + <level3> |
3894 | + level3 text start |
3895 | + <level4>level4 text</level4> |
3896 | + level3 text end |
3897 | + </level3> |
3898 | + level2 text end |
3899 | + </level2> |
3900 | + level1 text end |
3901 | +</level1> |
3902 | +level0 text |
3903 | +<level1> |
3904 | + level1 text start |
3905 | + <level2> |
3906 | + level2 text start |
3907 | + <level3> |
3908 | + level3 text start |
3909 | + <level4>level4 text</level4> |
3910 | + level3 text end |
3911 | + </level3> |
3912 | + level2 text end |
3913 | + </level2> |
3914 | + level1 text end |
3915 | +</level1> |
3916 | +level0 text |
3917 | +<level1> |
3918 | + level1 text start |
3919 | + <level2> |
3920 | + level2 text start |
3921 | + <level3> |
3922 | + level3 text start |
3923 | + <level4>level4 text</level4> |
3924 | + level3 text end |
3925 | + </level3> |
3926 | + level2 text end |
3927 | + </level2> |
3928 | + level1 text end |
3929 | +</level1> |
3930 | +level0 text |
3931 | +<level1> |
3932 | + level1 text start |
3933 | + <level2> |
3934 | + level2 text start |
3935 | + <level3> |
3936 | + level3 text start |
3937 | + <level4>level4 text</level4> |
3938 | + level3 text end |
3939 | + </level3> |
3940 | + level2 text end |
3941 | + </level2> |
3942 | + level1 text end |
3943 | +</level1> |
3944 | +level0 text", |
3945 | + <opt:options> |
3946 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
3947 | + </opt:options> |
3948 | +) |
3949 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
3955 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
3956 | + |
3957 | +z:parse("<?xml version='1.0'?> |
3958 | +level0 text |
3959 | +<level1> |
3960 | + level1 text start |
3961 | + <level2> |
3962 | + level2 text start |
3963 | + <level3> |
3964 | + level3 text start |
3965 | + <level4>level4 text</level4> |
3966 | + level3 text end |
3967 | + </level3> |
3968 | + level2 text end |
3969 | + </level2> |
3970 | + level1 text end |
3971 | +</level1> |
3972 | +level0 text |
3973 | +<level1> |
3974 | + level1 text start |
3975 | + <level2> |
3976 | + level2 text start |
3977 | + <level3> |
3978 | + level3 text start |
3979 | + <level4>level4 text</level4> |
3980 | + level3 text end |
3981 | + </level3> |
3982 | + level2 text end |
3983 | + </level2> |
3984 | + level1 text end |
3985 | +</level1> |
3986 | +level0 text |
3987 | +<level1> |
3988 | + level1 text start |
3989 | + <level2> |
3990 | + level2 text start |
3991 | + <level3> |
3992 | + level3 text start |
3993 | + <level4>level4 text</level4> |
3994 | + level3 text end |
3995 | + </level3> |
3996 | + level2 text end |
3997 | + </level2> |
3998 | + level1 text end |
3999 | +</level1> |
4000 | +level0 text |
4001 | +<level1> |
4002 | + level1 text start |
4003 | + <level2> |
4004 | + level2 text start |
4005 | + <level3> |
4006 | + level3 text start |
4007 | + <level4>level4 text</level4> |
4008 | + level3 text end |
4009 | + </level3> |
4010 | + level2 text end |
4011 | + </level2> |
4012 | + level1 text end |
4013 | +</level1> |
4014 | +level0 text", |
4015 | + <opt:options> |
4016 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
4017 | + </opt:options> |
4018 | +) |
4019 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4025 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4026 | + |
4027 | +z:parse("<?xml version='1.0'?> |
4028 | +level0 text |
4029 | +<level1> |
4030 | + level1 text start |
4031 | + <level2> |
4032 | + level2 text start |
4033 | + <level3> |
4034 | + level3 text start |
4035 | + <level4>level4 text</level4> |
4036 | + level3 text end |
4037 | + </level3> |
4038 | + level2 text end |
4039 | + </level2> |
4040 | + level1 text end |
4041 | +</level1> |
4042 | +level0 text |
4043 | +<level1> |
4044 | + level1 text start |
4045 | + <level2> |
4046 | + level2 text start |
4047 | + <level3> |
4048 | + level3 text start |
4049 | + <level4>level4 text</level4> |
4050 | + level3 text end |
4051 | + </level3> |
4052 | + level2 text end |
4053 | + </level2> |
4054 | + level1 text end |
4055 | +</level1> |
4056 | +level0 text |
4057 | +<level1> |
4058 | + level1 text start |
4059 | + <level2> |
4060 | + level2 text start |
4061 | + <level3> |
4062 | + level3 text start |
4063 | + <level4>level4 text</level4> |
4064 | + level3 text end |
4065 | + </level3> |
4066 | + level2 text end |
4067 | + </level2> |
4068 | + level1 text end |
4069 | +</level1> |
4070 | +level0 text |
4071 | +<level1> |
4072 | + level1 text start |
4073 | + <level2> |
4074 | + level2 text start |
4075 | + <level3> |
4076 | + level3 text start |
4077 | + <level4>level4 text</level4> |
4078 | + level3 text end |
4079 | + </level3> |
4080 | + level2 text end |
4081 | + </level2> |
4082 | + level1 text end |
4083 | +</level1> |
4084 | +level0 text", |
4085 | + <opt:options> |
4086 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
4087 | + </opt:options> |
4088 | +) |
4089 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4095 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4096 | + |
4097 | +z:parse("<?xml version='1.0'?> |
4098 | +level0 text |
4099 | +<level1> |
4100 | + level1 text start |
4101 | + <level2> |
4102 | + level2 text start |
4103 | + <level3> |
4104 | + level3 text start |
4105 | + <level4>level4 text</level4> |
4106 | + level3 text end |
4107 | + </level3> |
4108 | + level2 text end |
4109 | + </level2> |
4110 | + level1 text end |
4111 | +</level1> |
4112 | +level0 text |
4113 | +<level1> |
4114 | + level1 text start |
4115 | + <level2> |
4116 | + level2 text start |
4117 | + <level3> |
4118 | + level3 text start |
4119 | + <level4>level4 text</level4> |
4120 | + level3 text end |
4121 | + </level3> |
4122 | + level2 text end |
4123 | + </level2> |
4124 | + level1 text end |
4125 | +</level1> |
4126 | +level0 text |
4127 | +<level1> |
4128 | + level1 text start |
4129 | + <level2> |
4130 | + level2 text start |
4131 | + <level3> |
4132 | + level3 text start |
4133 | + <level4>level4 text</level4> |
4134 | + level3 text end |
4135 | + </level3> |
4136 | + level2 text end |
4137 | + </level2> |
4138 | + level1 text end |
4139 | +</level1> |
4140 | +level0 text |
4141 | +<level1> |
4142 | + level1 text start |
4143 | + <level2> |
4144 | + level2 text start |
4145 | + <level3> |
4146 | + level3 text start |
4147 | + <level4>level4 text</level4> |
4148 | + level3 text end |
4149 | + </level3> |
4150 | + level2 text end |
4151 | + </level2> |
4152 | + level1 text end |
4153 | +</level1> |
4154 | +level0 text", |
4155 | + <opt:options> |
4156 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
4157 | + </opt:options> |
4158 | +) |
4159 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4165 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4166 | + |
4167 | +z:parse("<?xml version='1.0'?> |
4168 | +level0 text |
4169 | +<level1> |
4170 | + level1 text start |
4171 | + <level2> |
4172 | + level2 text start |
4173 | + <level3> |
4174 | + level3 text start |
4175 | + <level4>level4 text</level4> |
4176 | + level3 text end |
4177 | + </level3> |
4178 | + level2 text end |
4179 | + </level2> |
4180 | + level1 text end |
4181 | +</level1> |
4182 | +level0 text |
4183 | +<level1> |
4184 | + level1 text start |
4185 | + <level2> |
4186 | + level2 text start |
4187 | + <level3> |
4188 | + level3 text start |
4189 | + <level4>level4 text</level4> |
4190 | + level3 text end |
4191 | + </level3> |
4192 | + level2 text end |
4193 | + </level2> |
4194 | + level1 text end |
4195 | +</level1> |
4196 | +level0 text |
4197 | +<level1> |
4198 | + level1 text start |
4199 | + <level2> |
4200 | + level2 text start |
4201 | + <level3> |
4202 | + level3 text start |
4203 | + <level4>level4 text</level4> |
4204 | + level3 text end |
4205 | + </level3> |
4206 | + level2 text end |
4207 | + </level2> |
4208 | + level1 text end |
4209 | +</level1> |
4210 | +level0 text |
4211 | +<level1> |
4212 | + level1 text start |
4213 | + <level2> |
4214 | + level2 text start |
4215 | + <level3> |
4216 | + level3 text start |
4217 | + <level4>level4 text</level4> |
4218 | + level3 text end |
4219 | + </level3> |
4220 | + level2 text end |
4221 | + </level2> |
4222 | + level1 text end |
4223 | +</level1> |
4224 | +level0 text", |
4225 | + <opt:options> |
4226 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> |
4227 | + </opt:options> |
4228 | +) |
4229 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4235 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4236 | + |
4237 | +z:parse("<doc> |
4238 | + <foo>0</foo> |
4239 | + <foo>1</foo> |
4240 | + <foo>2</foo> |
4241 | + <foo>3</foo> |
4242 | + <foo>4</foo> |
4243 | + <foo>5</foo> |
4244 | + <foo>6</foo> |
4245 | + <foo>7</foo> |
4246 | + <foo>8</foo> |
4247 | + <foo>9</foo> |
4248 | + <foo>10</foo> |
4249 | +</doc>", |
4250 | + <opt:options> |
4251 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
4252 | + </opt:options> |
4253 | +) |
4254 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4260 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4261 | + |
4262 | +z:parse("<doc> |
4263 | + <foo>0</foo> |
4264 | + <foo>1</foo> |
4265 | + <foo>2</foo> |
4266 | + <foo>3</foo> |
4267 | + <foo>4</foo> |
4268 | + <foo>5</foo> |
4269 | + <foo>6</foo> |
4270 | + <foo>7</foo> |
4271 | + <foo>8</foo> |
4272 | + <foo>9</foo> |
4273 | + <foo>10</foo> |
4274 | +</doc>", |
4275 | + <opt:options> |
4276 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
4277 | + </opt:options> |
4278 | +) |
4279 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4285 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4286 | + |
4287 | +z:parse("<doc> |
4288 | + <foo>0</foo> |
4289 | + <foo>1</foo> |
4290 | + <foo>2</foo> |
4291 | + <foo>3</foo> |
4292 | + <foo>4</foo> |
4293 | + <foo>5</foo> |
4294 | + <foo>6</foo> |
4295 | + <foo>7</foo> |
4296 | + <foo>8</foo> |
4297 | + <foo>9</foo> |
4298 | + <foo>10</foo> |
4299 | +</doc>", |
4300 | + <opt:options> |
4301 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
4302 | + </opt:options> |
4303 | +) |
4304 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4310 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4311 | + |
4312 | +z:parse("<?xml version='1.0'?> |
4313 | +<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 | + <opt:options> |
4315 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
4316 | + </opt:options> |
4317 | +) |
4318 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4324 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4325 | + |
4326 | +z:parse("<?xml version='1.0'?> |
4327 | +<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 | + <opt:options> |
4329 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
4330 | + </opt:options> |
4331 | +) |
4332 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4338 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4339 | + |
4340 | +z:parse("<?xml version='1.0'?> |
4341 | +<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 | + <opt:options> |
4343 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
4344 | + </opt:options> |
4345 | +) |
4346 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4352 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4353 | + |
4354 | +z:parse("<?xml version='1.0'?> |
4355 | +<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 | + <opt:options> |
4357 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="3"/> |
4358 | + </opt:options> |
4359 | +) |
4360 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4366 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4367 | + |
4368 | +z:parse("<?xml version='1.0'?> |
4369 | +<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 | + <opt:options> |
4371 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="4"/> |
4372 | + </opt:options> |
4373 | +) |
4374 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4380 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4381 | + |
4382 | +z:parse("<?xml version='1.0'?> |
4383 | +<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 | + <opt:options> |
4385 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="5"/> |
4386 | + </opt:options> |
4387 | +) |
4388 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4394 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4395 | + |
4396 | +z:parse("<?xml version='1.0'?> |
4397 | +level0 text |
4398 | +<level1/> |
4399 | +level0 text |
4400 | +<level1/> |
4401 | +level0 text |
4402 | +<level1/> |
4403 | +level0 text |
4404 | +<level1/> |
4405 | +level0 text |
4406 | +<level1/> |
4407 | +level0 text |
4408 | +<level1/> |
4409 | +level0 text |
4410 | +<level1/> |
4411 | +level0 text |
4412 | +<level1/> |
4413 | +level0 text |
4414 | +<level1/> |
4415 | +level0 text |
4416 | +<level1/> |
4417 | +level0 text |
4418 | +<level1/> |
4419 | +level0 text |
4420 | +<level1/> |
4421 | +level0 text |
4422 | +<level1/> |
4423 | +level0 text |
4424 | +<level1/> |
4425 | +level0 text", |
4426 | +<opt:options> |
4427 | + <opt:parse-external-parsed-entity/> |
4428 | +</opt:options> |
4429 | +) |
4430 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4436 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4442 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4443 | + |
4444 | +z:parse("<root> |
4445 | + <test/> |
4446 | + <test/> |
4447 | + </bad> |
4448 | +</root> |
4449 | +", |
4450 | + <opt:options> |
4451 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
4452 | + </opt:options> |
4453 | +) |
4454 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4460 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4466 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4467 | + |
4468 | +z:parse("<root> |
4469 | + <test/> |
4470 | + <test/> |
4471 | + </bad> |
4472 | +</root> |
4473 | +", |
4474 | + <opt:options> |
4475 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
4476 | + </opt:options> |
4477 | +) |
4478 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4484 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4490 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4491 | + |
4492 | +z:parse("<root> |
4493 | + <test/> |
4494 | + <test/> |
4495 | + </bad> |
4496 | +</root> |
4497 | +", |
4498 | + <opt:options> |
4499 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="2"/> |
4500 | + </opt:options> |
4501 | +) |
4502 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4508 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4514 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4515 | + |
4516 | +z:parse("<root> |
4517 | + <test/> |
4518 | + <test/> |
4519 | +</root> |
4520 | +</bad> |
4521 | +", |
4522 | + <opt:options> |
4523 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
4524 | + </opt:options> |
4525 | +) |
4526 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4532 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4538 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4539 | + |
4540 | +z:parse("<root> |
4541 | + <test/> |
4542 | + <test/> |
4543 | +", |
4544 | + <opt:options> |
4545 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="0"/> |
4546 | + </opt:options> |
4547 | +) |
4548 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4554 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4560 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4561 | + |
4562 | +z:parse("<root> |
4563 | + <test/> |
4564 | + <test/> |
4565 | +", |
4566 | + <opt:options> |
4567 | + <opt:parse-external-parsed-entity opt:skip-root-nodes="1"/> |
4568 | + </opt:options> |
4569 | +) |
4570 | |
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 | +import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4576 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4577 | + |
4578 | +x:parse("<mediawiki> |
4579 | + <page> |
4580 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
4581 | + |
4582 | + </page> |
4583 | +</mediawiki>", |
4584 | + <opt:options> |
4585 | + <opt:parse-external-parsed-entity |
4586 | + opt:skip-root-nodes="0"/> |
4587 | + </opt:options>) |
4588 | |
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 | +import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4594 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4595 | +import module namespace file = "http://expath.org/ns/file"; |
4596 | + |
4597 | +x:parse("<mediawiki> |
4598 | + <page> |
4599 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
4600 | + |
4601 | + </page> |
4602 | +</mediawiki>", |
4603 | + <opt:options> |
4604 | + <opt:parse-external-parsed-entity |
4605 | + opt:skip-root-nodes="1"/> |
4606 | + </opt:options>) |
4607 | |
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 | +import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4613 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4614 | +import module namespace file = "http://expath.org/ns/file"; |
4615 | + |
4616 | +x:parse("<mediawiki> |
4617 | + <page> |
4618 | +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab |
4619 | + |
4620 | + </page> |
4621 | +</mediawiki>", |
4622 | + <opt:options> |
4623 | + <opt:parse-external-parsed-entity |
4624 | + opt:skip-root-nodes="0"/> |
4625 | + </opt:options>) |
4626 | |
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 | +import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4632 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4633 | +import module namespace file = "http://expath.org/ns/file"; |
4634 | + |
4635 | +x:parse("<mediawiki> |
4636 | + <page> |
4637 | +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab |
4638 | + |
4639 | + </page> |
4640 | +</mediawiki>", |
4641 | + <opt:options> |
4642 | + <opt:parse-external-parsed-entity |
4643 | + opt:skip-root-nodes="1"/> |
4644 | + </opt:options>) |
4645 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4651 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4652 | |
4653 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4654 | +x:parse("<?xml version='1.0'?> |
4655 | <!DOCTYPE note [ |
4656 | <!ELEMENT note (to,from,heading,body)> |
4657 | <!ELEMENT to (#PCDATA)> |
4658 | @@ -15,4 +16,7 @@ |
4659 | <body>Don't forget me this weekend</body> |
4660 | </note> |
4661 | ", |
4662 | -"d") |
4663 | + <opt:options> |
4664 | + <opt:DTD-validate/> |
4665 | + </opt:options> |
4666 | +) |
4667 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4674 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4675 | |
4676 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4677 | +x:parse("<?xml version='1.0'?> |
4678 | <!DOCTYPE note [ |
4679 | <!ELEMENT note (to,from,heading,body)> |
4680 | <!ELEMENT to (#PCDATA)> |
4681 | @@ -12,4 +13,7 @@ |
4682 | <incorrect>Element not in DTD</incorrect> |
4683 | </note> |
4684 | ", |
4685 | -"d") |
4686 | + <opt:options> |
4687 | + <opt:DTD-validate/> |
4688 | + </opt:options> |
4689 | +) |
4690 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4696 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4697 | |
4698 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4699 | +x:parse("<?xml version='1.0'?> |
4700 | <from1>Jani</from1> |
4701 | <from2>Jani</from2> |
4702 | <from3>Jani</from3> |
4703 | ", |
4704 | -"e") |
4705 | + <opt:options> |
4706 | + <opt:parse-external-parsed-entity/> |
4707 | + </opt:options> |
4708 | +) |
4709 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4715 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4716 | |
4717 | -x:parse-xml-fragment(" |
4718 | +x:parse(" |
4719 | <from1>Jani</from1> |
4720 | <from2>Jani</from2> |
4721 | <from3>Jani</from3> |
4722 | ", |
4723 | -"e") |
4724 | + <opt:options> |
4725 | + <opt:parse-external-parsed-entity/> |
4726 | + </opt:options> |
4727 | +) |
4728 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4734 | - |
4735 | -x:parse-xml-fragment("<?xml version='1.0'?><a/>", "e") |
4736 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4737 | + |
4738 | +x:parse("<?xml version='1.0'?><a/>", |
4739 | + <opt:options> |
4740 | + <opt:parse-external-parsed-entity/> |
4741 | + </opt:options> |
4742 | +) |
4743 | + |
4744 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4751 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4752 | |
4753 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4754 | +x:parse("<?xml version='1.0'?> |
4755 | <from1>Jani</from1> |
4756 | <from2>Jani</from2> |
4757 | <from3>Jani</from3> |
4758 | ", |
4759 | -"d") |
4760 | + <opt:options> |
4761 | + <opt:DTD-validate/> |
4762 | + </opt:options> |
4763 | +) |
4764 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4770 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4771 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; |
4772 | |
4773 | -x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> |
4774 | +x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4775 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> |
4776 | <weather:temperature>30</weather:temperature> |
4777 | <weather:precipitation>20</weather:precipitation> |
4778 | </weather:weather> |
4779 | ", |
4780 | -"s") |
4781 | + <opt:options> |
4782 | + <opt:schema-validate opt:mode="lax"/> |
4783 | + </opt:options> |
4784 | +) |
4785 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4792 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4793 | import schema namespace weather = "http://www.w3.org/test/weather" at "weather.xsd"; |
4794 | |
4795 | -x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> |
4796 | +x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4797 | <weather:weather xmlns:weather='http://www.w3.org/test/weather' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> |
4798 | <weather:incorrect>30</weather:incorrect> |
4799 | <weather:precipitation>20</weather:precipitation> |
4800 | </weather:weather> |
4801 | ", |
4802 | -"s") |
4803 | + <opt:options> |
4804 | + <opt:schema-validate opt:mode="strict"/> |
4805 | + </opt:options> |
4806 | +) |
4807 | + |
4808 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4815 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4816 | |
4817 | -x:parse-xml-fragment("<?xml version='1.0' encoding = 'UTF-8'?> |
4818 | +x:parse("<?xml version='1.0' encoding = 'UTF-8'?> |
4819 | <atomic:root xmlns:atomic='http://www.w3.org/XQueryTest'> |
4820 | <atomic:duration>P1Y2M3DT10H30M</atomic:duration>", |
4821 | -"e") |
4822 | + <opt:options> |
4823 | + <opt:parse-external-parsed-entity/> |
4824 | + </opt:options> |
4825 | +) |
4826 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4832 | |
4833 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4834 | +x:parse("<?xml version='1.0'?> |
4835 | <root> |
4836 | <from1>Jani</from1> |
4837 | |
4838 | @@ -8,4 +8,4 @@ |
4839 | |
4840 | <from3>Jani</from3> |
4841 | </root>", |
4842 | -"") |
4843 | +() ) |
4844 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4850 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4851 | |
4852 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4853 | +x:parse("<?xml version='1.0'?> |
4854 | <!DOCTYPE note [ |
4855 | <!ELEMENT note (to,from,heading,body)> |
4856 | <!ELEMENT to (#PCDATA)> |
4857 | @@ -12,4 +13,8 @@ |
4858 | <incorrect>Element not in DTD</incorrect> |
4859 | </note> |
4860 | ", |
4861 | -"dF") |
4862 | + <opt:options> |
4863 | + <opt:DTD-validate/> |
4864 | + <opt:no-error/> |
4865 | + </opt:options> |
4866 | +) |
4867 | |
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 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4873 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4874 | |
4875 | -let $var := z:parse-xml-fragment("<?xml version='1.0'?> |
4876 | +let $var := z:parse("<?xml version='1.0'?> |
4877 | <from1>Jani</from1> |
4878 | <from2>Jani</from2> |
4879 | <from3>Jani</from3>", |
4880 | -"e") |
4881 | + <opt:options> |
4882 | + <opt:parse-external-parsed-entity/> |
4883 | + </opt:options> |
4884 | +) |
4885 | return <fragment>{ $var }<count>{ count($var) }</count></fragment> |
4886 | \ No newline at end of file |
4887 | |
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 | import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4893 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4894 | |
4895 | -for $var in z:parse-xml-fragment("<from1>Jani</from1><from2>Jani</from2><from3>Jani</from3>", "urn:foo", "e") |
4896 | +for $var in z:parse("<from1>Jani</from1><from2>Jani</from2><from3>Jani</from3>", |
4897 | + <opt:options> |
4898 | + <opt:base-uri opt:value="urn:foo"/> |
4899 | + <opt:parse-external-parsed-entity/> |
4900 | + </opt:options> |
4901 | +) |
4902 | return <fragment base="{fn:base-uri($var)}">{ $var }</fragment> |
4903 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4909 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4910 | |
4911 | -x:parse-xml-fragment("<?xml version='1.0' encoding='UTF-8'?> |
4912 | +x:parse("<?xml version='1.0' encoding='UTF-8'?> |
4913 | <!-- Comment-1 --> |
4914 | <?a-pi pi-1?> |
4915 | <!-- Comment-2 --> |
4916 | @@ -37,4 +38,7 @@ |
4917 | <?a-pi pi-6?> |
4918 | <!-- Comment-7 --> |
4919 | ", |
4920 | -"e") |
4921 | + <opt:options> |
4922 | + <opt:parse-external-parsed-entity/> |
4923 | + </opt:options> |
4924 | +) |
4925 | |
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 | import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4931 | - |
4932 | -x:parse-xml-fragment("<a/>", "e") |
4933 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4934 | + |
4935 | +x:parse("<a/>", |
4936 | + <opt:options> |
4937 | + <opt:parse-external-parsed-entity/> |
4938 | + </opt:options> |
4939 | +) |
4940 | + |
4941 | |
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 | -Error: http://www.zorba-xquery.com/errors:ZXQD0003 |
4947 | |
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 | +import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4953 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4954 | + |
4955 | +x:parse("<?xml version='1.0'?> |
4956 | +<!DOCTYPE note [ |
4957 | +<!ELEMENT note (#PCDATA)> |
4958 | +<!ATTLIST note nmt NMTOKENS #REQUIRED> |
4959 | +]> |
4960 | +<note nmt='aaa'/> |
4961 | +", |
4962 | + <opt:options> |
4963 | + <opt:DTD-validate/> |
4964 | + </opt:options> |
4965 | +) |
4966 | |
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 | -import module namespace x = "http://www.zorba-xquery.com/modules/xml"; |
4972 | - |
4973 | -x:parse-xml-fragment("<?xml version='1.0'?> |
4974 | -<from1>Jani</from1> |
4975 | -<from2>Jani</from2> |
4976 | -<from3>Jani</from3> |
4977 | -", |
4978 | -"eEdDsSlLwWfF") |
4979 | |
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 | +Error: http://www.w3.org/2005/xqt-errors:FODC0006 |
4985 | |
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 | -Error: http://www.zorba-xquery.com/errors:ZXQD0003 |
4991 | |
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 | +import module namespace z = "http://www.zorba-xquery.com/modules/xml"; |
4997 | +import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options"; |
4998 | + |
4999 | +z:parse("<root><a id='0'> |
5000 | + 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?