[svn] commit: r901 - /experiments/each-zoneload/loadzone.py

[BIND 10 source code commits]

Author: each
Date: Sat Feb 20 09:56:26 2010
New Revision: 901

Log:
oops, stored the wrong name.

Modified:
    experiments/each-zoneload/loadzone.py

Modified: experiments/each-zoneload/loadzone.py
==============================================================================
--- experiments/each-zoneload/loadzone.py (original)
+++ experiments/each-zoneload/loadzone.py Sat Feb 20 09:56:26 2010
@@ -33,7 +33,19 @@
         new.pop(0)
     return '.'.join(new)+'.'
 
-conn = sqlite3.connect("trialsize")
+try:
+    zone = sys.argv[1]
+    if zone[-1] != '.':
+        zone += '.'
+    zonefile = sys.argv[2]
+except:
+    print("Usage: " + sys.argv[0] + " <zone name> <zone file> [database]")
+    exit(1)
+
+try: dbfile=sys.argv[3]
+except: dbfile='/tmp/zone.sqlite3'
+
+conn = sqlite3.connect(dbfile)
 cur = conn.cursor()
 
 # Does the database exist yet?  If not, create it.
@@ -47,21 +59,6 @@
 
 if row == None or row[0] != 1:
     raise DatabaseError("Bad database schema version")
-
-# XXX: should do a better job parsing arguments, but for now
-# we just use "load.py origin filename [database]".
-
-try:
-    zone = sys.argv[1]
-    if zone[-1] != '.':
-        zone += '.'
-    zonefile = sys.argv[2]
-except:
-    print("Usage: " + sys.argv[0] + " <zone name> <zone file> [database]")
-    exit(1)
-
-try: dbfile=sys.argv[3]
-except: dbfile='/tmp/zone.sqlite3'
 
 try:
     data = open(zonefile).read().splitlines()
@@ -95,13 +92,13 @@
         cur.execute("""INSERT INTO records
                        (zone_id, name, rname, ttl, rdtype, sigtype, rdata)
                        VALUES (?, ?, ?, ?, ?, ?, ?)""",
-                    [new_zone_id, zone, reverse_name(zone), ttl, rdtype,
+                    [new_zone_id, name, reverse_name(name), ttl, rdtype,
                     sigtype, rdata])
     else:
         cur.execute("""INSERT INTO records
                        (zone_id, name, rname, ttl, rdtype, rdata)
                        VALUES (?, ?, ?, ?, ?, ?)""",
-                    [new_zone_id, zone, reverse_name(zone), ttl, rdtype,
+                    [new_zone_id, name, reverse_name(name), ttl, rdtype,
                     rdata])
 
 if old_zone_id: