public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 01/11] location-functions.pl: Refactor get_locations() function to use the Location module.
@ 2020-09-22 18:24 Stefan Schantl
  2020-09-22 18:25 ` [PATCH 02/11] location-functions.pl: Refactor get_full_country_name() " Stefan Schantl
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Stefan Schantl @ 2020-09-22 18:24 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 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-functions.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 = (
 	"fx" => "France, Metropolitan"
 );
 
+# Array which contains special country codes.
+my @special_locations = ( "A1", "A2", "A3" );
+
 # Directory where the libloc database and keyfile lives.
 our $location_dir = "/var/lib/location/";
 
@@ -167,29 +170,14 @@ sub get_full_country_name($) {
 
 # Function to get all available locations.
 sub get_locations() {
-	my @locations = ();
-
-	# Get listed country codes from ISO 3166-1.
-	my @locations_lc = &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 = uc($ccode);
+	# Create libloc database handle.
+	my $db_handle = &init();
 
-		# 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 = uc($location);
+	# Get locations which are stored in the location database.
+	my @database_locations = &Location::database_countries($db_handle);
 
-		# Add the location to the locations array.
-		push(@locations, $location_uc);
-	}
+	# Merge special locations array and the database locations array.
+	my @locations = (@special_locations, @database_locations);
 
 	# Sort locations array in alphabetical order.
 	my @sorted_locations = sort(@locations);
-- 
2.20.1


^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-09-22 18:25 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-22 18:24 [PATCH 01/11] location-functions.pl: Refactor get_locations() function to use the Location module Stefan Schantl
2020-09-22 18:25 ` [PATCH 02/11] location-functions.pl: Refactor get_full_country_name() " Stefan Schantl
2020-09-22 18:25 ` [PATCH 03/11] location-functions.pl: Add address_has_flag() function Stefan Schantl
2020-09-22 18:25 ` [PATCH 04/11] country.cgi: Use own location-functions Stefan Schantl
2020-09-22 18:25 ` [PATCH 05/11] tor.cgi: Use own location functions Stefan Schantl
2020-09-22 18:25 ` [PATCH 06/11] guardian.cgi: Drop unused use of Locale::Codes::Country Stefan Schantl
2020-09-22 18:25 ` [PATCH 07/11] general-functions.pl: " Stefan Schantl
2020-09-22 18:25 ` [PATCH 08/11] ipinfo.cgi: Display network flags of the given addresses Stefan Schantl
2020-09-22 18:25 ` [PATCH 09/11] Locale-Country: Drop package Stefan Schantl
2020-09-22 18:25 ` [PATCH 10/11] ipinfo.cgi: Allow to display multiple flags Stefan Schantl
2020-09-22 18:25 ` [PATCH 11/11] libloc: Update to 0.9.4 Stefan Schantl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox