Zorba

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

  1. fix_bug_1018737
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 10900
Merged at revision: 10956
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1018737
Merge into: lp:zorba
Diff against target: 570 lines (+166/-61)
8 files modified
doc/zorba/conformance.dox (+19/-15)
doc/zorba/conformanceXQFTTS.dox (+7/-6)
doc/zorba/conformanceXQTS.dox (+8/-8)
doc/zorba/conformanceXQUTS.dox (+9/-8)
scripts/sanity_checks/README.txt (+19/-5)
scripts/sanity_checks/conformance_xqftts.xqi (+33/-4)
scripts/sanity_checks/conformance_xqts.xqi (+36/-9)
scripts/sanity_checks/conformance_xquts.xqi (+35/-6)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1018737
Reviewer Review Type Date Requested Status
William Candillon Approve
Sorin Marian Nasoi Approve
Review via email: mp+116609@code.launchpad.net

Commit message

- added information about the Zorba and XQTS versions that were used in generating the reports
- updated the README.txt with info regarding conformance reports generation

Description of the change

- added information about the Zorba and XQTS versions that were used in generating the reports
- updated the README.txt with info regarding conformance reports generation

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1018737-2012-07-27T11-31-02.972Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1018737-2012-07-27T11-31-02.972Z 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 'doc/zorba/conformance.dox'
2--- doc/zorba/conformance.dox 2012-07-24 08:48:48 +0000
3+++ doc/zorba/conformance.dox 2012-07-25 09:24:20 +0000
4@@ -59,6 +59,7 @@
5
6
7 This is the W3C XQuery 1.0 conformance summary:
8+ In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQTS version 'current' (XQTS taken from W3C CVS as of 2012-01-12).
9 <table bgcolor="lightcyan">
10 <tr>
11 <td>W3C XQuery 1.0 features</td>
12@@ -73,18 +74,18 @@
13 <tr bgcolor="lightcyan">
14 <td bgcolor="lightcyan">Minimal Conformance</td>
15 <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td>
16- <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td>
17+ <td align="center" bgcolor="palegreen">17495/17499<br />99.98%</td>
18 </tr>
19 <tr bgcolor="lightcyan">
20 <td bgcolor="lightcyan">Optional Features</td>
21- <td align="center" bgcolor="palegreen">538/540<br />99.63%</td>
22- <td align="center" bgcolor="palegreen">538/540<br />99.63%</td>
23+ <td align="center" bgcolor="palegreen">539/540<br />99.81%</td>
24+ <td align="center" bgcolor="palegreen">539/540<br />99.81%</td>
25 </tr>
26 <tr bgcolor="lightcyan">
27 <td bgcolor="lightcyan">  Schema Import Feature</td>
28- <td align="center" bgcolor="palegreen">178/179<br />
29+ <td align="center" bgcolor="mediumseagreen">179/179<br />
30 </td>
31- <td align="center" bgcolor="palegreen">178/179<br />
32+ <td align="center" bgcolor="mediumseagreen">179/179<br />
33 </td>
34 </tr>
35 <tr bgcolor="lightcyan">
36@@ -145,7 +146,7 @@
37 <td align="center" bgcolor="mediumseagreen">21/21<br />100%</td>
38 </tr>
39 <tr bgcolor="lightcyan">
40- <td bgcolor="lightcyan">FunctX -- A Collection of Functions</td>
41+ <td bgcolor="lightcyan">FunctX -- A Collection Of Functions</td>
42 <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td>
43 <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td>
44 </tr>
45@@ -179,6 +180,7 @@
46 </table>
47
48 This is the W3C XQuery Update Facility 1.0 conformance summary:
49+ In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQUTS version 'current' (XQUTS version taken from CVS as of 2012-01-12).
50 <table bgcolor="lightcyan">
51 <tr>
52 <td>W3C XQuery Update Facility 1.0 feature</td>
53@@ -215,14 +217,14 @@
54 </tr>
55 <tr bgcolor="lightcyan">
56 <td bgcolor="lightcyan">Optional Features</td>
57- <td align="center" bgcolor="palegreen">99/126<br />78.57%</td>
58- <td align="center" bgcolor="palegreen">99/126<br />78.57%</td>
59+ <td align="center" bgcolor="palegreen">97/126<br />76.98%</td>
60+ <td align="center" bgcolor="palegreen">97/126<br />76.98%</td>
61 </tr>
62 <tr bgcolor="lightcyan">
63 <td bgcolor="lightcyan">  Revalidation</td>
64- <td align="center" bgcolor="mediumseagreen">77/77<br />
65+ <td align="center" bgcolor="palegreen">76/77<br />
66 </td>
67- <td align="center" bgcolor="mediumseagreen">77/77<br />
68+ <td align="center" bgcolor="palegreen">76/77<br />
69 </td>
70 </tr>
71 <tr bgcolor="lightcyan">
72@@ -241,9 +243,9 @@
73 </tr>
74 <tr bgcolor="lightcyan">
75 <td bgcolor="lightcyan">  fn:put applied to nodes other than document and element nodes</td>
76- <td align="center" bgcolor="mediumseagreen">8/8<br />
77+ <td align="center" bgcolor="palegreen">7/8<br />
78 </td>
79- <td align="center" bgcolor="mediumseagreen">8/8<br />
80+ <td align="center" bgcolor="palegreen">7/8<br />
81 </td>
82 </tr>
83 <tr bgcolor="lightcyan">
84@@ -331,6 +333,8 @@
85 </table>
86
87 This is the W3C XQuery and XPath Full Text 1.0 conformance summary:
88+In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQFTTS version 'current' (XQFTTS taken from W3C CVS as of 2012-01-12).
89+
90 <table bgcolor="lightcyan">
91 <tr>
92 <td>W3C XQuery and XPath Full Text 1.0 features</td>
93@@ -344,7 +348,7 @@
94 </tr>
95 <tr bgcolor="lightcyan">
96 <td bgcolor="lightcyan">Minimal Conformance</td>
97- <td align="center" bgcolor="palegreen">385/429<br />89.74%</td>
98+ <td align="center" bgcolor="palegreen">384/429<br />89.51%</td>
99 <td align="center" bgcolor="palegreen">374/429<br />87.18%</td>
100 </tr>
101 <tr bgcolor="lightcyan">
102@@ -354,8 +358,8 @@
103 </tr>
104 <tr bgcolor="lightcyan">
105 <td bgcolor="lightcyan">Use Cases</td>
106- <td align="center" bgcolor="palegreen">121/135<br />89.63%</td>
107- <td align="center" bgcolor="palegreen">103/135<br />76.3%</td>
108+ <td align="center" bgcolor="palegreen">120/135<br />88.89%</td>
109+ <td align="center" bgcolor="palegreen">102/135<br />75.56%</td>
110 </tr>
111 <tr bgcolor="lightcyan">
112 <td bgcolor="lightcyan">Consistency in XQFTTS Catalog</td>
113
114=== modified file 'doc/zorba/conformanceXQFTTS.dox'
115--- doc/zorba/conformanceXQFTTS.dox 2012-07-24 08:48:48 +0000
116+++ doc/zorba/conformanceXQFTTS.dox 2012-07-25 09:24:20 +0000
117@@ -1,6 +1,7 @@
118-/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance
119+/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance.
120
121- Zorba achieves 89.74% on minimal conformance (84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
122+ In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQFTTS version 'current' (XQFTTS taken from W3C CVS as of 2012-01-12).
123+ Zorba achieves 89.51% on minimal conformance (and 84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
124
125 Please see the table below for more details.
126 <table bgcolor="lightcyan">
127@@ -236,7 +237,7 @@
128 </tr>
129 <tr bgcolor="lightcyan">
130 <td bgcolor="lightcyan">              Full-Text Thesaurus Match Option</td>
131- <td align="center" bgcolor="mediumseagreen">10/10</td>
132+ <td align="center" bgcolor="palegreen">9/10</td>
133 <td align="center" bgcolor="palegreen">7/10</td>
134 </tr>
135 <tr bgcolor="lightcyan">
136@@ -466,8 +467,8 @@
137 </tr>
138 <tr bgcolor="lightcyan">
139 <td bgcolor="lightcyan">  Use Case "FULL-TEXT-COMPOSABILITY"</td>
140- <td align="center" bgcolor="palegreen">6/7</td>
141- <td align="center" bgcolor="palegreen">4/7</td>
142+ <td align="center" bgcolor="palegreen">5/7</td>
143+ <td align="center" bgcolor="palegreen">3/7</td>
144 </tr>
145 <tr bgcolor="lightcyan">
146 <td bgcolor="lightcyan">  Use Case "XQUERY-XPATH-COMPOSABILITY"</td>
147@@ -485,4 +486,4 @@
148 <td align="center" bgcolor="mediumseagreen">3/3</td>
149 </tr>
150 </table>
151-*/
152+*/
153\ No newline at end of file
154
155=== modified file 'doc/zorba/conformanceXQTS.dox'
156--- doc/zorba/conformanceXQTS.dox 2012-07-24 08:48:48 +0000
157+++ doc/zorba/conformanceXQTS.dox 2012-07-25 09:24:20 +0000
158@@ -1,8 +1,8 @@
159 /** \page conformanceXQTS W3C XQuery 1.0 Conformance
160
161-Zorba achieves 99.99% on minimal conformance (and 99.63% on Optional Features) for the W3C XML Query Test Suite.
162-Please see the table below for more details.
163-
164+ In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQTS version 'current' (XQTS taken from W3C CVS as of 2012-01-12).
165+ Zorba achieves 99.99% on minimal conformance (and 99.81% on Optional Features) for the W3C XML Query Test Suite.
166+Please see the table below for more details.
167 <table bgcolor="lightcyan">
168 <tr>
169 <td>W3C XQuery 1.0 features</td>
170@@ -687,12 +687,12 @@
171 <tr bgcolor="lightcyan">
172 <td bgcolor="lightcyan">      Content</td>
173 <td align="center" bgcolor="mediumseagreen">126/126</td>
174- <td align="center" bgcolor="mediumseagreen">126/126</td>
175+ <td align="center" bgcolor="palegreen">125/126</td>
176 </tr>
177 <tr bgcolor="lightcyan">
178 <td bgcolor="lightcyan">      White Space Element Content</td>
179 <td align="center" bgcolor="mediumseagreen">83/83</td>
180- <td align="center" bgcolor="mediumseagreen">83/83</td>
181+ <td align="center" bgcolor="palegreen">82/83</td>
182 </tr>
183 <tr bgcolor="lightcyan">
184 <td bgcolor="lightcyan">      Other Direct Constructors</td>
185@@ -1721,8 +1721,8 @@
186 </tr>
187 <tr bgcolor="lightcyan">
188 <td bgcolor="lightcyan">    Schema Import</td>
189- <td align="center" bgcolor="palegreen">30/31</td>
190- <td align="center" bgcolor="palegreen">30/31</td>
191+ <td align="center" bgcolor="mediumseagreen">31/31</td>
192+ <td align="center" bgcolor="mediumseagreen">31/31</td>
193 </tr>
194 <tr bgcolor="lightcyan">
195 <td bgcolor="lightcyan">    FOR Clause with TypeDeclaration</td>
196@@ -3165,4 +3165,4 @@
197 <td align="center" bgcolor="mediumseagreen">3/3</td>
198 </tr>
199 </table>
200-*/
201+*/
202\ No newline at end of file
203
204=== modified file 'doc/zorba/conformanceXQUTS.dox'
205--- doc/zorba/conformanceXQUTS.dox 2012-07-24 08:48:48 +0000
206+++ doc/zorba/conformanceXQUTS.dox 2012-07-25 09:24:20 +0000
207@@ -1,8 +1,9 @@
208 /** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance
209
210-Zorba achieves 100% on minimal conformance (and 78.57% on Optional Features) for the XQuery Update Facility Test Suite.
211-Please see the table below for more details.
212-
213+ In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQUTS version 'current' (XQUTS version taken from CVS as of 2012-01-12).
214+ Zorba achieves 100% on minimal conformance (and 76.98% on Optional Features) for the W3C XQuery Update Facility Test Suite.
215+
216+Please see the table below for more details.
217 <table bgcolor="lightcyan">
218 <tr>
219 <td>W3C XQuery Update Facility 1.0 features</td>
220@@ -236,8 +237,8 @@
221 </tr>
222 <tr bgcolor="lightcyan">
223 <td bgcolor="lightcyan">    Revalidation Declaration = strict + skip</td>
224- <td align="center" bgcolor="mediumseagreen">1/1</td>
225- <td align="center" bgcolor="mediumseagreen">1/1</td>
226+ <td align="center" bgcolor="coral">0/1</td>
227+ <td align="center" bgcolor="coral">0/1</td>
228 </tr>
229 <tr bgcolor="lightcyan">
230 <td bgcolor="lightcyan">  Update Facility Static Typing Feature</td>
231@@ -276,8 +277,8 @@
232 </tr>
233 <tr bgcolor="lightcyan">
234 <td bgcolor="lightcyan">    fn:put() applied to attribute nodes</td>
235- <td align="center" bgcolor="mediumseagreen">1/1</td>
236- <td align="center" bgcolor="mediumseagreen">1/1</td>
237+ <td align="center" bgcolor="coral">0/1</td>
238+ <td align="center" bgcolor="coral">0/1</td>
239 </tr>
240 <tr bgcolor="lightcyan">
241 <td bgcolor="lightcyan">    fn:put() applied to attribute nodes - unsupported</td>
242@@ -330,4 +331,4 @@
243 <td align="center" bgcolor="mediumseagreen">1/1</td>
244 </tr>
245 </table>
246-*/
247+*/
248\ No newline at end of file
249
250=== modified file 'scripts/sanity_checks/README.txt'
251--- scripts/sanity_checks/README.txt 2012-07-24 08:48:48 +0000
252+++ scripts/sanity_checks/README.txt 2012-07-25 09:24:20 +0000
253@@ -1,17 +1,31 @@
254-The command ./zorba -f -q /tmp/XQTS_current/run_xqts.xq generates:
255+1) compile Zorba by setting the following flags:
256+cmake -DZORBA_TEST_XQUERYX=ON -DZORBA_XQUERYX=ON -DZORBA_WITH_BIG_INTEGER=ON -DZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON -DZORBA_MODULES_DIR="/home" ..
257+
258+2) import the 3 testsuites by running:
259+$zorbaDir/test/rbkt/Scripts/w3c/import_w3c_testsuite.sh $zorbaDir
260+$zorbaDir/test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh $zorbaDir
261+$zorbaDir/test/update/Scripts/import_w3c_update_testsuite.sh $zorbaDir
262+
263+3) Generate the conformance reports following the details provided in:
264+ - test/rbtk/Scripts/w3c/Readme.txt
265+ - test/update/Scripts/Readme.txt
266+The latest reports can also be downloaded from the private wiki: http://my.zorba-xquery.com/dokuwiki/doku.php
267+
268+4.1) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqts.xq generates:
269 - /tmp/XQTS_current/conformanceXQTS.dox
270 - /tmp/XQTS_current/conformanceXQTSSummary.dox
271-Note: this takes quite a long time because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX)
272-Also there are over 580 XQueryX tests for which there are no results reported in the submission XML.
273+Note: this should take around 2 minutes because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX)
274+Also there are over 402 XQueryX tests for which there are no results reported in the submission XML.
275
276-The command ./zorba -f -q /tmp/XQTS_current/run_xquts.xq generates:
277+4.2) The command ./zorba -f -q ../../scripts/sanity_checks/run_xquts.xq generates:
278 - /tmp/XQUTS_current/conformanceXQUTS.dox
279 - /tmp/XQUTS_current/conformanceXQUTSSummary.dox
280
281-The command ./zorba -f -q /tmp/XQTS_current/run_xqftts.xq generates:
282+4.3) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqftts.xq generates:
283 - /tmp/XQFTTS_current/conformanceXQFTTS.dox
284 - /tmp/XQFTTS_current/conformanceXQFTTSSummary.dox
285
286+
287 Here is how the query work:
288 - they load the correct catalog(XQTSCatalog.xml, XQUTSCatalog.xml or XQFTTSCatalog.xml)
289 - they load the submission XML's for XQuery and XQueryX
290
291=== modified file 'scripts/sanity_checks/conformance_xqftts.xqi'
292--- scripts/sanity_checks/conformance_xqftts.xqi 2012-07-24 08:48:48 +0000
293+++ scripts/sanity_checks/conformance_xqftts.xqi 2012-07-25 09:24:20 +0000
294@@ -57,9 +57,17 @@
295 declare %private variable $conf:XQuery as xs:string := "XQuery";
296 declare %private variable $conf:XQueryX as xs:string := "XQueryX";
297
298+declare %private variable $conf:infos := <infos/>;
299 declare %private variable $conf:features := <features/>;
300+declare %private variable $conf:numbers := <numbers/>;
301
302-declare %private variable $conf:numbers := <numbers/>;
303+declare %private %ann:sequential function conf:collect-info(
304+ $name as xs:string,
305+ $version as xs:string,
306+ $info as xs:string)
307+{
308+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
309+};
310
311 declare %private %ann:sequential function conf:collect-feature(
312 $name as xs:string,
313@@ -327,7 +335,15 @@
314 variable $docXQ := fn:parse-xml(file:read-text(file:resolve-path($conf:XQFTTS_submission)));
315 for $test in $docXQ/xqRes:test-suite-result//xqRes:test-case
316 return dml:apply-insert-nodes($conf:submissionXquery, $test);
317-
318+
319+ conf:collect-info("Zorba",
320+ data($docXQ/xqRes:test-suite-result/xqRes:implementation/@version),
321+ "");
322+ conf:collect-info("XQFTTS",
323+ data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
324+ normalize-space(data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
325+
326+
327 (: collect features :)
328 for $feature in $docXQ/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
329 return
330@@ -391,7 +407,7 @@
331 return
332 concat("Zorba achieves ",
333 $minConf,
334- "% on minimal conformance (",
335+ "% on minimal conformance (and ",
336 string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
337 return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
338 ") for the W3C XPath Full Text 1.0 Test Suite.
339@@ -408,13 +424,24 @@
340 conf:create-collection($conf:XQueryX, $XQTS_catalog);
341
342 variable $pageNameSummary := "conformanceXQFTTSSummary";
343- variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
344+ variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
345+ variable $details := concat("In generating the report we used Zorba version ",
346+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
347+ " that can be downloaded from ",
348+ data($conf:infos//info[@name="Zorba"]/@version),
349+ " and XQFTTS version '",
350+ data($conf:infos//info[@name="XQFTTS"]/@version),
351+ "' (",
352+ data($conf:infos//info[@name="XQFTTS"]/@info),
353+ ").");
354
355 file:write(trace($pathSummary,"output file path"),
356 ("/** \page conformanceXQFTTSSummary Summary W3C XQuery and XPath Full Text 1.0 conformance.
357
358 The following table shows the supported features:
359 ",
360+ {$details},"
361+",
362 {conf:generate-features-table()},"
363 ",
364 {conf:generate-summary-table($XQTS_catalog)}
365@@ -429,6 +456,8 @@
366 ("/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance.
367
368 ",
369+ {$details},"
370+",
371 {conf:create-summary-string()},"
372 ",
373 {conf:generate-detailed-table($XQTS_catalog)}
374
375=== modified file 'scripts/sanity_checks/conformance_xqts.xqi'
376--- scripts/sanity_checks/conformance_xqts.xqi 2012-07-24 08:48:48 +0000
377+++ scripts/sanity_checks/conformance_xqts.xqi 2012-07-25 09:24:20 +0000
378@@ -63,13 +63,21 @@
379 declare %private variable $conf:XQuery as xs:string := "XQuery";
380 declare %private variable $conf:XQueryX as xs:string := "XQueryX";
381
382+declare %private variable $conf:infos := <infos/>;
383 declare %private variable $conf:features := <features/>;
384+declare %private variable $conf:numbers := <numbers/>;
385
386-declare %private variable $conf:numbers := <numbers/>;
387+declare %private %ann:sequential function conf:collect-info(
388+ $name as xs:string,
389+ $version as xs:string,
390+ $info as xs:string)
391+{
392+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
393+};
394
395 declare %private %ann:sequential function conf:collect-feature(
396- $name as xs:string,
397- $supported as xs:string)
398+ $name as xs:string,
399+ $supported as xs:string)
400 {
401 insert node <feature name ="{$name}" supported="{$supported}" /> as last into $conf:features;
402 };
403@@ -341,10 +349,17 @@
404 ddl:create($conf:submissionXquery);
405
406 variable $doc := fn:parse-xml(file:read-text(file:resolve-path($conf:XQTS_submission)));
407-
408+
409 for $test in $doc/xqRes:test-suite-result//xqRes:test-case
410 return dml:apply-insert-nodes($conf:submissionXquery, $test);
411
412+ conf:collect-info("Zorba",
413+ data($doc/xqRes:test-suite-result/xqRes:implementation/@version),
414+ "");
415+ conf:collect-info("XQTS",
416+ data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
417+ normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
418+
419 (: collect features :)
420 for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
421 return
422@@ -413,13 +428,12 @@
423 {
424 let $minConf := for $number in $conf:numbers/number where xs:string($number/@name) eq "Minimal Conformance" return xs:string(data($number/@value))
425 return
426- concat("Zorba achieves ",
427+ concat( "Zorba achieves ",
428 $minConf,
429- "% on Minimal conformance (",
430+ "% on minimal conformance (and ",
431 string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
432 return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
433- ") for the W3C XML Query Test Suite.
434-
435+ ") for the W3C XML Query Test Suite.
436 Please see the table below for more details.")
437
438 };
439@@ -443,12 +457,23 @@
440 conf:create-collection($conf:XQuery, $XQTS_catalog);
441 conf:create-collection($conf:XQueryX, $XQTS_catalog);
442
443+ variable $details := concat("In generating the report we used Zorba version ",
444+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
445+ " that can be downloaded from ",
446+ data($conf:infos//info[@name="Zorba"]/@version),
447+ " and XQTS version '",
448+ data($conf:infos//info[@name="XQTS"]/@version),
449+ "' (",
450+ data($conf:infos//info[@name="XQTS"]/@info),
451+ ").");
452 variable $pageNameSummary := "conformanceXQTSSummary";
453 variable $pathSummary := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
454 file:write(trace($pathSummary,"output summary file path"),
455 ("/** \page conformanceXQTSSummary Summary W3C XQuery 1.0 conformance
456
457 ",
458+ {$details},"
459+",
460 {conf:generate-features-table()},"
461 ",
462 {conf:generate-summary-table($XQTS_catalog)}
463@@ -460,9 +485,11 @@
464 variable $pathDetailed := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox");
465
466 file:write(trace($pathDetailed,"output detailed file path"),
467- ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance.
468+ ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance
469
470 ",
471+ {$details},"
472+",
473 {conf:create-summary-string()},"
474 ",
475 {conf:generate-detailed-table($XQTS_catalog)}
476
477=== modified file 'scripts/sanity_checks/conformance_xquts.xqi'
478--- scripts/sanity_checks/conformance_xquts.xqi 2012-07-24 08:48:48 +0000
479+++ scripts/sanity_checks/conformance_xquts.xqi 2012-07-25 09:24:20 +0000
480@@ -51,16 +51,24 @@
481 declare %private variable $conf:XQUTS_PATH as xs:string := "/tmp/XQUTS_current";
482
483 declare %private variable $conf:XQUTS_submission as xs:string :=
484-"/tmp/XQUTS_current/ReportingResults/zorba_11674_xquts_current.xml";
485+"/tmp/XQUTS_current/ReportingResults/zorba_xquts_submission.xml";
486 declare variable $conf:XQUTSX_submission as xs:string :=
487-"/tmp/XQUTS_current/ReportingResults/zorba_11674_xqutsx_current.xml";
488+"/tmp/XQUTS_current/ReportingResults/zorba_xqutsx_submission.xml";
489
490 declare %private variable $conf:XQuery as xs:string := "XQuery";
491 declare %private variable $conf:XQueryX as xs:string := "XQueryX";
492
493+declare %private variable $conf:infos := <infos/>;
494 declare %private variable $conf:features := <features/>;
495+declare %private variable $conf:numbers := <numbers/>;
496
497-declare %private variable $conf:numbers := <numbers/>;
498+declare %private %ann:sequential function conf:collect-info(
499+ $name as xs:string,
500+ $version as xs:string,
501+ $info as xs:string)
502+{
503+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
504+};
505
506 declare %private %ann:sequential function conf:collect-feature(
507 $name as xs:string,
508@@ -323,6 +331,13 @@
509 for $test in $doc/xqRes:test-suite-result//xqRes:test-case
510 return dml:apply-insert-nodes($conf:submissionXquery, $test);
511
512+ conf:collect-info("Zorba",
513+ data($doc/xqRes:test-suite-result/xqRes:implementation/@version),
514+ "");
515+ conf:collect-info("XQUTS",
516+ data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
517+ normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
518+
519 (: collect features :)
520 for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
521 return
522@@ -393,7 +408,7 @@
523 return
524 concat("Zorba achieves ",
525 $minConf,
526- "% on Minimal conformance (",
527+ "% on minimal conformance (and ",
528 string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
529 return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
530 ") for the W3C XQuery Update Facility Test Suite.
531@@ -409,13 +424,25 @@
532 conf:create-collection($conf:XQueryX, $XQTS_catalog);
533
534 variable $pageNameSummary := "conformanceXQUTSSummary";
535- variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
536+ variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
537+
538+ variable $details := concat("In generating the report we used Zorba version ",
539+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
540+ " that can be downloaded from ",
541+ data($conf:infos//info[@name="Zorba"]/@version),
542+ " and XQUTS version '",
543+ data($conf:infos//info[@name="XQUTS"]/@version),
544+ "' (",
545+ data($conf:infos//info[@name="XQUTS"]/@info),
546+ ").");
547
548 file:write(trace($pathSummary,"output file path"),
549 ("/** \page conformanceXQUTSSummary Summary W3C XQuery Update Facility 1.0 conformance
550
551 The following table shows the supported features:
552 ",
553+ {$details},"
554+",
555 {conf:generate-features-table()},"
556 ",
557 {conf:generate-summary-table($XQTS_catalog)}
558@@ -427,9 +454,11 @@
559 variable $pathDetailed := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox");
560
561 file:write(trace($pathDetailed,"output file path"),
562- ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance.
563+ ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance
564
565 ",
566+ {$details},"
567+",
568 {conf:create-summary-string()},"
569 ",
570 {conf:generate-detailed-table($XQTS_catalog)}

Subscribers

People subscribed via source and target branches