diff options
Diffstat (limited to 'parsers/surveys.py')
| -rw-r--r-- | parsers/surveys.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index baa8725..f3edebe 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -1,6 +1,3 @@ -from __future__ import (absolute_import, division, - print_function, unicode_literals) - import sys import os import types @@ -17,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 * +from troggle.core.models_survex import SurvexScanSingle, ScansFolder, TunnelFile def get_or_create_placeholder(year): """ All surveys must be related to a logbookentry. We don't have a way to @@ -83,15 +80,15 @@ def LoadListScans(): print(' - Loading Survey Scans') SurvexScanSingle.objects.all().delete() - SurvexScansFolder.objects.all().delete() + ScansFolder.objects.all().delete() print(' - deleting all scansFolder and scansSingle objects') # first do the smkhs (large kh survey scans) directory - survexscansfoldersmkhs = SurvexScansFolder(fpath=os.path.join(settings.SURVEY_SCANS, "../surveys/smkhs"), walletname="smkhs") + manyscansfoldersmkhs = ScansFolder(fpath=os.path.join(settings.SURVEY_SCANS, "../surveys/smkhs"), walletname="smkhs") print("smkhs", end=' ') - if os.path.isdir(survexscansfoldersmkhs.fpath): - survexscansfoldersmkhs.save() - LoadListScansFile(survexscansfoldersmkhs) + if os.path.isdir(manyscansfoldersmkhs.fpath): + manyscansfoldersmkhs.save() + LoadListScansFile(manyscansfoldersmkhs) # iterate into the surveyscans directory @@ -106,13 +103,13 @@ def LoadListScans(): for fy, ffy, fisdiry in GetListDir(ff): if fisdiry: assert fisdiry, ffy - survexscansfolder = SurvexScansFolder(fpath=ffy, walletname=fy) + survexscansfolder = ScansFolder(fpath=ffy, walletname=fy) survexscansfolder.save() LoadListScansFile(survexscansfolder) # do the elif f != "thumbs": - survexscansfolder = SurvexScansFolder(fpath=ff, walletname=f) + survexscansfolder = ScansFolder(fpath=ff, walletname=f) survexscansfolder.save() LoadListScansFile(survexscansfolder) @@ -121,7 +118,7 @@ def FindTunnelScan(tunnelfile, path): scansfolder, scansfile = None, None mscansdir = re.search(rb"(\d\d\d\d#X?\d+\w?|1995-96kh|92-94Surveybookkh|1991surveybook|smkhs)/(.*?(?:png|jpg|pdf|jpeg))$", path) if mscansdir: - scansfolderl = SurvexScansFolder.objects.filter(walletname=mscansdir.group(1)) + scansfolderl = ScansFolder.objects.filter(walletname=mscansdir.group(1)) if len(scansfolderl): assert len(scansfolderl) == 1 scansfolder = scansfolderl[0] @@ -136,7 +133,7 @@ def FindTunnelScan(tunnelfile, path): scansfile = scansfilel[0] if scansfolder: - tunnelfile.survexscansfolders.add(scansfolder) + tunnelfile.manyscansfolders.add(scansfolder) if scansfile: tunnelfile.survexscans.add(scansfile) |