From ac34977dddf671663899fc265c1650270e072062 Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Wed, 5 Nov 2014 22:44:02 +0000 Subject: [PATCH] Fixed a slight issue with string formatting in import_venue --- RIGS/importer.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/RIGS/importer.py b/RIGS/importer.py index 03a9851e..6b359982 100644 --- a/RIGS/importer.py +++ b/RIGS/importer.py @@ -14,6 +14,7 @@ from RIGS import models import reversion from datetime import datetime + def setup_cursor(): try: cursor = connections['legacy'].cursor() @@ -79,7 +80,7 @@ def import_vat_rates(): sql = """SELECT `id`, `start_date`, `start_time`, `comment`, `rate` FROM `vat_rates`""" cursor.execute(sql) for row in cursor.fetchall(): - start_at = datetime.combine(row[1], row[2]) + start_at = datetime.combine(row[1], row[2]) object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=start_at, comment=row[3], rate=row[4]) if created: @@ -99,17 +100,18 @@ def import_venues(delete=False): sql = """SELECT `venue`, `threephasepower` FROM `eventdetails` WHERE `venue` IS NOT NULL""" cursor.execute(sql) for row in cursor.fetchall(): - print("Searching for %s", row[0]) - try: - object = models.Venue.objects.get(name__iexact=row[0]) - if not object.three_phase_available and row[1]: - with transaction.atomic(), reversion.create_revision(): - object.three_phase_available = row[1] - object.save() - except ObjectDoesNotExist: - with transaction.atomic(), reversion.create_revision(): - object = models.Venue(name=row[0], three_phase_available=row[1]) - object.save() + print(("Searching for %s", row[0])) + try: + object = models.Venue.objects.get(name__iexact=row[0]) + if not object.three_phase_available and row[1]: + with transaction.atomic(), reversion.create_revision(): + object.three_phase_available = row[1] + object.save() + except ObjectDoesNotExist: + with transaction.atomic(), reversion.create_revision(): + object = models.Venue(name=row[0], three_phase_available=row[1]) + object.save() + def main(): # import_people() @@ -117,5 +119,6 @@ def main(): # import_vat_rates() import_venues(True) + if __name__ == "__main__": main()