fix SURVEY_SCANS to include target folder fully

This commit is contained in:
Philip Sargent 2020-05-31 16:34:46 +01:00
parent b9aa447cac
commit fffb083aee

View File

@ -221,7 +221,7 @@ def LoadListScans():
SurvexScansFolder.objects.all().delete()
# first do the smkhs (large kh survey scans) directory
survexscansfoldersmkhs = SurvexScansFolder(fpath=os.path.join(settings.SURVEY_SCANS, "smkhs"), walletname="smkhs")
survexscansfoldersmkhs = SurvexScansFolder(fpath=os.path.join(settings.SURVEY_SCANS, "../surveys/smkhs"), walletname="smkhs")
if os.path.isdir(survexscansfoldersmkhs.fpath):
survexscansfoldersmkhs.save()
LoadListScansFile(survexscansfoldersmkhs)
@ -229,7 +229,7 @@ def LoadListScans():
# iterate into the surveyscans directory
print(' - ', end=' ')
for f, ff, fisdir in GetListDir(os.path.join(settings.SURVEY_SCANS, "surveyscans")):
for f, ff, fisdir in GetListDir(settings.SURVEY_SCANS):
if not fisdir:
continue