From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Jan 2020 20:25:29 +0000 (+0000)
Subject: tools: Drop more dead code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec17beea6859dbfe867b191ac0c8790b8817be49;p=location%2Flocation-database.git

tools: Drop more dead code

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

diff --git a/tools/base.py b/tools/base.py
index 9d71d6c..deb4305 100644
--- a/tools/base.py
+++ b/tools/base.py
@@ -122,82 +122,6 @@ class RIRParser(object):
 		with open(self.rir.filename_networks, "w") as f:
 			self._export_networks(f)
 
-	def _export_asnums(self, f):
-		# Write header
-		self._write_header(f)
-
-		with self.db as c:
-			res = c.execute("""SELECT DISTINCT autnums.asn, autnums.name,
-				organisations.name, organisations.country FROM autnums
-				LEFT JOIN organisations ON autnums.org = organisations.handle
-				WHERE autnums.asn IS NOT NULL ORDER BY autnums.asn""")
-
-			for row in res:
-				f.write(FMT % ("asnum:", "AS%s" % row[0]))
-
-				if row[1]:
-					f.write(FMT % ("name:", row[1]))
-
-				if row[2]:
-					f.write(FMT % ("org:", row[2]))
-
-				if row[3]:
-					f.write(FMT % ("country:", row[3]))
-
-				# End block
-				f.write("\n")
-
-	def _export_networks(self, f):
-		# Write header
-		self._write_header(f)
-
-		with self.db as c:
-			# Write all networks
-			res = c.execute("""
-				SELECT networks.route,
-					networks.asn,
-					networks.country,
-					networks.netname,
-					networks.description FROM (
-						SELECT DISTINCT routes.route,
-							routes.address_start,
-							inetnums.network,
-							routes.asn,
-							inetnums.country,
-							inetnums.netname,
-							inetnums.description
-						FROM routes
-						LEFT JOIN inetnums
-							WHERE routes.family = inetnums.family
-							AND routes.prefix >= inetnums.prefix
-							AND inetnums.address_start <= routes.address_start
-							AND inetnums.address_end >= routes.address_end
-						ORDER BY inetnums.prefix DESC
-					) networks
-				ORDER BY networks.address_start
-			""")
-
-			for row in res:
-				net, asn, country, name, description = row
-
-				f.write(FMT % ("net:", net))
-
-				if name:
-					f.write(FMT % ("name:", name))
-
-				if asn:
-					f.write(FMT % ("asnum:", "AS%s" % asn))
-
-				if country:
-					f.write(FMT % ("country:", country))
-
-				if description:
-					for line in description.splitlines():
-						f.write(FMT % ("descr:", line))
-
-				# End the block
-				f.write("\n")
-
 	def _write_header(self, f):
 		f.write("#\n")
 		f.write("# %s\n" % self.rir)