summaryrefslogtreecommitdiffstats
path: root/parsers
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-02-24 16:46:02 +0000
committerSam Wenham <sam@wenhams.co.uk>2019-02-24 16:46:02 +0000
commite6fa54d0e5ecbbe9811a19df5c42a1927f893b48 (patch)
tree143ad0e4270fefea54cf13d00b84c6f3f7d8ac04 /parsers
parentf16b4e3f47a5a7e3103d9e6278462b1e86e67b30 (diff)
downloadtroggle-e6fa54d0e5ecbbe9811a19df5c42a1927f893b48.tar.gz
troggle-e6fa54d0e5ecbbe9811a19df5c42a1927f893b48.tar.bz2
troggle-e6fa54d0e5ecbbe9811a19df5c42a1927f893b48.zip
Fix survey scans
Remove the assert for folders in survey wallets, this does mean currently they will be ignored by troggle.
Diffstat (limited to 'parsers')
-rw-r--r--parsers/surveys.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py
index 02b06f5..29de15c 100644
--- a/parsers/surveys.py
+++ b/parsers/surveys.py
@@ -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()