Merge lp:~zorba-coders/zorba/bug1160028-valType into lp:zorba

[Cezar Andrei]

Fix for bug1160028. Fix URI of the type when validating with xsi:type attribute specified.

Fix for bug1160028. Fix URI of the type when validating with xsi:type attribute specified.

[Cezar Andrei (cezar-andrei)]

Fix for bug1160028. Fix URI of the type when validating with xsi:type attribute specified.

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

I see that the proposed change fixes only one failure from bug lp:1160028.

If you want I can approbe the change but you have to open a new bug for the remaining 13 failures from bug lp:1160028,

The alternative off course if to keep the bind to lp:1160028 and try to fix the remaining 13 failures.

[Cezar Andrei (cezar-andrei)]

since they are different bugs I would merge this one and keep the bug opened or add a new bug for the rest.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> since they are different bugs I would merge this one and keep the bug opened
> or add a new bug for the rest.
Added lp:1167400 for the 9 remaining failures.

The 4 failures in "prod-FunctionCall": "FunctionCall-003, FunctionCall-005, FunctionCall-007, FunctionCall-008"
are fixed: checked in r11361.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1160028-valType-2013-04-10T15-50-06.234Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1160028-valType-2013-04-10T15-50-06.234Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/types/schema/SchemaValidatorFilter.cpp'
--- src/types/schema/SchemaValidatorFilter.cpp	2013-02-26 04:12:43 +0000
+++ src/types/schema/SchemaValidatorFilter.cpp	2013-04-04 21:42:22 +0000
@@ -1028,7 +1028,9 @@
     {
       const ElemStack::StackElem* topElem = fElemStack.topElement();
       DatatypeValidator *currentDV = 0;
-      if(topElem->fThisElement->isDeclared())
+      if(topElem->fThisElement->isDeclared()  ||
+         theXsiType  // this is when there is no schema import but xsiType is used
+        )
       {
         ComplexTypeInfo *currentTypeInfo = ((XercSchemaValidator*)fValidator)->getCurrentTypeInfo();
         if(currentTypeInfo)

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-04 11:51:59 +0000
+++ test/fots/CMakeLists.txt	2013-04-04 21:42:22 +0000
@@ -537,7 +537,6 @@
 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
-EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-101 0)