From 9a3ac464f42f2a5b5d3b81f704d86a5ad71b1847 Mon Sep 17 00:00:00 2001
From: tec <tec@alfie.codedinternet.com>
Date: Wed, 5 Nov 2014 22:37:32 +0000
Subject: [PATCH] Minor changes to models and importer

---
 RIGS/importer.py | 25 +++++++++++--------------
 RIGS/models.py   |  6 +++---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/RIGS/importer.py b/RIGS/importer.py
index cdbb143b..694cf4f5 100644
--- a/RIGS/importer.py
+++ b/RIGS/importer.py
@@ -99,20 +99,17 @@ def import_venues(delete=False):
     sql = """SELECT `venue`, `threephasepower` FROM `eventdetails` WHERE `venue` IS NOT NULL"""
     cursor.execute(sql)
     for row in cursor.fetchall():
-        object, created = models.Venue.objects.get_or_create(name__iexact=row[0])
-        if created:
-            print("Created: " + object.__str__())
-            with transaction.atomic(), reversion.create_revision():
-                object.three_phase_available = row[1]
-                object.save()
-        else:
-            if not object.three_phase_available and row[1] == 1:
-                print("Updating: " + object.__str__())
-                with transaction.atomic(), reversion.create_revision():
-                    object.three_phase_available = row[1]
-                    object.save()
-            else:
-                print("Found: " + object.__str__())
+	print("Searching for %s", row[0])
+	object = models.Venue.objects.get(name__iexact=row[0])
+	if object:
+		if not object.three_phase_available and row[1]:
+			with transaction.atomic(), reversion.create_revision():
+				object.three_phase_available = row[1]
+				object.save()
+	else:
+		with transaction.atomic(), reversion.create_revision():
+			object = models.Venue(name=row[0], three_phase_available=row[1])
+			object.save()
 
 def main():
     # import_people()
diff --git a/RIGS/models.py b/RIGS/models.py
index 3db762e7..394c9d18 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -88,8 +88,8 @@ class Venue(models.Model, RevisionMixin):
 
     def __str__(self):
         string = self.name
-        if len(self.notes) > 0:
-            string += "*"
+        if self.notes and len(self.notes) > 0:
+           string += "*"
         return string
 
 
@@ -163,4 +163,4 @@ class EventCrew(models.Model):
     rig = models.BooleanField(default=False)
     run = models.BooleanField(default=False)
     derig = models.BooleanField(default=False)
-    notes = models.TextField(blank=True, null=True)
\ No newline at end of file
+    notes = models.TextField(blank=True, null=True)