browser: cleanup duplicate support determination

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index fbbddde372511b65a08f7053fd65e95dedcc4fc1..863f806f1e6990eeaf15f4bdb1af626c26c840f3 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -88,8 +88,9 @@ given ($get{usage} // 'wm') {
                break;
        };
        $usage = $_;
-       my $ref = $canihas->{-source} || 'unknown';
-       $ref = sprintf '<a href="%s">%s</a>', $_, $ref for $canihas->{-url} || ();
+       my $ref = $canihas->{-title} || 'unknown';
+       $ref = sprintf '<a href="%s">%s</a>', $_, $ref
+               for $canihas->{-site} || $canihas->{-source} || ();
        $ref .= " $_" for $canihas->{-date} || ();
        print "\nwith $ref browser usage statistics";
 }
@@ -267,12 +268,17 @@ sub saybrowsercols {
 
        my ($prev, @span);
        for my $ver (@{ $versions{$browser} }, undef) {
-               unless (!defined $prev
-               or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) {
+               my $compare = (
+                       !defined $ver ? undef :      # last column if nameless
+                       ref $data ne 'HASH' ? 'u' :  # unsupported if no support hash
+                       $data->{$ver}                # known
+                       || 'u'                       # unsure unless oldest is unsupported
+               );
+               unless (!defined $prev or $prev ~~ $compare) {
                        my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
                        printf '<td class="%s" colspan="%d" title="%s">%s',
                                join(' ',
-                                       X => $CSTATS{ ref $data eq 'HASH' && $data->{$prev} || 'u' },
+                                       X => $CSTATS{$prev},
                                        !$usage ? ('p0') : ('p',
                                                sprintf('p%01d', $usage * ($usagepct - .0001) / 10),
                                                sprintf('p%02d', $usage * ($usagepct - .0001)),
@@ -284,14 +290,14 @@ sub saybrowsercols {
                                        map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
                                        map { $DSTATS{$_} // () }
                                        map { split / /, $_ }
-                                       ref $data eq 'HASH' && $data->{$prev} || 'u'
+                                       $prev
                                )),
                                showversions(@span),
                        undef $prev;
                        @span = ();
                }
                push @span, $ver;
-               $prev = $ver;
+               $prev = $compare;
        }
 }