Merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba
- bug-950621
- Merge into trunk
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~zorba-coders/zorba/bug-950621 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
102 lines (+4/-41) 8 files modified
ChangeLog (+1/-0) src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp (+3/-28) src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml (+0/-6) test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq (+0/-1) test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec (+0/-1) test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq (+0/-2) test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec (+0/-1) test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq (+0/-2) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-950621 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juan Zacarias | Approve | ||
Chris Hillery | Needs Fixing | ||
Review via email: mp+115227@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-09-10.
Commit message
Removed fn:parse-xml#2
Fix for bug 950621
Description of the change
Removed fn:parse-xml#2
Fix for bug 950621
- 10942. By Paul J. Lucas
-
Now using enable_if for more functions to make overload resolution work better. Approved: Matthias Brantner, Paul J. Lucas
- 10943. By Rodolfo Ochoa
-
Disabling "print stack trace" for windows Approved: Chris Hillery, Rodolfo Ochoa
- 10944. By Paul J. Lucas
-
Now handling UTF-16 surrogate pairs. Approved: Dennis Knochenwefel, Paul J. Lucas
- 10945. By Nicolae Brinza
-
The parse-fragment function now allows a DOCTYPE declaration in the input. Approved: Nicolae Brinza, Matthias Brantner
- 10946. By Paul J. Lucas
-
Added functions to test for and create UTF-16 surrogate pairs.
These will probably be needed by whoever fixes bug #1025622. Approved: Dennis Knochenwefel, Paul J. Lucas - 10947. By Ghislain Fourny
-
Fix that gives precedence to an array replacement over an array deletion, and adds tests about multiple updates with same selector on arrays and on objects. Approved: Markos Zaharioudakis, Matthias Brantner
- 10948. By Paul J. Lucas
-
Now doing proper JSON serialization. Approved: Chris Hillery, Dennis Knochenwefel, Paul J. Lucas
- 10949. By Paul J. Lucas
-
No longer checking captured subgroups in replacement string when 'q' flag is given. Approved: Matthias Brantner, Paul J. Lucas
- 10950. By Matthias Brantner
-
removed a non-core module dependency from the reuse-stream test Approved: Chris Hillery, Matthias Brantner
Juan Zacarias (juan457) : | # |
- 10951. By Markos Zaharioudakis
-
removed some debugging code, which causes Windows compilation problems Approved: Markos Zaharioudakis
- 10952. By Paul J. Lucas
-
Removed zorbatypes/
transcoder. h & .cpp. Approved: Matthias Brantner, Paul J. Lucas - 10953. By Paul J. Lucas
-
Now properly serializing JSON for JsonML. Approved: Chris Hillery, Paul J. Lucas
- 10954. By Paul J. Lucas
-
1. Tweaked equals().
2. Added "const&" to std_string function arguments. Approved: Matthias Brantner, Paul J. Lucas - 10955. By Matthias Brantner
-
fix for bug #898066 (Stringstream & fn:trace) Approved: Chris Hillery, Matthias Brantner
- 10956. By Sorin Marian Nasoi <email address hidden>
-
- added information about the Zorba and XQTS versions that were used in generating the reports
- updated the README.txt with info regarding conformance reports generation Approved: William Candillon, Sorin Marian Nasoi - 10957. By Ghislain Fourny
-
Activating ZORBA_WITH_JSON by default. Approved: Chris Hillery, Matthias Brantner
- 10958. By Rodolfo Ochoa
-
Documentation fixed for Zorba binary package with PHP. Approved: Cezar Andrei, Chris Hillery
- 10959. By Paul J. Lucas
-
s/0/npos/
This probably fixes some as-of-yet-
undiscovered bug. Approved: Matthias Brantner, Paul J. Lucas - 10960. By Rodolfo Ochoa
-
C# API Binding Approved: Cezar Andrei, Chris Hillery
- 10961. By Ghislain Fourny
-
Corrects bug 1029836. Approved: Chris Hillery, Matthias Brantner
- 10962. By Ghislain Fourny
-
Fixing Windows build with JSONiq. Approved: Chris Hillery, Matthias Brantner
- 10963. By Paul J. Lucas
-
Removed JsonML-object. Approved: Ghislain Fourny, Paul J. Lucas
- 10964. By Matthias Brantner
-
new ItemFactory function that allows creating dateTime items without timezone Approved: Chris Hillery, Matthias Brantner
- 10965. By Ghislain Fourny
-
Fixes bug 1032166 (critical memory bug). Approved: Chris Hillery, Matthias Brantner
- 10966. By Paul J. Lucas
-
1. s/take/swap/
2. Removed unnecessary assignment. Approved: Matthias Brantner, Paul J. Lucas - 10967. By Juan Zacarias
-
Fix of bugs
Bug #1014979: Make thesaurus optional component on Windows
Bug #1014981: Make default thesaurus available as Ubuntu package
Also Fixed FindJNI.cmake to be found-able in the Ubuntu Installer Approved: Juan Zacarias, Chris Hillery - 10968. By David Graf
-
Make testdriver_mt work with boost version >1.49. Approved: David Graf, Chris Hillery
- 10969. By Matthias Brantner
-
Added a keys() function to the index dml module. This fixes bug #900677. Approved: Matthias Brantner, David Graf
- 10970. By Chris Hillery
-
Test temporarily disabled while http-client is being updated. Also get HEAD of OAuth module rather than zorba-2.5 tag for some reason. Approved: Juan Zacarias, Chris Hillery
- 10971. By Chris Hillery
-
Split image into image + graphviz; split data-converters into csv + html. Approved: Juan Zacarias, Chris Hillery
- 10972. By William Candillon
-
Fix make doc target when multiple version of the same module exists. Approved: Sorin Marian Nasoi, Matthias Brantner
- 10973. By Ghislain Fourny
-
Correct array insert expression syntax to include [] like append expressions. Approved: Matthias Brantner, Chris Hillery
- 10974. By Juan Zacarias
-
Fixed windows installer component options for c# Bindings Approved: Rodolfo Ochoa, Chris Hillery
- 10975. By Matthias Brantner
-
removed some hardcoded english words from error messages raised by the json parser Approved: Paul J. Lucas, Matthias Brantner
- 10976. By Chris Hillery
-
Regenerate scanner and parser with flex/bison 2.5 - apparently 2.6 creates code that Clang doesn't like. Approved: Matthias Brantner, Chris Hillery
- 10977. By Matthias Brantner
-
prepare ChangeLog for 2.6 release Approved: Chris Hillery, Matthias Brantner
- 10978. By Chris Hillery
-
Bump version number to 2.6; update tagged modules; add archive module. Approved: Cezar Andrei, Sorin Marian Nasoi, Chris Hillery
- 10979. By David Graf
-
Since OSX Mountain Lion, clang is the default c++ compiler on mac. Therefore, it is not enough to check if the c++ compiler executable is called clang. Approved: David Graf, Paul J. Lucas
- 10980. By Chris Hillery
-
Add "generation" of local copy of FlexLexer.h, to ensure it always stays in sync with the generated lexer .cpp file. Approved: Paul J. Lucas, Chris Hillery
- 10981. By Sorin Marian Nasoi <email address hidden>
-
Fixed the XQDoc documentation issue related to the formatting of the parameters for the higher order functions. Approved: William Candillon, Sorin Marian Nasoi
- 10982. By Chris Hillery
-
Try to find FlexLexer.h associated with the flex binary being used.
Approved: David Graf, Chris Hillery - 10983. By Markos Zaharioudakis
-
Fixed bug #1033407 (do not store var_expr rchandles in the static context) Approved: Markos Zaharioudakis
- 10984. By Markos Zaharioudakis
-
Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window variables)
Fixed bug #899366 (enforce the type declaration of a window variable) Approved: Markos Zaharioudakis - 10985. By Markos Zaharioudakis
-
Fixed bug #1024892 (index declaration references udf declared after the index) Approved: Markos Zaharioudakis
- 10986. By David Graf
-
remove clang warnings in auditing code Approved: Matthias Brantner, Till Westmann, David Graf
- 10987. By Chris Hillery
-
added the archive module to ExternalModules
.conf and the ChangeLog Approved: Luis Rodriguez Gonzalez, Juan Zacarias, Chris Hillery, Matthias Brantner - 10988. By David Graf
-
Because the jsoniq_emitter aggregates the xml_emitter, it needs to handover all the parameters. Inclusive aEmitAttributes. Approved: Till Westmann, David Graf
- 10989. By luisrod <luisrod@LUISROD-LAP>
-
- Added code for bug#1025564 "Deprecate -f argument to zorbacmd"
- 10990. By Markos Zaharioudakis
-
Allow prolog variables to be referenced before they are declared (XQuery 3.0 feature) (fixes bug #900688) Approved: Markos Zaharioudakis
- 10991. By Chris Hillery
-
Revert unintentional commit r10989. Approved: Luis Rodriguez Gonzalez, Chris Hillery
- 10992. By Ghislain Fourny
-
Updated JSONiq tutorial. Approved: William Candillon, Matthias Brantner
- 10993. By Paul J. Lucas
-
Miscellaneous changes, some a prerequisite for LLVM that should be done anyway and not have to wait for the far-in-the-future LLVM branch merge. Approved: Matthias Brantner, Paul J. Lucas
- 10994. By Ghislain Fourny
-
Specifying collection and property upon ZDST0006. Approved: Till Westmann, Matthias Brantner
- 10995. By Paul J. Lucas
-
QueryLoc clean-up:
1. Added all-argument constructor (needed for LLVM).
2. Removed pointless copy constructor since default is fine.
3. Removed pointless virtual destructor (there are no virtual functions!). Approved: Matthias Brantner, Paul J. Lucas - 10996. By Nicolae Brinza
-
Dynamically computed strings can now be cast to xs:QName. Fixes bug #898792 Approved: Nicolae Brinza, Chris Hillery
- 10997. By Till Westmann
-
move appending of ${requiredlibs-
store} to requiredlibs to a place where it works Approved: Ghislain Fourny, Till Westmann - 10998. By Ghislain Fourny
-
Fixes a bug that makes Zorba crash upon inserting more than one pair. Approved: Till Westmann, Matthias Brantner
- 10999. By Ghislain Fourny
-
Adds a method isEncoded to user-typed atomic items. Approved: Till Westmann, Matthias Brantner
- 11000. By Sorin Marian Nasoi <email address hidden>
-
fix for lp:969251. Approved: Ghislain Fourny, Sorin Marian Nasoi
- 11001. By Ghislain Fourny
-
Made URI computation lazy in StructuralAnyUri. Approved: Markos Zaharioudakis, Matthias Brantner
- 11002. By Ghislain Fourny
-
Fixes a Windows compiler error (bug 1040558). Approved: Luis Rodriguez Gonzalez, Juan Zacarias
- 11003. By William Candillon
-
Enable XML output from doxygen by default. Approved: Chris Hillery, Matthias Brantner
- 11004. By Markos Zaharioudakis
-
Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index) Approved: Markos Zaharioudakis
- 11005. By Markos Zaharioudakis
-
Fixed bug #1042840 (qname pool free-list corruption) Approved: Markos Zaharioudakis
- 11006. By Chris Hillery
-
Restoring execute bit to a bunch of scripts. Approved: Juan Zacarias, Matthias Brantner, Chris Hillery
- 11007. By Carlos Manuel Lopez
-
New memory management for compiler expressions (fixes bug #1036111) Approved: Markos Zaharioudakis
- 11008. By Ghislain Fourny
-
Simplified JSON items class and fixed some Xml Node static casts to handle JSON items as well. Approved: Markos Zaharioudakis, Matthias Brantner
- 11009. By Markos Zaharioudakis
-
Fixed bug #866984 (better error message for an eval error) Approved: Markos Zaharioudakis
- 11010. By Ghislain Fourny
-
Fixing a memory leak in append update primitive. Approved: Matthias Brantner, Till Westmann
- 11011. By William Candillon
-
Remove deprecated reference to the old sourceforge mailing-list. Approved: Matthias Brantner, William Candillon
- 11012. By Nicolae Brinza
-
Fixes for bugs #1023170, #1024033, #1027270 Approved: Chris Hillery, Matthias Brantner
- 11013. By Markos Zaharioudakis
-
rchandle cleanup Approved: Markos Zaharioudakis
- 11014. By Paul J. Lucas
-
Replaced UUID with thin layer over native platform implementation. Approved: Chris Hillery, Rodolfo Ochoa, Matthias Brantner, Paul J. Lucas
- 11015. By Chris Hillery
-
Corrected HTML serialization of empty elements. Added test cases for XHTML.
Approved: Matthias Brantner, Chris Hillery - 11016. By Chris Hillery
-
Fixes debug mode crash because of missing dictionary entries. Approved: William Candillon, Chris Hillery
- 11017. By Ghislain Fourny
-
Fixed bug 1041411 (prefixed true/false/null should be interpreted as name tests). Approved: Matthias Brantner, Chris Hillery
- 11018. By Ghislain Fourny
-
Removing superfluous store/naive prefixes in store includes. Approved: Till Westmann, Matthias Brantner
- 11019. By Paul J. Lucas
-
Suppressed warnings; moved gcc diagnostic push macros to config.h. Approved: Matthias Brantner, Paul J. Lucas
- 11020. By Till Westmann
-
add dependency on libuuid
- 11021. By Till Westmann
-
ensure deterministic test results for keys of index on unordered collection by sorting
- 11022. By Till Westmann
-
Some fixes in TreeID API and some include cleanup.
- 11023. By Matthias Brantner
-
Adding missing JSONiq library functions.
- 11024. By Matthias Brantner
-
Updated JSONiq tutorial.
- 11025. By Nicolae Brinza
-
Fixed bug #867227 -- improved error messages for missing commas Approved: William Candillon, Matthias Brantner, Nicolae Brinza
- 11026. By [u'Ghislain Fourny <ghislain.fourny@28msec.com>']
-
Introduces an item factory function to create atomic items with a user-defined type. Approved: Markos Zaharioudakis, Matthias Brantner
- 11027. By [u'David Graf <email address hidden>']
-
Fix bug #1045902. Approved: Ghislain Fourny, David Graf
- 11028. By [u'Carlos Lopez <email address hidden>']
-
Fixed a typo and a portability issue that prevented Zorba from compiling correctly on Windows. Approved: Chris Hillery, Sorin Marian Nasoi
- 11029. By [u'Carlos Lopez <email address hidden>', u'Markos Zaharioudakis <email address hidden>']
-
expression clauses allocated via memory pool Approved: Markos Zaharioudakis
- 11030. By [u'Carlos Lopez <email address hidden>', u'Markos Zaharioudakis <email address hidden>']
-
general flwor compile-time optimizations Approved: Markos Zaharioudakis
- 11031. By [u'Rodolfo Ochoa <email address hidden>', <email address hidden>']
-
Streaming between Zorba and Java/XQJ Approved: Chris Hillery, Cezar Andrei
- 11032. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
- jn:parse-json to allow multiple top-level items
- added jn:parse-json#2 taking an options parameter Approved: Ghislain Fourny, Matthias Brantner - 11033. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1046411 (automatic boxing of mutli-item sequence appearing as the value of an object pair)
Fixed bug #1046410 (automatic conversion to null of empty sequence appearing as the value of an object pair)
Approved: Markos Zaharioudakis - 11034. By [u'Paul J. Lucas <email address hidden>']
-
Fixed pragma warning. Approved: Matthias Brantner, Paul J. Lucas
- 11035. By [<email address hidden>', u'Dennis Knochenwefel <dennis.knochenwefel@28msec.com>']
-
set up a dedicated domain from which tests can fetch content. fix for bugs #1022495 and #1022494 Approved: Chris Hillery, Matthias Brantner
- 11036. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
fix for bug #1034990 (text serialization with jsoniq fails) Approved: Till Westmann, Matthias Brantner
- 11037. By [u'David Graf <email address hidden>']
-
feature: skipping nodes in a collection using a node-reference Approved: Matthias Brantner, Till Westmann
- 11038. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1047538 (jsoniq: SourceFinder:
:findLocalNodeS ources missing json expressions)
Fixed bug #1043976 (compiler warning in serialiser code)
Approved: Markos Zaharioudakis - 11039. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
node:copy function Approved: Markos Zaharioudakis, Matthias Brantner
- 11040. By [u'William Candillon <william.candillon@28msec.com>', u'Matthias Brantner <matthias.brantner@28msec.com>', u'Markos Zaharioudakis <email address hidden>', <email address hidden>', u'William Candillon <william.candillon@28msec.com>\n\n']
-
Add XQuery 3.0 Simple Map Operator.
See:
- http://www.w3. org/TR/ xquery- 30/#id- map-operator
- https://www.w3. org/Bugs/ Public/ show_bug. cgi?id= 16197 Approved: Markos Zaharioudakis, Chris Hillery, Matthias Brantner - 11041. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
Removed implicit document-order sorting after value probe functions. If this is required to answer queries,
the optimizer should make sure that he puts sorting in place if needed. Approved: Markos Zaharioudakis, Matthias Brantner - 11042. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1046559 (dynamic resolution between function invocation and jsoniq navigation).
Use char* instead of zstring as the hashmap key in json objects. Approved: Markos Zaharioudakis - 11043. By [u'Ghislain Fourny <ghislain.fourny@28msec.com>', u'Matthias Brantner <matthias.brantner@28msec.com>']
-
Fixes bug 1046415. Approved: Chris Hillery, Ghislain Fourny, Matthias Brantner
- 11044. By [u'Ghislain Fourny <ghislain.fourny@28msec.com>']
-
Implementing semantics of arithmetics and comparison operators for JSON nulls. Approved: Matthias Brantner, Till Westmann
- 11045. By [<email address hidden>']
-
Temporarily use www.zorba-
xquery. com rather than zorba-xquery.com for some tests. Eventually will consolidate all test data/configuration to zorba-tests. 28msec. us; see bug 1051115. Approved: Till Westmann, Chris Hillery - 11046. By [u'Rodolfo Ochoa <email address hidden>']
-
Fix to avoid message box on windows and the error can be handled by Zorba only. Approved: Juan Zacarias, Chris Hillery
- 11047. By [u'Ghislain Fourny <ghislain.fourny@28msec.com>', u'Till Westmann <till.westmann@28msec.com>']
-
Changing json insert syntax. Approved: Till Westmann, Matthias Brantner
- 11048. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #866994 (a better error message when collection iterator not open) Approved: Markos Zaharioudakis
- 11049. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1039254 (allow empty sequence as position value in positional LET var iterator) Approved: Markos Zaharioudakis
- 11050. By [u'David Graf <email address hidden>']
-
skip for value probe functions Approved: Matthias Brantner, David Graf
- 11051. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed #1052383 (accessing context item in eval expr) Approved: Markos Zaharioudakis
- 11052. By [u'Rodolfo Ochoa <email address hidden>']
-
Fixing all compilation errors for Windows:
- fixing precompiled headers
- fixing errors on CSharp binding
- fixing errors on stdint.h Approved: Chris Hillery, Juan Zacarias - 11053. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
pragma for preventing copying of nodes in functions that insert into collections Approved: Markos Zaharioudakis, Matthias Brantner
- 11054. By [u'Markos Zaharioudakis <email address hidden>']
-
For non-mutable global variables, assign a type based on their initializing expr.
Early optimization of positional predicates to sequence-point-access expressions: now done at translation time, if possible.
Approved: Markos Zaharioudakis - 11055. By [u'Till Westmann <till.westmann@28msec.com>']
-
add jn:encode-
for-roundtrip and jn:decode- from-roundtrip
adapt json serialiation to version 0.4.39 of the JSONiq specification Approved: Paul J. Lucas, Matthias Brantner, Chris Hillery - 11056. By [u'Matthias Brantner <matthias.brantner@28msec.com>', u'Ghislain Fourny <ghislain.fourny@28msec.com>']
-
Changing JSON object implementation to unordered maps. Approved: Ghislain Fourny, Matthias Brantner
- 11057. By Juan Zacarias
-
Removed fn:parse-xml#2, Fix for bug 950621
Unmerged revisions
Preview Diff
1 | === modified file 'ChangeLog' | |||
2 | --- ChangeLog 2012-09-10 18:50:57 +0000 | |||
3 | +++ ChangeLog 2012-09-10 22:51:19 +0000 | |||
4 | @@ -15,6 +15,7 @@ | |||
5 | 15 | predicate rewrite) to general flwor expressions. | 15 | predicate rewrite) to general flwor expressions. |
6 | 16 | 16 | ||
7 | 17 | Bug Fixes/Other Changes: | 17 | Bug Fixes/Other Changes: |
8 | 18 | * Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module function xml:parse() instead) | ||
9 | 18 | * Fixed bug #867227 (Improved error message for missing commas) | 19 | * Fixed bug #867227 (Improved error message for missing commas) |
10 | 19 | * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse()) | 20 | * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse()) |
11 | 20 | * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName) | 21 | * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName) |
12 | 21 | 22 | ||
13 | === modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp' | |||
14 | --- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-09-10 18:50:57 +0000 | |||
15 | +++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-09-10 22:51:19 +0000 | |||
16 | @@ -74,34 +74,9 @@ | |||
17 | 74 | is = iss.get(); | 74 | is = iss.get(); |
18 | 75 | } | 75 | } |
19 | 76 | 76 | ||
48 | 77 | // optional base URI argument | 77 | |
49 | 78 | if (theChildren.size() == 2) | 78 | baseUri = theSctx->get_base_uri(); |
50 | 79 | { | 79 | |
23 | 80 | consumeNext(result, theChildren[1].getp(), planState); | ||
24 | 81 | ZORBA_ASSERT(result); | ||
25 | 82 | |||
26 | 83 | try { | ||
27 | 84 | lValidatedBaseUri = URI(result->getStringValue()); | ||
28 | 85 | } catch (ZorbaException const& /* e */) { | ||
29 | 86 | throw XQUERY_EXCEPTION( | ||
30 | 87 | err::FODC0007, | ||
31 | 88 | ERROR_PARAMS( result->getStringValue() ), | ||
32 | 89 | ERROR_LOC( loc ) | ||
33 | 90 | ); | ||
34 | 91 | } | ||
35 | 92 | |||
36 | 93 | if (!lValidatedBaseUri.is_absolute()) { | ||
37 | 94 | throw XQUERY_EXCEPTION( | ||
38 | 95 | err::FODC0007, | ||
39 | 96 | ERROR_PARAMS( lValidatedBaseUri.toString() ), | ||
40 | 97 | ERROR_LOC( loc ) | ||
41 | 98 | ); | ||
42 | 99 | } | ||
43 | 100 | |||
44 | 101 | result->getStringValue2(baseUri); | ||
45 | 102 | } else { | ||
46 | 103 | baseUri = theSctx->get_base_uri(); | ||
47 | 104 | } | ||
51 | 105 | 80 | ||
52 | 106 | try { | 81 | try { |
53 | 107 | store::LoadProperties loadProps; | 82 | store::LoadProperties loadProps; |
54 | 108 | 83 | ||
55 | === modified file 'src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml' | |||
56 | --- src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml 2012-09-10 18:50:57 +0000 | |||
57 | +++ src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml 2012-09-10 22:51:19 +0000 | |||
58 | @@ -27,12 +27,6 @@ | |||
59 | 27 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> | 27 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> |
60 | 28 | <zorba:output>document-node()</zorba:output> | 28 | <zorba:output>document-node()</zorba:output> |
61 | 29 | </zorba:signature> | 29 | </zorba:signature> |
62 | 30 | |||
63 | 31 | <zorba:signature localname="parse-xml" prefix="fn" version="3.0"> | ||
64 | 32 | <zorba:param>xs:string?</zorba:param> <!-- string to parse --> | ||
65 | 33 | <zorba:param>xs:string</zorba:param> <!-- base uri --> | ||
66 | 34 | <zorba:output>node()*</zorba:output> | ||
67 | 35 | </zorba:signature> | ||
68 | 36 | 30 | ||
69 | 37 | <zorba:methods> | 31 | <zorba:methods> |
70 | 38 | <zorba:accessesDynCtx returnValue="true"/> | 32 | <zorba:accessesDynCtx returnValue="true"/> |
71 | 39 | 33 | ||
72 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq' | |||
73 | --- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq 2012-09-10 18:50:57 +0000 | |||
74 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq 1970-01-01 00:00:00 +0000 | |||
75 | @@ -1,1 +0,0 @@ | |||
76 | 1 | fn:base-uri(fn:parse-xml("<a xml:base='foo'/>", "http://example.org/")/a) | ||
77 | 2 | 0 | ||
78 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec' | |||
79 | --- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec 2012-09-10 18:50:57 +0000 | |||
80 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec 1970-01-01 00:00:00 +0000 | |||
81 | @@ -1,1 +0,0 @@ | |||
82 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0007 | ||
83 | 2 | 0 | ||
84 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq' | |||
85 | --- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq 2012-09-10 18:50:57 +0000 | |||
86 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq 1970-01-01 00:00:00 +0000 | |||
87 | @@ -1,2 +0,0 @@ | |||
88 | 1 | (: check for not absolute URI (FODC0007) :) | ||
89 | 2 | fn:parse-xml("<a xml:base='foo'/>", "blub") | ||
90 | 3 | 0 | ||
91 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec' | |||
92 | --- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec 2012-09-10 18:50:57 +0000 | |||
93 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec 1970-01-01 00:00:00 +0000 | |||
94 | @@ -1,1 +0,0 @@ | |||
95 | 1 | Error: http://www.w3.org/2005/xqt-errors:FODC0007 | ||
96 | 2 | 0 | ||
97 | === removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq' | |||
98 | --- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq 2012-09-10 18:50:57 +0000 | |||
99 | +++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq 1970-01-01 00:00:00 +0000 | |||
100 | @@ -1,2 +0,0 @@ | |||
101 | 1 | (: check for invalid URI (FODC0007) :) | ||
102 | 2 | fn:parse-xml("<a xml:base='foo'/>", "http://") |
Change looks good, but please add a line to the Changelog - something like "Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module function xml:parse() instead)" in the Bug Fixes section.