From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 01/11] location-functions.pl: Refactor get_locations() function to use the Location module. Date: Tue, 22 Sep 2020 20:24:59 +0200 Message-ID: <20200922182509.18643-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3333483109518776289==" List-Id: --===============3333483109518776289== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- config/cfgroot/location-functions.pl | 30 +++++++++------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-f= unctions.pl index ab99e71d3..a94d5909e 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -38,6 +38,9 @@ my %not_iso_3166_location =3D ( "fx" =3D> "France, Metropolitan" ); =20 +# Array which contains special country codes. +my @special_locations =3D ( "A1", "A2", "A3" ); + # Directory where the libloc database and keyfile lives. our $location_dir =3D "/var/lib/location/"; =20 @@ -167,29 +170,14 @@ sub get_full_country_name($) { =20 # Function to get all available locations. sub get_locations() { - my @locations =3D (); - - # Get listed country codes from ISO 3166-1. - my @locations_lc =3D &Locale::Codes::Country::all_country_codes(); - - # The Codes::Country module provides the country codes only in lower case. - # So we have to loop over the array and convert them into upper case format. - foreach my $ccode (@locations_lc) { - # Convert the country code to uppercase. - my $ccode_uc =3D uc($ccode); + # Create libloc database handle. + my $db_handle =3D &init(); =20 - # Add the converted ccode to the locations array. - push(@locations, $ccode_uc); - } - - # Add locations from not_iso_3166_locations. - foreach my $location (keys %not_iso_3166_location) { - # Convert the location into uppercase. - my $location_uc =3D uc($location); + # Get locations which are stored in the location database. + my @database_locations =3D &Location::database_countries($db_handle); =20 - # Add the location to the locations array. - push(@locations, $location_uc); - } + # Merge special locations array and the database locations array. + my @locations =3D (@special_locations, @database_locations); =20 # Sort locations array in alphabetical order. my @sorted_locations =3D sort(@locations); --=20 2.20.1 --===============3333483109518776289==--