W3C home > Mailing lists > Public > www-validator-cvs@w3.org > March 2011

link-checker commit: Focus URL field only in non-results view, set no-cache always in results view.

From: Mercurial notifier <nobody@w3.org>
Date: Tue, 22 Mar 2011 20:34:01 +0000
Message-Id: <E1Q28HB-0005cm-UN@mcbain.w3.org>
To: link-checker updates <www-validator-cvs@w3.org>
changeset:   393:4e6def200601
tag:         tip
user:        Ville Skyttä <ville.skytta@iki.fi>
date:        Tue Mar 22 22:27:13 2011 +0200
files:       bin/checklink
description:
Focus URL field only in non-results view, set no-cache always in results view.


diff -r 89d7df5780cc -r 4e6def200601 bin/checklink
--- a/bin/checklink	Tue Mar 22 22:03:22 2011 +0200
+++ b/bin/checklink	Tue Mar 22 22:27:13 2011 +0200
@@ -573,7 +573,7 @@
     $uri = $query->param('uri');
 
     if (!$uri) {
-        &html_header('', 1);    # Set cookie only from results page.
+        &html_header('', undef);    # Set cookie only from results page.
         my %cookies = CGI::Cookie->fetch();
         &print_form(scalar($query->Vars()), $cookies{$PROGRAM}, 1);
         &html_footer();
@@ -1039,7 +1039,7 @@
     return if defined($response->{Stop});
 
     if ($Opts{HTML}) {
-        &html_header($uri, 0, $cookie) if ($check_num == 1);
+        &html_header($uri, $cookie) if ($check_num == 1);
         &print_form($params, $cookie, $check_num) if $is_start;
     }
 
@@ -1460,7 +1460,7 @@
             }
             else {
                 if ($Opts{HTML}) {
-                    &html_header($uri, 0, $cookie) if ($check_num == 1);
+                    &html_header($uri, $cookie) if ($check_num == 1);
                     &print_form($params, $cookie, $check_num) if $is_start;
                     print "<p>", &status_icon($response->code());
                 }
@@ -1494,7 +1494,7 @@
         # No, there is a problem...
         if (!$in_recursion) {
             if ($Opts{HTML}) {
-                &html_header($uri, 0, $cookie) if ($check_num == 1);
+                &html_header($uri, $cookie) if ($check_num == 1);
                 &print_form($params, $cookie, $check_num) if $is_start;
                 print "<p>", &status_icon(406);
 
@@ -2920,16 +2920,16 @@
 # HTML interface #
 ##################
 
-sub html_header ($;$$)
+sub html_header ($$)
 {
-    my ($uri, $doform, $cookie) = @_;
+    my ($uri, $cookie) = @_;
 
     my $title = defined($uri) ? $uri : '';
     $title = ': ' . $title if ($title =~ /\S/);
 
     my $headers = '';
     if (!$Opts{Command_Line}) {
-        $headers .= "Cache-Control: no-cache\nPragma: no-cache\n" if $doform;
+        $headers .= "Cache-Control: no-cache\nPragma: no-cache\n" if $uri;
         $headers .= "Content-Type: text/html; charset=utf-8\n";
         $headers .= "Set-Cookie: $cookie\n"                       if $cookie;
 
@@ -2938,11 +2938,8 @@
         $headers .= "Content-Language: en\n\n";
     }
 
-    my $onload = '';
-    if ($doform) {
-        $onload =
-            ' onload="if(document.getElementById){document.getElementById(\'uri_1\').focus()}"';
-    }
+    my $onload = $uri ? '' :
+          ' onload="if(document.getElementById){document.getElementById(\'uri_1\').focus()}"';
 
     print $headers, $DocType, "
 <html lang=\"en\" xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">
Received on Tuesday, 22 March 2011 20:34:03 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:45 UTC