zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

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

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/170021

Fixed bug #1188280 (casting xs:id to xs:ncname)
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/170021
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-18 02:28:10 +0000
+++ ChangeLog	2013-06-18 09:13:43 +0000
@@ -29,6 +29,7 @@
   * Fixed bug #1187537 (Eliminate (or at least reduce) use of MAX_PATH)
   * Fixed bug #1180220 (Consolidate redundant path/file public APIs)
   * Fixed bug #1103115 (Timezone units as hours are wrong)
+  * Fixed bug #1188280 (casting xs:id to xs:ncname)
   * Fixed implementation of fn:deep-equal according to latest W3C spec.
   * Must apply document ordering on the domain expression of a FOR clause, if
     the FOR clause is followed by a sequential clause.

=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp	2013-05-28 16:07:14 +0000
+++ src/types/casting.cpp	2013-06-18 09:13:43 +0000
@@ -2659,6 +2659,7 @@
   }
 
   if (targetTypeCode == store::XS_NCNAME &&
+      !TypeOps::is_subtype(sourceTypeCode, store::XS_NCNAME) && 
       sourceTypeCode != store::XS_STRING &&
       sourceTypeCode != store::XS_NCNAME &&
       sourceTypeCode != store::XS_UNTYPED_ATOMIC)
@@ -2667,7 +2668,7 @@
   }
 
   CastFunc castFunc = theCastMatrix[theMapping[sourceTypeCode]]
-                                    [theMapping[targetTypeCode]];
+                                   [theMapping[targetTypeCode]];
   if (castFunc == 0)
   {
     throwXPTY0004Exception(errInfo);

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-06-18 02:28:10 +0000
+++ test/fots/CMakeLists.txt	2013-06-18 09:13:43 +0000
@@ -217,7 +217,6 @@
 EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 1188281)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-11 1188279)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-12 1188279)
-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-ncname-001 1188280)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 1110217)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-22 1110217)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-23 1110217)