python: Use overridden AS name when possible

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

diff --git a/src/python/location-importer.in b/src/python/location-importer.in
index 07c8a97728af82123cfc6507953eede600e877cc..26e4d0d2bfe77118f615f00b33dd48e82e82389c 100644 (file)
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -194,8 +194,17 @@ class CLI(object):
                log.info("Writing Autonomous Systems...")
 
                # Select all ASes with a name
-               rows = self.db.query("SELECT * FROM autnums \
-                       WHERE name <> %s ORDER BY number", "")
+               rows = self.db.query("""
+                       SELECT
+                               autnums.number AS number,
+                               COALESCE(
+                                       (SELECT overrides.name FROM autnum_overrides overrides
+                                               WHERE overrides.number = autnums.number),
+                                       autnums.name
+                               ) AS name
+                               FROM autnums
+                               WHERE name <> %s ORDER BY number
+                       """, "")
 
                for row in rows:
                        a = writer.add_as(row.number)