Merge lp:~zorba-coders/zorba/bug_872502 into lp:zorba
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Matthias Brantner | ||||
Approved revision: | 10529 | ||||
Merged at revision: | 10533 | ||||
Proposed branch: | lp:~zorba-coders/zorba/bug_872502 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
89 lines (+16/-5) 7 files modified
ChangeLog (+1/-0) modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq (+4/-4) src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp (+1/-1) test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_01.xml.res (+1/-0) test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_02.xml.res (+1/-0) test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq (+4/-0) test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq (+4/-0) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug_872502 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Sorin Marian Nasoi | Approve | ||
Review via email: mp+80463@code.launchpad.net |
Commit message
Fix for bug lp:872502:
- in the case where library modules were using external C++ library dependencies (like it was the case with the reported Json module) the XQDoc XML generated by Zorba was not valid according to the XQDoc schema: this was fixed.
- also the XQDoc2XHTML generator was updated to reflect this change
- added 2 tests but I used a module part of the Zorba core (http://
Description of the change
Fix for bug lp:872502:
- in the case where library modules were using external C++ library dependencies (like it was the case with the reported Json module) the XQDoc XML generated by Zorba was not valid according to the XQDoc schema: this was fixed.
- also the XQDoc2XHTML generator was updated to reflect this change
- added 2 tests but I used a module part of the Zorba core (http://
Could you please add the fix to the ChangeLog?