summaryrefslogtreecommitdiffstats
path: root/parsers/surveys.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-06-24 00:18:01 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-06-24 00:18:01 +0100
commitc91aa4be475fac06e6d4b55804fac4debc5c1dbf (patch)
tree02d6952f7a3b956e10bec28eca14c59cb5bd0b7a /parsers/surveys.py
parent9cd70b31acf70c0df6207211efc629b95a8860d2 (diff)
downloadtroggle-c91aa4be475fac06e6d4b55804fac4debc5c1dbf.tar.gz
troggle-c91aa4be475fac06e6d4b55804fac4debc5c1dbf.tar.bz2
troggle-c91aa4be475fac06e6d4b55804fac4debc5c1dbf.zip
Simple renaming too-similar variables
Diffstat (limited to 'parsers/surveys.py')
-rw-r--r--parsers/surveys.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py
index 56db0fa..1999fb5 100644
--- a/parsers/surveys.py
+++ b/parsers/surveys.py
@@ -14,7 +14,7 @@ from functools import reduce
import settings
#from troggle.core.models import *
#from troggle.core.models_caves import *
-from troggle.core.models_survex import SurvexScanSingle, ScansFolder, TunnelFile
+from troggle.core.models_survex import SingleScan, ScansFolder, TunnelFile
def get_or_create_placeholder(year):
""" All surveys must be related to a logbookentry. We don't have a way to
@@ -65,8 +65,8 @@ def LoadListScansFile(scansfolder):
for (fyf, ffyf, fisdiryf) in gld:
#assert not fisdiryf, ffyf
if re.search(r"\.(?:png|jpg|jpeg|pdf|svg|gif)(?i)$", fyf):
- survexscansingle = SurvexScanSingle(ffile=ffyf, name=fyf, scansfolder=scansfolder)
- survexscansingle.save()
+ singlescan = SingleScan(ffile=ffyf, name=fyf, scansfolder=scansfolder)
+ singlescan.save()
c+=1
if c>=10:
print(".", end='')
@@ -79,7 +79,7 @@ def LoadListScans():
print(' - Loading Survey Scans')
- SurvexScanSingle.objects.all().delete()
+ SingleScan.objects.all().delete()
ScansFolder.objects.all().delete()
print(' - deleting all scansFolder and scansSingle objects')
@@ -123,7 +123,7 @@ def FindTunnelScan(tunnelfile, path):
assert len(scansfolderl) == 1
scansfolder = scansfolderl[0]
if scansfolder:
- scansfilel = scansfolder.survexscansingle_set.filter(name=mscansdir.group(2))
+ scansfilel = scansfolder.singlescan_set.filter(name=mscansdir.group(2))
if len(scansfilel):
if len(scansfilel) > 1:
print("BORK more than one image filename matches filter query. ", scansfilel[0])