From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 02/11] location-functions.pl: Refactor get_full_country_name() function to use the Location module. Date: Tue, 22 Sep 2020 20:25:00 +0200 Message-ID: <20200922182509.18643-2-stefan.schantl@ipfire.org> In-Reply-To: <20200922182509.18643-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5805961852913237821==" List-Id: --===============5805961852913237821== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- config/cfgroot/location-functions.pl | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-f= unctions.pl index a94d5909e..c8ccd94c2 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -24,18 +24,13 @@ package Location::Functions; =20 use Location; -use Locale::Codes::Country; =20 # Hash which contains country codes and their names which are special or not # part of ISO 3166-1. my %not_iso_3166_location =3D ( - "a1" =3D> "Anonymous Proxy", - "a2" =3D> "Satellite Provider", - "a3" =3D> "Worldwide Anycast Instance", - "an" =3D> "Netherlands Antilles", - "ap" =3D> "Asia/Pacific Region", - "eu" =3D> "Europe", - "fx" =3D> "France, Metropolitan" + "A1" =3D> "Anonymous Proxy", + "A2" =3D> "Satellite Provider", + "A3" =3D> "Worldwide Anycast Instance", ); =20 # Array which contains special country codes. @@ -152,17 +147,19 @@ sub get_full_country_name($) { # Remove whitespaces. chomp($input); =20 + # Convert input into upper case format. + my $code =3D uc($input); =20 - # Convert input into lower case format. - my $code =3D lc($input); - - # Handle country codes which are not in the list. + # Handle country codes which are special or not part of the list. if ($not_iso_3166_location{$code}) { # Grab location name from hash. $name =3D $not_iso_3166_location{$code}; } else { - # Use perl built-in module to get the country code. - $name =3D &Locale::Codes::Country::code2country($code); + # Init libloc database connection. + my $db_handle =3D &init(); + + # Get the country name by using the location module. + $name =3D &Location::get_country_name($db_handle, $code); } =20 return $name; --=20 2.20.1 --===============5805961852913237821==--