zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #12602
[Merge] lp:~zorba-coders/zorba/fix_bug_1018737 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1018737 into lp:zorba.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1018737 in Zorba: "conformance pages missing information"
https://bugs.launchpad.net/zorba/+bug/1018737
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1018737/+merge/116609
- 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
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1018737/+merge/116609
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/conformance.dox'
--- doc/zorba/conformance.dox 2012-07-24 08:48:48 +0000
+++ doc/zorba/conformance.dox 2012-07-25 09:24:20 +0000
@@ -59,6 +59,7 @@
This is the W3C XQuery 1.0 conformance summary:
+ 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).
<table bgcolor="lightcyan">
<tr>
<td>W3C XQuery 1.0 features</td>
@@ -73,18 +74,18 @@
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Minimal Conformance</td>
<td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td>
- <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td>
+ <td align="center" bgcolor="palegreen">17495/17499<br />99.98%</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Optional Features</td>
- <td align="center" bgcolor="palegreen">538/540<br />99.63%</td>
- <td align="center" bgcolor="palegreen">538/540<br />99.63%</td>
+ <td align="center" bgcolor="palegreen">539/540<br />99.81%</td>
+ <td align="center" bgcolor="palegreen">539/540<br />99.81%</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Schema Import Feature</td>
- <td align="center" bgcolor="palegreen">178/179<br />
+ <td align="center" bgcolor="mediumseagreen">179/179<br />
</td>
- <td align="center" bgcolor="palegreen">178/179<br />
+ <td align="center" bgcolor="mediumseagreen">179/179<br />
</td>
</tr>
<tr bgcolor="lightcyan">
@@ -145,7 +146,7 @@
<td align="center" bgcolor="mediumseagreen">21/21<br />100%</td>
</tr>
<tr bgcolor="lightcyan">
- <td bgcolor="lightcyan">FunctX -- A Collection of Functions</td>
+ <td bgcolor="lightcyan">FunctX -- A Collection Of Functions</td>
<td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td>
<td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td>
</tr>
@@ -179,6 +180,7 @@
</table>
This is the W3C XQuery Update Facility 1.0 conformance summary:
+ 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).
<table bgcolor="lightcyan">
<tr>
<td>W3C XQuery Update Facility 1.0 feature</td>
@@ -215,14 +217,14 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Optional Features</td>
- <td align="center" bgcolor="palegreen">99/126<br />78.57%</td>
- <td align="center" bgcolor="palegreen">99/126<br />78.57%</td>
+ <td align="center" bgcolor="palegreen">97/126<br />76.98%</td>
+ <td align="center" bgcolor="palegreen">97/126<br />76.98%</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Revalidation</td>
- <td align="center" bgcolor="mediumseagreen">77/77<br />
+ <td align="center" bgcolor="palegreen">76/77<br />
</td>
- <td align="center" bgcolor="mediumseagreen">77/77<br />
+ <td align="center" bgcolor="palegreen">76/77<br />
</td>
</tr>
<tr bgcolor="lightcyan">
@@ -241,9 +243,9 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> fn:put applied to nodes other than document and element nodes</td>
- <td align="center" bgcolor="mediumseagreen">8/8<br />
+ <td align="center" bgcolor="palegreen">7/8<br />
</td>
- <td align="center" bgcolor="mediumseagreen">8/8<br />
+ <td align="center" bgcolor="palegreen">7/8<br />
</td>
</tr>
<tr bgcolor="lightcyan">
@@ -331,6 +333,8 @@
</table>
This is the W3C XQuery and XPath Full Text 1.0 conformance summary:
+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).
+
<table bgcolor="lightcyan">
<tr>
<td>W3C XQuery and XPath Full Text 1.0 features</td>
@@ -344,7 +348,7 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Minimal Conformance</td>
- <td align="center" bgcolor="palegreen">385/429<br />89.74%</td>
+ <td align="center" bgcolor="palegreen">384/429<br />89.51%</td>
<td align="center" bgcolor="palegreen">374/429<br />87.18%</td>
</tr>
<tr bgcolor="lightcyan">
@@ -354,8 +358,8 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Use Cases</td>
- <td align="center" bgcolor="palegreen">121/135<br />89.63%</td>
- <td align="center" bgcolor="palegreen">103/135<br />76.3%</td>
+ <td align="center" bgcolor="palegreen">120/135<br />88.89%</td>
+ <td align="center" bgcolor="palegreen">102/135<br />75.56%</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan">Consistency in XQFTTS Catalog</td>
=== modified file 'doc/zorba/conformanceXQFTTS.dox'
--- doc/zorba/conformanceXQFTTS.dox 2012-07-24 08:48:48 +0000
+++ doc/zorba/conformanceXQFTTS.dox 2012-07-25 09:24:20 +0000
@@ -1,6 +1,7 @@
-/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance
+/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance.
- Zorba achieves 89.74% on minimal conformance (84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
+ 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).
+ Zorba achieves 89.51% on minimal conformance (and 84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite.
Please see the table below for more details.
<table bgcolor="lightcyan">
@@ -236,7 +237,7 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Full-Text Thesaurus Match Option</td>
- <td align="center" bgcolor="mediumseagreen">10/10</td>
+ <td align="center" bgcolor="palegreen">9/10</td>
<td align="center" bgcolor="palegreen">7/10</td>
</tr>
<tr bgcolor="lightcyan">
@@ -466,8 +467,8 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Use Case "FULL-TEXT-COMPOSABILITY"</td>
- <td align="center" bgcolor="palegreen">6/7</td>
- <td align="center" bgcolor="palegreen">4/7</td>
+ <td align="center" bgcolor="palegreen">5/7</td>
+ <td align="center" bgcolor="palegreen">3/7</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Use Case "XQUERY-XPATH-COMPOSABILITY"</td>
@@ -485,4 +486,4 @@
<td align="center" bgcolor="mediumseagreen">3/3</td>
</tr>
</table>
-*/
+*/
\ No newline at end of file
=== modified file 'doc/zorba/conformanceXQTS.dox'
--- doc/zorba/conformanceXQTS.dox 2012-07-24 08:48:48 +0000
+++ doc/zorba/conformanceXQTS.dox 2012-07-25 09:24:20 +0000
@@ -1,8 +1,8 @@
/** \page conformanceXQTS W3C XQuery 1.0 Conformance
-Zorba achieves 99.99% on minimal conformance (and 99.63% on Optional Features) for the W3C XML Query Test Suite.
-Please see the table below for more details.
-
+ 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).
+ Zorba achieves 99.99% on minimal conformance (and 99.81% on Optional Features) for the W3C XML Query Test Suite.
+Please see the table below for more details.
<table bgcolor="lightcyan">
<tr>
<td>W3C XQuery 1.0 features</td>
@@ -687,12 +687,12 @@
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Content</td>
<td align="center" bgcolor="mediumseagreen">126/126</td>
- <td align="center" bgcolor="mediumseagreen">126/126</td>
+ <td align="center" bgcolor="palegreen">125/126</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> White Space Element Content</td>
<td align="center" bgcolor="mediumseagreen">83/83</td>
- <td align="center" bgcolor="mediumseagreen">83/83</td>
+ <td align="center" bgcolor="palegreen">82/83</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Other Direct Constructors</td>
@@ -1721,8 +1721,8 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Schema Import</td>
- <td align="center" bgcolor="palegreen">30/31</td>
- <td align="center" bgcolor="palegreen">30/31</td>
+ <td align="center" bgcolor="mediumseagreen">31/31</td>
+ <td align="center" bgcolor="mediumseagreen">31/31</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> FOR Clause with TypeDeclaration</td>
@@ -3165,4 +3165,4 @@
<td align="center" bgcolor="mediumseagreen">3/3</td>
</tr>
</table>
-*/
+*/
\ No newline at end of file
=== modified file 'doc/zorba/conformanceXQUTS.dox'
--- doc/zorba/conformanceXQUTS.dox 2012-07-24 08:48:48 +0000
+++ doc/zorba/conformanceXQUTS.dox 2012-07-25 09:24:20 +0000
@@ -1,8 +1,9 @@
/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance
-Zorba achieves 100% on minimal conformance (and 78.57% on Optional Features) for the XQuery Update Facility Test Suite.
-Please see the table below for more details.
-
+ 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).
+ Zorba achieves 100% on minimal conformance (and 76.98% on Optional Features) for the W3C XQuery Update Facility Test Suite.
+
+Please see the table below for more details.
<table bgcolor="lightcyan">
<tr>
<td>W3C XQuery Update Facility 1.0 features</td>
@@ -236,8 +237,8 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Revalidation Declaration = strict + skip</td>
- <td align="center" bgcolor="mediumseagreen">1/1</td>
- <td align="center" bgcolor="mediumseagreen">1/1</td>
+ <td align="center" bgcolor="coral">0/1</td>
+ <td align="center" bgcolor="coral">0/1</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> Update Facility Static Typing Feature</td>
@@ -276,8 +277,8 @@
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> fn:put() applied to attribute nodes</td>
- <td align="center" bgcolor="mediumseagreen">1/1</td>
- <td align="center" bgcolor="mediumseagreen">1/1</td>
+ <td align="center" bgcolor="coral">0/1</td>
+ <td align="center" bgcolor="coral">0/1</td>
</tr>
<tr bgcolor="lightcyan">
<td bgcolor="lightcyan"> fn:put() applied to attribute nodes - unsupported</td>
@@ -330,4 +331,4 @@
<td align="center" bgcolor="mediumseagreen">1/1</td>
</tr>
</table>
-*/
+*/
\ No newline at end of file
=== modified file 'scripts/sanity_checks/README.txt'
--- scripts/sanity_checks/README.txt 2012-07-24 08:48:48 +0000
+++ scripts/sanity_checks/README.txt 2012-07-25 09:24:20 +0000
@@ -1,17 +1,31 @@
-The command ./zorba -f -q /tmp/XQTS_current/run_xqts.xq generates:
+1) compile Zorba by setting the following flags:
+cmake -DZORBA_TEST_XQUERYX=ON -DZORBA_XQUERYX=ON -DZORBA_WITH_BIG_INTEGER=ON -DZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON -DZORBA_MODULES_DIR="/home" ..
+
+2) import the 3 testsuites by running:
+$zorbaDir/test/rbkt/Scripts/w3c/import_w3c_testsuite.sh $zorbaDir
+$zorbaDir/test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh $zorbaDir
+$zorbaDir/test/update/Scripts/import_w3c_update_testsuite.sh $zorbaDir
+
+3) Generate the conformance reports following the details provided in:
+ - test/rbtk/Scripts/w3c/Readme.txt
+ - test/update/Scripts/Readme.txt
+The latest reports can also be downloaded from the private wiki: http://my.zorba-xquery.com/dokuwiki/doku.php
+
+4.1) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqts.xq generates:
- /tmp/XQTS_current/conformanceXQTS.dox
- /tmp/XQTS_current/conformanceXQTSSummary.dox
-Note: this takes quite a long time because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX)
-Also there are over 580 XQueryX tests for which there are no results reported in the submission XML.
+Note: this should take around 2 minutes because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX)
+Also there are over 402 XQueryX tests for which there are no results reported in the submission XML.
-The command ./zorba -f -q /tmp/XQTS_current/run_xquts.xq generates:
+4.2) The command ./zorba -f -q ../../scripts/sanity_checks/run_xquts.xq generates:
- /tmp/XQUTS_current/conformanceXQUTS.dox
- /tmp/XQUTS_current/conformanceXQUTSSummary.dox
-The command ./zorba -f -q /tmp/XQTS_current/run_xqftts.xq generates:
+4.3) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqftts.xq generates:
- /tmp/XQFTTS_current/conformanceXQFTTS.dox
- /tmp/XQFTTS_current/conformanceXQFTTSSummary.dox
+
Here is how the query work:
- they load the correct catalog(XQTSCatalog.xml, XQUTSCatalog.xml or XQFTTSCatalog.xml)
- they load the submission XML's for XQuery and XQueryX
=== modified file 'scripts/sanity_checks/conformance_xqftts.xqi'
--- scripts/sanity_checks/conformance_xqftts.xqi 2012-07-24 08:48:48 +0000
+++ scripts/sanity_checks/conformance_xqftts.xqi 2012-07-25 09:24:20 +0000
@@ -57,9 +57,17 @@
declare %private variable $conf:XQuery as xs:string := "XQuery";
declare %private variable $conf:XQueryX as xs:string := "XQueryX";
+declare %private variable $conf:infos := <infos/>;
declare %private variable $conf:features := <features/>;
+declare %private variable $conf:numbers := <numbers/>;
-declare %private variable $conf:numbers := <numbers/>;
+declare %private %ann:sequential function conf:collect-info(
+ $name as xs:string,
+ $version as xs:string,
+ $info as xs:string)
+{
+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
+};
declare %private %ann:sequential function conf:collect-feature(
$name as xs:string,
@@ -327,7 +335,15 @@
variable $docXQ := fn:parse-xml(file:read-text(file:resolve-path($conf:XQFTTS_submission)));
for $test in $docXQ/xqRes:test-suite-result//xqRes:test-case
return dml:apply-insert-nodes($conf:submissionXquery, $test);
-
+
+ conf:collect-info("Zorba",
+ data($docXQ/xqRes:test-suite-result/xqRes:implementation/@version),
+ "");
+ conf:collect-info("XQFTTS",
+ data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
+ normalize-space(data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
+
+
(: collect features :)
for $feature in $docXQ/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
return
@@ -391,7 +407,7 @@
return
concat("Zorba achieves ",
$minConf,
- "% on minimal conformance (",
+ "% on minimal conformance (and ",
string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
") for the W3C XPath Full Text 1.0 Test Suite.
@@ -408,13 +424,24 @@
conf:create-collection($conf:XQueryX, $XQTS_catalog);
variable $pageNameSummary := "conformanceXQFTTSSummary";
- variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
+ variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
+ variable $details := concat("In generating the report we used Zorba version ",
+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
+ " that can be downloaded from ",
+ data($conf:infos//info[@name="Zorba"]/@version),
+ " and XQFTTS version '",
+ data($conf:infos//info[@name="XQFTTS"]/@version),
+ "' (",
+ data($conf:infos//info[@name="XQFTTS"]/@info),
+ ").");
file:write(trace($pathSummary,"output file path"),
("/** \page conformanceXQFTTSSummary Summary W3C XQuery and XPath Full Text 1.0 conformance.
The following table shows the supported features:
",
+ {$details},"
+",
{conf:generate-features-table()},"
",
{conf:generate-summary-table($XQTS_catalog)}
@@ -429,6 +456,8 @@
("/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance.
",
+ {$details},"
+",
{conf:create-summary-string()},"
",
{conf:generate-detailed-table($XQTS_catalog)}
=== modified file 'scripts/sanity_checks/conformance_xqts.xqi'
--- scripts/sanity_checks/conformance_xqts.xqi 2012-07-24 08:48:48 +0000
+++ scripts/sanity_checks/conformance_xqts.xqi 2012-07-25 09:24:20 +0000
@@ -63,13 +63,21 @@
declare %private variable $conf:XQuery as xs:string := "XQuery";
declare %private variable $conf:XQueryX as xs:string := "XQueryX";
+declare %private variable $conf:infos := <infos/>;
declare %private variable $conf:features := <features/>;
+declare %private variable $conf:numbers := <numbers/>;
-declare %private variable $conf:numbers := <numbers/>;
+declare %private %ann:sequential function conf:collect-info(
+ $name as xs:string,
+ $version as xs:string,
+ $info as xs:string)
+{
+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
+};
declare %private %ann:sequential function conf:collect-feature(
- $name as xs:string,
- $supported as xs:string)
+ $name as xs:string,
+ $supported as xs:string)
{
insert node <feature name ="{$name}" supported="{$supported}" /> as last into $conf:features;
};
@@ -341,10 +349,17 @@
ddl:create($conf:submissionXquery);
variable $doc := fn:parse-xml(file:read-text(file:resolve-path($conf:XQTS_submission)));
-
+
for $test in $doc/xqRes:test-suite-result//xqRes:test-case
return dml:apply-insert-nodes($conf:submissionXquery, $test);
+ conf:collect-info("Zorba",
+ data($doc/xqRes:test-suite-result/xqRes:implementation/@version),
+ "");
+ conf:collect-info("XQTS",
+ data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
+ normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
+
(: collect features :)
for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
return
@@ -413,13 +428,12 @@
{
let $minConf := for $number in $conf:numbers/number where xs:string($number/@name) eq "Minimal Conformance" return xs:string(data($number/@value))
return
- concat("Zorba achieves ",
+ concat( "Zorba achieves ",
$minConf,
- "% on Minimal conformance (",
+ "% on minimal conformance (and ",
string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
- ") for the W3C XML Query Test Suite.
-
+ ") for the W3C XML Query Test Suite.
Please see the table below for more details.")
};
@@ -443,12 +457,23 @@
conf:create-collection($conf:XQuery, $XQTS_catalog);
conf:create-collection($conf:XQueryX, $XQTS_catalog);
+ variable $details := concat("In generating the report we used Zorba version ",
+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
+ " that can be downloaded from ",
+ data($conf:infos//info[@name="Zorba"]/@version),
+ " and XQTS version '",
+ data($conf:infos//info[@name="XQTS"]/@version),
+ "' (",
+ data($conf:infos//info[@name="XQTS"]/@info),
+ ").");
variable $pageNameSummary := "conformanceXQTSSummary";
variable $pathSummary := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
file:write(trace($pathSummary,"output summary file path"),
("/** \page conformanceXQTSSummary Summary W3C XQuery 1.0 conformance
",
+ {$details},"
+",
{conf:generate-features-table()},"
",
{conf:generate-summary-table($XQTS_catalog)}
@@ -460,9 +485,11 @@
variable $pathDetailed := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox");
file:write(trace($pathDetailed,"output detailed file path"),
- ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance.
+ ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance
",
+ {$details},"
+",
{conf:create-summary-string()},"
",
{conf:generate-detailed-table($XQTS_catalog)}
=== modified file 'scripts/sanity_checks/conformance_xquts.xqi'
--- scripts/sanity_checks/conformance_xquts.xqi 2012-07-24 08:48:48 +0000
+++ scripts/sanity_checks/conformance_xquts.xqi 2012-07-25 09:24:20 +0000
@@ -51,16 +51,24 @@
declare %private variable $conf:XQUTS_PATH as xs:string := "/tmp/XQUTS_current";
declare %private variable $conf:XQUTS_submission as xs:string :=
-"/tmp/XQUTS_current/ReportingResults/zorba_11674_xquts_current.xml";
+"/tmp/XQUTS_current/ReportingResults/zorba_xquts_submission.xml";
declare variable $conf:XQUTSX_submission as xs:string :=
-"/tmp/XQUTS_current/ReportingResults/zorba_11674_xqutsx_current.xml";
+"/tmp/XQUTS_current/ReportingResults/zorba_xqutsx_submission.xml";
declare %private variable $conf:XQuery as xs:string := "XQuery";
declare %private variable $conf:XQueryX as xs:string := "XQueryX";
+declare %private variable $conf:infos := <infos/>;
declare %private variable $conf:features := <features/>;
+declare %private variable $conf:numbers := <numbers/>;
-declare %private variable $conf:numbers := <numbers/>;
+declare %private %ann:sequential function conf:collect-info(
+ $name as xs:string,
+ $version as xs:string,
+ $info as xs:string)
+{
+ insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos;
+};
declare %private %ann:sequential function conf:collect-feature(
$name as xs:string,
@@ -323,6 +331,13 @@
for $test in $doc/xqRes:test-suite-result//xqRes:test-case
return dml:apply-insert-nodes($conf:submissionXquery, $test);
+ conf:collect-info("Zorba",
+ data($doc/xqRes:test-suite-result/xqRes:implementation/@version),
+ "");
+ conf:collect-info("XQUTS",
+ data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version),
+ normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments)));
+
(: collect features :)
for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature
return
@@ -393,7 +408,7 @@
return
concat("Zorba achieves ",
$minConf,
- "% on Minimal conformance (",
+ "% on minimal conformance (and ",
string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features"
return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "),
") for the W3C XQuery Update Facility Test Suite.
@@ -409,13 +424,25 @@
conf:create-collection($conf:XQueryX, $XQTS_catalog);
variable $pageNameSummary := "conformanceXQUTSSummary";
- variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
+ variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox");
+
+ variable $details := concat("In generating the report we used Zorba version ",
+ tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()],
+ " that can be downloaded from ",
+ data($conf:infos//info[@name="Zorba"]/@version),
+ " and XQUTS version '",
+ data($conf:infos//info[@name="XQUTS"]/@version),
+ "' (",
+ data($conf:infos//info[@name="XQUTS"]/@info),
+ ").");
file:write(trace($pathSummary,"output file path"),
("/** \page conformanceXQUTSSummary Summary W3C XQuery Update Facility 1.0 conformance
The following table shows the supported features:
",
+ {$details},"
+",
{conf:generate-features-table()},"
",
{conf:generate-summary-table($XQTS_catalog)}
@@ -427,9 +454,11 @@
variable $pathDetailed := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox");
file:write(trace($pathDetailed,"output file path"),
- ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance.
+ ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance
",
+ {$details},"
+",
{conf:create-summary-string()},"
",
{conf:generate-detailed-table($XQTS_catalog)}
Follow ups
