summaryrefslogtreecommitdiffstats
path: root/core/models.py
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2020-02-21 15:57:07 +0000
committerSam Wenham <sam@wenhams.co.uk>2020-02-21 15:57:07 +0000
commite77aa9fb84192bcb0813589589130fb7c1b29c0f (patch)
tree0470ce711abeac54ff4d85b35c7a965aefe58d29 /core/models.py
parentf5fe2d9e335dde5fc8607e3ba9fd54e948bf6d6d (diff)
downloadtroggle-Faster-survex-parser.tar.gz
troggle-Faster-survex-parser.tar.bz2
troggle-Faster-survex-parser.zip
Changes needed to stop the survex parser having to go through the data twiceFaster-survex-parser
Taken from the Django 1.10 upgrade branch
Diffstat (limited to 'core/models.py')
-rw-r--r--core/models.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/core/models.py b/core/models.py
index f65efed..32b094a 100644
--- a/core/models.py
+++ b/core/models.py
@@ -535,13 +535,15 @@ class Cave(TroggleModel):
def getCaveByReference(reference):
areaname, code = reference.split("-", 1)
- print(areaname, code)
+ #print(areaname, code)
area = Area.objects.get(short_name = areaname)
- print(area)
- foundCaves = list(Cave.objects.filter(area = area, kataster_number = code).all()) + list(Cave.objects.filter(area = area, unofficial_number = code).all())
+ #print(area)
+ foundCaves = list(Cave.objects.filter(area = area, kataster_number = code).all()) + list(Cave.objects.filter(area = area, unofficial_number = code).all())
print(list(foundCaves))
- assert len(foundCaves) == 1
- return foundCaves[0]
+ if len(foundCaves) == 1:
+ return foundCaves[0]
+ else:
+ return False
class OtherCaveName(TroggleModel):
name = models.CharField(max_length=160)