Patch to output badge/icon sample with RDFa when appropriate.

Courtesy of Toby A Inkster.

3 files changed, 18 insertions, 6 deletions

diff --git a/htdocs/config/types.conf b/htdocs/config/types.conf
index 17a5bc8..de16986 100644
--- a/htdocs/config/types.conf
+++ b/htdocs/config/types.conf
@@ -1,7 +1,7 @@
 #
 # Main Document Type Database for the W3C Markup Validation Service.
 #
-# $Id: types.conf,v 1.45 2009-01-07 19:30:04 ville Exp $
+# $Id: types.conf,v 1.46 2009-02-16 14:11:42 ot Exp $
 #
 # Maintains all information for each of the document types we support.
 # See 'perldoc Config::General' for the syntax, and be aware that the
@@ -598,7 +598,7 @@
 <XHTML_RDFa>
   Name       = html
   Display    = XHTML + RDFa
-  Info URL   = http://www.w3.org/MarkUp/Drafts/xhtml-rdfa
+  Info URL   = http://www.w3.org/TR/rdfa-syntax
   PubID      = -//W3C//DTD XHTML+RDFa 1.0//EN
   SysID      = http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd
   Namespace  = http://www.w3.org/1999/xhtml
@@ -614,6 +614,7 @@
     Local URI     = images/valid_icons/valid-xhtml-rdfa
     Local ALT URI    = images/valid_icons/valid-xhtml-rdfa-blue
     Alt     = Valid XHTML + RDFa
+    RDFa = http://www.w3.org/TR/rdfa-syntax
   </Badge>
 
 </XHTML_RDFa>
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index e971b23..16e6f32 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -14,7 +14,7 @@
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
 #
-# $Id: check,v 1.647 2009-02-13 21:04:15 ot Exp $
+# $Id: check,v 1.648 2009-02-16 14:11:42 ot Exp $
 #
 # Disable buffering on STDOUT!
 $| = 1;
@@ -198,7 +198,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.647 $;
+  $VERSION =  q$Revision: 1.648 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -1424,6 +1424,13 @@ sub report_valid {
       $T->param(have_alt_badge => TRUE);
       }
 
+      if (exists $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'RDFa'}) {
+        $T->param(have_badge_rdfa => TRUE);
+        $T->param(badge_rdfa => $CFG->{Types}->{$File->{DOCTYPE}}->{Badge}->{'RDFa'});
+      } else {
+        $T->param(have_badge_rdfa => FALSE);
+      }
+      
       $T->param(badge_alt  => $cfg->{Badge}->{Alt});
       $T->param(badge_h    => $cfg->{Badge}->{Height});
       $T->param(badge_w    => $cfg->{Badge}->{Width});
diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl
index 71a3ad9..9c5dc1d 100644
--- a/share/templates/en_US/valid.tmpl
+++ b/share/templates/en_US/valid.tmpl
@@ -67,7 +67,9 @@
     <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF>
     <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF>
      /> <pre class="badgeSnippet">
-  &lt;p&gt;
+  &lt;p<TMPL_IF NAME="have_badge_rdfa"> about=""
+     resource="<TMPL_VAR NAME="badge_rdfa">"
+     rel="dct:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;&lt;img
         src="<TMPL_VAR NAME="badge_uri" ESCAPE="HTML">"
         <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF><TMPL_VAR NAME="badge_tagc">&gt;&lt;/a&gt;
@@ -80,7 +82,9 @@
     <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF>
     <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF>
      /> <pre class="badgeSnippet">
-  &lt;p&gt;
+  &lt;p<TMPL_IF NAME="have_badge_rdfa"> about=""
+     resource="<TMPL_VAR NAME="badge_rdfa">"
+     rel="dct:conformsTo" xmlns:dc="http://purl.org/dc/terms/"</TMPL_IF>&gt;
     &lt;a href="<TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML">check?uri=referer"&gt;&lt;img
         src="<TMPL_VAR NAME="badge_alt_uri" ESCAPE="HTML">"
         <TMPL_IF NAME="badge_alt">alt="<TMPL_VAR NAME="badge_alt" ESCAPE="HTML">"</TMPL_IF> <TMPL_IF NAME="badge_h">height="<TMPL_VAR NAME="badge_h">"</TMPL_IF> <TMPL_IF NAME="badge_w">width="<TMPL_VAR NAME="badge_w">"</TMPL_IF><TMPL_VAR NAME="badge_tagc">&gt;&lt;/a&gt;