geoip: Tolerate lots of spaces in database fields

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/webapp/backend/geoip.py b/webapp/backend/geoip.py
index 9a3650f0c2b21b77e46f97818faeea33b7011916..16159a5803a4b63694afcdd26e06a54416335cfc 100644 (file)
--- a/webapp/backend/geoip.py
+++ b/webapp/backend/geoip.py
@@ -24,7 +24,16 @@ class GeoIP(Object):
                query = "SELECT * FROM geoip \
                        WHERE %s BETWEEN start_ip AND end_ip LIMIT 1"
 
-               return self.db.get(query, addr)
+               ret = self.db.get(query, addr)
+
+               if ret:
+                       if ret.city:
+                               ret.city = ret.city.strip()
+
+                       if ret.postal_code:
+                               ret.postal_code = ret.postal_code.strip()
+
+               return ret
 
        def get_asn(self, addr):
                query = "SELECT asn FROM geoip_asn \