Fix survey scans

Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
This commit is contained in:
Sam Wenham
2019-02-24 16:46:02 +00:00
parent f16b4e3f47
commit e6fa54d0e5
3 changed files with 14 additions and 13 deletions

View File

@@ -147,7 +147,7 @@ def parseSurveys(logfile=None):
except (IOError, OSError):
print("Survey CSV not found..")
pass
for expedition in Expedition.objects.filter(year__gte=2000): #expos since 2000, because paths and filenames were nonstandard before then
parseSurveyScans(expedition)
@@ -189,7 +189,7 @@ def LoadListScansFile(survexscansfolder):
gld.append((fyf, ffyf, fisdiryf))
for (fyf, ffyf, fisdiryf) in gld:
assert not fisdiryf, ffyf
#assert not fisdiryf, ffyf
if re.search(r"\.(?:png|jpg|jpeg)(?i)$", fyf):
survexscansingle = SurvexScanSingle(ffile=ffyf, name=fyf, survexscansfolder=survexscansfolder)
survexscansingle.save()