- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 12 Sep 2008 18:01:58 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/resources/tasklist In directory hutz:/tmp/cvs-serv11461/resources/tasklist Modified Files: new-tasklist.xml tasklist.rdf Log Message: first version that works with Jigsaw + fixed a bug in cond handling + removed parse(InputStream) Index: tasklist.rdf =================================================================== RCS file: /sources/public/2006/unicorn/resources/tasklist/tasklist.rdf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- tasklist.rdf 8 Sep 2008 15:16:11 -0000 1.9 +++ tasklist.rdf 12 Sep 2008 18:01:56 -0000 1.10 @@ -24,13 +24,5 @@ <ucn:description xml:lang="en">This task will do as much observations as possible.</ucn:description> </ucn:Task> - - <ucn:Task ucn:reference="markup_and_css"> - <ucn:longName xml:lang="en">Markup and CSS Check</ucn:longName> - <ucn:longName xml:lang="fr">Vérifie la conformité Markup et CSS</ucn:longName> - <ucn:description xml:lang="en">This task will do Markup and CSS observations.</ucn:description> - - </ucn:Task> - </rdf:RDF> Index: new-tasklist.xml =================================================================== RCS file: /sources/public/2006/unicorn/resources/tasklist/new-tasklist.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- new-tasklist.xml 8 Sep 2008 15:16:11 -0000 1.2 +++ new-tasklist.xml 12 Sep 2008 18:01:56 -0000 1.3 @@ -4,77 +4,67 @@ xmlns="http://www.w3.org/unicorn/tasklist"> <task id="conformance"> - - <routine ref="conformance"> - <exec id="appc-check" value="appc-checker" type="observation"/> - <exec id="markup_and_css" value="markup_and_css" type="subtask"/> - </routine> - - <outputseq> - <outputgroup id="1"> - <tasksort>appc-checker</tasksort> - </outputgroup> - </outputseq> - - - </task> - - - - <task id="markup_and_css"> + + <conds> + <cond id="markup-valid" result="passed" observer="markup-validator" type="xpath"> + <value>//passed = 'true'</value> + </cond> + + <cond id="is-html" result="passed" type="mimetype"> + <value>text/html</value> + </cond> + <cond id="is-css" result="passed" type="mimetype"> + <value>text/css</value> + </cond> + </conds> + <!-- + <cond id="mathml" result="passed" type="mimetype"> + <value>application/mathml+xml</value> + </cond> + <cond id="smil" result="passed" type="mimetype"> + <value>application/smil+xml</value> + </cond> - <conds> - - <cond id="xpath" result="passed" observer="markup-validator" type="xpath"> - <value>//result</value> - </cond> - - <cond id="mathml" result="passed" type="mimetype"> - <value>application/mathml+xml</value> - </cond> - <cond id="smil" result="passed" type="mimetype"> - <value>application/smil+xml</value> - </cond> - - <cond id="html" result="passed" type="mimetype"> - <value>text/html</value> - </cond> - <cond id="css" result="passed" type="mimetype"> - <value>text/css</value> - </cond> - <cond id="svg" result="passed" type="mimetype"> - <value>image/svg+xml</value> - </cond> - <cond id="xhtml" result="passed" type="mimetype"> - <value>application/xhtml+xml</value> - </cond> - </conds> - - <routine ref="markup_and_css"> - <exec id="markup" value="markup-validator" type="observation" > - </exec> + <cond id="svg" result="passed" type="mimetype"> + <value>image/svg+xml</value> + </cond> + <cond id="xhtml" result="passed" type="mimetype"> + <value>application/xhtml+xml</value> + </cond> + --> - <if test ="xpath"> - <then> - <exec id="css" value="css-validator" type="observation" > - </exec> - </then> - </if> + <routine> + <if test="is-css"> + <then> + <exec id="css" value="css-validator" type="observation"/> + </then> + <else> + <exec id="markup" value="markup-validator" type="observation"/> + <if test="markup-valid"> + <then> + <if test="is-html"> + <then> + <exec id="appc" value="appc-checker" type="observation"/> + </then> + </if> + <exec id="css" value="css-validator" type="observation"/> + </then> + </if> + </else> + </if> + </routine> - </routine> - <outputseq> - <outputgroup id="2"> - <tasksort>css-validator</tasksort> - <tasksort>markup-validator</tasksort> + <outputgroup id="1"> + <tasksort>markup</tasksort> + <tasksort>appc</tasksort> + </outputgroup> + <outputgroup id="2"> + <tasksort>css</tasksort> </outputgroup> </outputseq> - - - </task> - - - + + </task> </tasklist>
Received on Friday, 12 September 2008 18:02:34 UTC