Merge lp:~zorba-coders/zorba/bug_897616 into lp:zorba

[Sorin Marian Nasoi]

Fix for bug #897616.

Fix for bug #897616.

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

Approved.

review: Approve

[Nicolae Brinza (nbrinza)]

The changes are ok. Approved.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug_897616-2011-11-29T21-49-32.525Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug_897616-2011-11-29T21-49-32.525Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2011-11-23 22:25:05 +0000
+++ ChangeLog	2011-11-29 11:27:06 +0000
@@ -73,6 +73,8 @@
   splitting "module path" into separate URI and Library paths
   * Fixed bug #872502 (validation of the JSON module xqdoc fails)
   * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
+  * Fixed bug #897616 (Fix the generation of the XQFTTS report results for
+  W3C)
 
 version 2.0.3
   * Fixed bug #867662 ("nullptr" warning)
 
=== modified file 'test/rbkt/Scripts/w3c/generate-submission-xqftts.xq'
--- test/rbkt/Scripts/w3c/generate-submission-xqftts.xq	2011-10-25 05:13:10 +0000
+++ test/rbkt/Scripts/w3c/generate-submission-xqftts.xq	2011-11-29 11:27:06 +0000
@@ -11,7 +11,7 @@
     <test-suite-result>
       <implementation
         name="Zorba" 
-        version='2.0.3'
+        version="2.1, 'Basileia'"
         anonymous-result-column="false">
       
      <organization         
@@ -54,7 +54,6 @@
              <context-property name="{data($cp/@name)}" context-type="{data($cp/@context-type)}" value="{data($cp/@value)}" />
         }
         </context-properties>
-        <context-properties>{$XQFTTSZorba//*:context-property}</context-properties>
       )
     }
 
@@ -62,11 +61,11 @@
 
     <syntax>XQuery</syntax>
 
-    <test-run dateRun="2011-09-23">
+    <test-run dateRun="2011-11-28">
       <test-suite version="current"/>
       <transformation><p>Standard</p></transformation>
       <comparison><p>Standard</p></comparison>
-      <otherComments><p>XQFTTS taken from W3C CVS as of 2011-09-21.</p></otherComments>
+      <otherComments><p>XQFTTS taken from W3C CVS as of 2011-11-28.</p></otherComments>
     </test-run>
 
     {