zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/bug1147563 into lp:zorba.

Commit message:
Fixes for nilled function

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1147563 in Zorba: "FOTS: fn:nilled failures (at least 15)"
  https://bugs.launchpad.net/zorba/+bug/1147563

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485

Fixes for nilled function
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2013-03-07 10:10:10 +0000
+++ src/store/naive/node_items.cpp	2013-03-14 23:55:43 +0000
@@ -3068,8 +3068,10 @@
   for (; ite != end; ++ite)
   {
     XmlNode* attr = *ite;
-    if (ZSTREQ(attr->getNodeName()->getNamespace(), "xsi") &&
-        ZSTREQ(attr->getNodeName()->getLocalName(), "nil"))
+    if (ZSTREQ(attr->getNodeName()->getNamespace(), "http://www.w3.org/2001/XMLSchema-instance";) &&
+        ZSTREQ(attr->getNodeName()->getLocalName(), "nil") &&
+        ( ZSTREQ(attr->getStringValue(), "true") || ZSTREQ(attr->getStringValue(), "1") ) &&
+        isValidated())
     {
       nilled = true;
       break;