- From: Terje Bless <link@dev.w3.org>
- Date: Wed, 21 Jul 2004 17:06:29 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv8789
Modified Files:
check
Log Message:
Fix sundry merge borkage.
Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- check 21 Jul 2004 15:07:31 -0000 1.331
+++ check 21 Jul 2004 17:06:27 -0000 1.332
@@ -1701,26 +1701,26 @@
my $TAB = $level + 2;
if ($prevlevel == 0) {
- print " <ul>\n";
+ $outline .= " <ul>\n";
} else {
if ($level < $prevlevel) {
- print "</li>\n";
+ $outline .= "</li>\n";
for (my $i = $prevlevel; $i > $level; $i--) {
- print " " x ($i + 2), "</ul>\n";
- print " " x (($i + 2) - 1), "</li>\n";
+ $outline .= " " x ($i + 2) . "</ul>\n";
+ $outline .= " " x (($i + 2) - 1) . "</li>\n";
}
} elsif ($level == $prevlevel) {
- print "</li>\n";
+ $outline .= "</li>\n";
} elsif ($level > $prevlevel) {
if ($level - $prevlevel > 1) {
foreach my $i (($prevlevel + 1) .. ($level - 1)) {
- print "\n", " " x ($i + 2), "<ul>\n", " " x ($i + 2);
- print qq(<li class="warning">A level $i heading is missing!);
+ $outline .= "\n", " " x ($i + 2) . "<ul>\n" . " " x ($i + 2);
+ $outline .= qq(<li class="warning">A level $i heading is missing!);
}
- print "\n", " " x $TAB, "<ul>\n";
+ $outline .= "\n" . " " x $TAB . "<ul>\n";
} else {
- print "\n", " " x $TAB;
- print "<ul>\n";
+ $outline .= "\n" . " " x $TAB;
+ $outline .= "<ul>\n";
}
}
}
@@ -1769,7 +1769,6 @@
$File->{Content}->[0] =
substr $File->{Content}->[0], ($File->{BOM} ? 3 : 0); # remove BOM
- my $line = 1;
my $maxhlen = length scalar @{$File->{Content}};
for (@{$File->{Content}}) {
my $hline = (' ' x ($maxhlen - length("$line"))) . $line;
Received on Wednesday, 21 July 2004 13:07:05 UTC