Changeset 127

Timestamp:

Oct 22, 2006, 12:16:16 AM (14 years ago)

Author:

Nick Burch

Message:

Update for new schema. Don't require a prompt about the change if it's a sensible, small one

File:

• trunk/npemap.org.uk/scripts/freethepostcode.org-importer/importer.py (modified) (3 diffs)

trunk/npemap.org.uk/scripts/freethepostcode.org-importer/importer.py

@@ -94 +94 @@
         pc["inner"] = parts[3]
         pc["raw"] = "%s %s" % (parts[2],parts[3])
+        pc["raw_outer"] = parts[2]
+        pc["raw_inner"] = parts[3]
 
         postcodes.append(pc)
@@ -108 +110 @@
 print "There are currently %d entries in the database from freethepostcode.org" % count
 print "The new import contains %d entries" % len(postcodes)
-print "Are you sure you wish to remove the old entries, to add new ones?"
-confirm = raw_input("")
-print ""
 
-if confirm == "y" or confirm == "yes":
-        # Good, go ahead
-        pass
-else:
+# Only prompt if it's a big difference
+if count == 0 or len(postcodes) == 0 or len(postcodes) < count or (len(postcodes)-count) > 50:
+        print "Are you sure you wish to remove the old entries, to add new ones?"
+        confirm = raw_input("")
         print ""
-        raise Exception("Aborting import")
+
+        if confirm == "y" or confirm == "yes":
+                # Good, go ahead
+                pass
+        else:
+                print ""
+                raise Exception("Aborting import")
 
 
@@ -130 +135 @@
 
 # Add the latest list to the database
-sql = "INSERT INTO postcodes (outward, inward, raw_postcode, easting, northing, source) VALUES (%s, %s, %s, %s, %s, %s)"
+sql = "INSERT INTO postcodes (outward, inward, raw_postcode_outward, raw_postcode_inward, easting, northing, source) VALUES (%s, %s, %s, %s, %s, %s, %s)"
 sth = dbh.cursor()
 worked = 0
 for postcode in postcodes:
-        sth.execute(sql, (postcode["outer"], postcode["inner"], postcode["raw"], postcode["easting"], postcode["northing"], ftp_source))
+        sth.execute(sql, (postcode["outer"], postcode["inner"], postcode["raw_outer"], postcode["raw_inner"], postcode["easting"], postcode["northing"], ftp_source))
         worked = worked + sth.rowcount
 print "Added %d entries" % worked