Details

Fixed Upd links for a few machines with nontrivial wiki pages.
Lay out details
Listing normal packages right

diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index 71e00fe..ad72adb 100755 (executable)
--- a/aptcheck/aptcheck.pl
+++ b/aptcheck/aptcheck.pl
@@ -106,6 +106,10 @@ for $hline ( split("\n",$hostlist) ) {
         $okhosts{$H} = 1;
     }
     my $updlink = $wikilink . ucfirst($H) . "Updates" . $year;
+    # Fix some pages that do not follow the convention.
+    # Mostly because the host names would not make proper WikiWords
+    $updlink =~ s/Bugzilla3Updates/BugzillaUpdates/; 
+    $updlink =~ s/Opencontent-solrUpdates/OpenContentSolrUpdates/; 
     $table .= "&nbsp;<a href='$updlink' >Upd</a>";
     $table .= "</td></tr>\n";
     $table .= $det if $pkgs;
@@ -133,7 +137,7 @@ print F "<td><b>Packages</b></td></tr>\n";
 
 if ( $sectot ) {
     print F "<tr><td><b>Security</b><br/>" . scalar(keys(%sechosts)) . 
-        " / " .  scalar(keys(%secpkgs)) . " / $sectot </td>\n" ;
+        "&nbsp;/&nbsp;" .  scalar(keys(%secpkgs)) . "&nbsp;/&nbsp;$sectot </td>\n" ;
     print F "<td>";
     for $HH ( sort(keys(%sechosts)) ) {
         print F "<a href='#$HH'><b>$HH</b></a> ";
@@ -148,7 +152,7 @@ if ( $sectot ) {
 }
 if ( $owntot ) {
     print F "<tr><td><b>Indexdata</b><br/>" . scalar(keys(%ownhosts)) . 
-        " / " .  scalar(keys(%ownpkgs)) . " / $owntot </td>\n" ;
+        "&nbsp;/&nbsp;" .  scalar(keys(%ownpkgs)) . "&nbsp;/&nbsp;$owntot </td>\n" ;
     print F "<td>";
     for $HH ( sort(keys(%ownhosts)) ) {
         print F "<a href='#$HH'><b>$HH</b></a> ";
@@ -159,21 +163,25 @@ if ( $owntot ) {
         print F "<a href='#$PP'>$PP</a> ";
     }
     print F "</td>";
-    #print F "<td>" . join(" ",sort(keys(%ownpkgs))) . "&nbsp;</td>";
     print F "</tr>\n";
 }
 if ( $normtot ) {
-    print F "<tr><td>Indexdata<br/>" . scalar(keys(%normhosts)) . 
-        " / " .  scalar(keys(%normpkgs)) . " / $normtot </td>\n" ;
+    print F "<tr><td>Normal<br/>" . scalar(keys(%normhosts)) . 
+        "&nbsp;/&nbsp;" .  scalar(keys(%normpkgs)) . "&nbsp;/&nbsp;$normtot </td>\n" ;
     print F "<td>";
     for $HH ( sort(keys(%normhosts)) ) {
         print F "<a href='#$HH'><b>$HH</b></a> ";
     }
-    print F "<td>" . join(" ",sort(keys(%normpkgs))) . "&nbsp;</td>";
+    print F "</td>";
+    print F "<td>";
+    for $PP ( sort(keys(%normpkgs)) ) {
+        print F "<a href='#$PP'>$PP</a> ";
+    }
+    print F "</td>";
     print F "</tr>\n";
 }
 if ( %skiphosts ) {
-    print F "<tr><td>Skipped: " . scalar(keys(%skiphosts)) . "</td>\n";
+    print F "<tr><td>Skipped " . scalar(keys(%skiphosts)) . "</td>\n";
     print F "<td colspan='2'>";
     for $HH ( sort(keys(%skiphosts)) ) {
         print F "<a href='#$HH'><b>$HH</b></a> ";
@@ -181,7 +189,7 @@ if ( %skiphosts ) {
     print F "</td></tr>\n";
 }
 if ( %okhosts ) {
-    print F "<tr><td>Ok: " . scalar(keys(%okhosts)) . "</td>\n";
+    print F "<tr><td>Ok " . scalar(keys(%okhosts)) . "</td>\n";
     print F "<td colspan='2'>";
     for $HH ( sort(keys(%okhosts)) ) {
         print F "<a href='#$HH'><b>$HH</b></a> ";
@@ -229,13 +237,16 @@ sub strdiff {
     my $x = shift;
     my $y = shift;
     print "strdiff: '$x' '$y' \n" if $debug>1;
+    if ( $x eq $y ) {
+        return "$x <b>??</b>";
+    }
     my $a = 0;
     while ( $a < length($y) &&
         substr($x,$a,1) eq substr($y,$a,1) ) {
         $a++;
     }
     if ( $a == length($y) ) {
-        return "$y ???";
+        return "$y ??";
     }
     my $b = 1;
     while ( $b < length($y)-$a &&