countries: handle (multiple) aliases properly in flag mode

[sheet.git] / countries.plp

diff --git a/countries.plp b/countries.plp
index 61a4795a688333b3b872e50153e36c929be43b70..18b986073695f91c1c530520bd3dcc4ff6c667c8 100644 (file)
--- a/countries.plp
+++ b/countries.plp
@@ -35,16 +35,24 @@ my $cc = do 'countries.inc.pl';
                        my ($name, $class, $short, $ref) = @$country;
                        $name .= " → $ref" if $ref;
                        $ref ||= $code;
-                       local $_ = $ref;
+                       my $cell;
                        if (exists $get{show}) {
-                               my $img = "data/flag/$ref.png";
-                               $_ = sprintf '<img src="/%s" alt="%s">', $img, $ref if -e $img;
+                               sub showflag {
+                                       my ($cc) = @_;
+                                       my $img = "data/flag/$cc.png";
+                                       return -e $img &&
+                                               sprintf '<img src="/%s" alt="%s">', $img, $cc;
+                               }
+
+                               $cell = showflag($code) // join(' ',
+                                       map { showflag($_) || $_ } split / /, $ref
+                               );
                        }
                        else {
-                               $_ = EscapeHTML($short || $name);
+                               $cell = EscapeHTML($short || $name);
                        }
                        printf "\n".'<td class="%s" title="%s">%s',
-                               $_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;
+                               $cell ? 'X '.$class : '', EscapeHTML("$code: $name"), $cell;
                }
                print "\n";
        }