Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11150
Merged at revision: 11521
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 44 lines (+3/-2)
3 files modified
ChangeLog (+1/-0)
src/types/casting.cpp (+2/-1)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+170021@code.launchpad.net

Commit message

Fixed bug #1188280 (casting xs:id to xs:ncname)

Description of the change

Fixed bug #1188280 (casting xs:id to xs:ncname)

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job markos-scratch-2013-06-18T09-19-45.759Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-06-18 02:28:10 +0000
3+++ ChangeLog 2013-06-18 09:13:43 +0000
4@@ -29,6 +29,7 @@
5 * Fixed bug #1187537 (Eliminate (or at least reduce) use of MAX_PATH)
6 * Fixed bug #1180220 (Consolidate redundant path/file public APIs)
7 * Fixed bug #1103115 (Timezone units as hours are wrong)
8+ * Fixed bug #1188280 (casting xs:id to xs:ncname)
9 * Fixed implementation of fn:deep-equal according to latest W3C spec.
10 * Must apply document ordering on the domain expression of a FOR clause, if
11 the FOR clause is followed by a sequential clause.
12
13=== modified file 'src/types/casting.cpp'
14--- src/types/casting.cpp 2013-05-28 16:07:14 +0000
15+++ src/types/casting.cpp 2013-06-18 09:13:43 +0000
16@@ -2659,6 +2659,7 @@
17 }
18
19 if (targetTypeCode == store::XS_NCNAME &&
20+ !TypeOps::is_subtype(sourceTypeCode, store::XS_NCNAME) &&
21 sourceTypeCode != store::XS_STRING &&
22 sourceTypeCode != store::XS_NCNAME &&
23 sourceTypeCode != store::XS_UNTYPED_ATOMIC)
24@@ -2667,7 +2668,7 @@
25 }
26
27 CastFunc castFunc = theCastMatrix[theMapping[sourceTypeCode]]
28- [theMapping[targetTypeCode]];
29+ [theMapping[targetTypeCode]];
30 if (castFunc == 0)
31 {
32 throwXPTY0004Exception(errInfo);
33
34=== modified file 'test/fots/CMakeLists.txt'
35--- test/fots/CMakeLists.txt 2013-06-18 02:28:10 +0000
36+++ test/fots/CMakeLists.txt 2013-06-18 09:13:43 +0000
37@@ -217,7 +217,6 @@
38 EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 1188281)
39 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-11 1188279)
40 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-12 1188279)
41-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-ncname-001 1188280)
42 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 1110217)
43 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-22 1110217)
44 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-23 1110217)

Subscribers

People subscribed via source and target branches