link-checker commit: Remove Style_URI configuration variable, resolve it from Doc_URI.

changeset:   280:5642832d4e79
user:        ville
date:        Tue Feb 10 18:36:31 2009 +0000
files:       bin/checklink etc/checklink.conf
description:
Remove Style_URI configuration variable, resolve it from Doc_URI.


diff -r 4f247020b528 -r 5642832d4e79 bin/checklink
--- a/bin/checklink	Tue Feb 10 18:34:38 2009 +0000
+++ b/bin/checklink	Tue Feb 10 18:36:31 2009 +0000
@@ -5,7 +5,7 @@
 # (c) 1999-2009 World Wide Web Consortium
 # based on Renaud Bruyeron's checklink.pl
 #
-# $Id: checklink,v 4.141 2009-02-10 18:34:38 ville Exp $
+# $Id: checklink,v 4.142 2009-02-10 18:36:31 ville Exp $
 #
 # This program is licensed under the W3C(r) Software License:
 #       http://www.w3.org/Consortium/Legal/copyright-software
@@ -267,7 +267,7 @@
   $PROGRAM     = 'W3C-checklink';
   $VERSION     = '4.4';
   $REVISION    = sprintf('version %s (c) 1999-2009 W3C', $VERSION);
-  my ($cvsver) = q$Revision: 4.141 $ =~ /(\d+[\d\.]*\.\d+)/;
+  my ($cvsver) = q$Revision: 4.142 $ =~ /(\d+[\d\.]*\.\d+)/;
   $AGENT       = sprintf('%s/%s [%s] %s',
                          $PROGRAM, $VERSION, $cvsver,
                          (W3C::UserAgent::USE_ROBOT_UA
@@ -322,8 +322,6 @@
     'http://jigsaw.w3.org/css-validator/validator?uri=%s';
   $Cfg{Doc_URI} ||=
     'http://validator.w3.org/docs/checklink.html';
-  $Cfg{Style_URI} ||=
-    'http://validator.w3.org/docs/linkchecker.css';
 
   # Untaint config params that are used as the format argument to (s)printf(),
   # Perl 5.10 does not want to see that in taint mode.
@@ -331,7 +329,8 @@
   ($Cfg{CSS_Validator_URI})    = ($Cfg{CSS_Validator_URI}    =~ /^(.*)$/);
 
   $DocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-  $Head = sprintf(<<'EOF', HTML::Entities::encode($AGENT), $Cfg{Style_URI});
+  my $css_url = URI->new_abs('linkchecker.css', $Cfg{Doc_URI});
+  $Head = sprintf(<<'EOF', HTML::Entities::encode($AGENT), $css_url);
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta name="generator" content="%s" />
 <link rel="stylesheet" type="text/css" href="%s" />
diff -r 4f247020b528 -r 5642832d4e79 etc/checklink.conf
--- a/etc/checklink.conf	Tue Feb 10 18:34:38 2009 +0000
+++ b/etc/checklink.conf	Tue Feb 10 18:36:31 2009 +0000
@@ -1,6 +1,6 @@
 #
 # Configuration file for the W3C Link Checker
-# $Id: checklink.conf,v 1.6 2004-11-06 11:39:28 ville Exp $
+# $Id: checklink.conf,v 1.7 2009-02-10 18:36:31 ville Exp $
 #
 # See Config::General(3) for the syntax; 'SplitPolicy' is 'equalsign' here.
 #
@@ -46,14 +46,7 @@
 # Doc_URI is the URI to the Link Checker documentation, shown in the
 # results report in CGI mode, and the usage message in command line mode.
 # If you have installed the documentation locally somewhere, you may wish to
-# change this to point to that version.
+# change this to point to that version.  This must be an absolute URI.
 #
 # Default:
 # Doc_URI = http://validator.w3.org/docs/checklink.html
-
-#
-# Style_URI is the URI (relative or absolute) of the style sheet to be used
-# by the Link Checker for display of interface and results.
-#
-# Default:
-# Style_URI = http://validator.w3.org/docs/linkchecker.css

Received on Thursday, 5 August 2010 14:47:29 UTC