xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

simple rename survexscansfolder to scansfolder

Browse Source
This commit is contained in:
Philip Sargent
2020-06-23 23:46:33 +01:00
parent b64c779a58
commit 9cd70b31ac
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parsers/survex.py
View File

@@ -19,7 +19,7 @@ from troggle.core.views_caves import MapLocations
"""A 'survex block' is a *begin...*end set of cave data.
A 'survexscansfolder' is what we today call a "survey scans folder" or a "wallet".
A 'scansfolder' is what we today call a "survey scans folder" or a "wallet".
"""
rx_braskets= re.compile(r"[()]")
@@ -150,7 +150,7 @@ insp = ""
callcount = 0
def RecursiveLoad(survexblock, survexfile, fin):
"""Follows the *include links in all the survex files from the root file 1623.svx
and reads in the survex blocks, other data and the wallet references (survexscansfolder) as it
and reads in the survex blocks, other data and the wallet references (scansfolder) as it
goes. This part of the data import process is where the maximum memory is used and where it
crashes on memory-constrained machines.
"""
@@ -198,7 +198,7 @@ def RecursiveLoad(survexblock, survexfile, fin):
refscan = "%s#%s%s" % (yr, letterx, wallet )
manyscansfolders = models_survex.ScansFolder.objects.filter(walletname=refscan)
if manyscansfolders:
survexblock.survexscansfolder = manyscansfolders[0]
survexblock.scansfolder = manyscansfolders[0]
survexblock.save()
else:
message = ' ! Wallet ; ref {} - NOT found in manyscansfolders {}'.format(refscan, survexblock.survexfile.path)
@@ -264,7 +264,7 @@ def RecursiveLoad(survexblock, survexfile, fin):
refscan = "%s#%s%s" % (yr, letterx, wallet)
manyscansfolders = models_survex.ScansFolder.objects.filter(walletname=refscan)
if manyscansfolders:
survexblock.survexscansfolder = manyscansfolders[0]
survexblock.scansfolder = manyscansfolders[0]
survexblock.save()
else:
message = ' ! Wallet *REF {} - NOT found in manyscansfolders {}'.format(refscan, survexblock.survexfile.path)

18
parsers/surveys.py
View File

@@ -52,10 +52,10 @@ def GetListDir(sdir):
return res
def LoadListScansFile(survexscansfolder):
def LoadListScansFile(scansfolder):
gld = [ ]
# flatten out any directories in these wallet folders - should not be any
for (fyf, ffyf, fisdiryf) in GetListDir(survexscansfolder.fpath):
for (fyf, ffyf, fisdiryf) in GetListDir(scansfolder.fpath):
if fisdiryf:
gld.extend(GetListDir(ffyf))
else:
@@ -65,7 +65,7 @@ def LoadListScansFile(survexscansfolder):
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, survexscansfolder=survexscansfolder)
survexscansingle = SurvexScanSingle(ffile=ffyf, name=fyf, scansfolder=scansfolder)
survexscansingle.save()
c+=1
if c>=10:
@@ -103,15 +103,15 @@ def LoadListScans():
for fy, ffy, fisdiry in GetListDir(ff):
if fisdiry:
assert fisdiry, ffy
survexscansfolder = ScansFolder(fpath=ffy, walletname=fy)
survexscansfolder.save()
LoadListScansFile(survexscansfolder)
scansfolder = ScansFolder(fpath=ffy, walletname=fy)
scansfolder.save()
LoadListScansFile(scansfolder)
# do the
elif f != "thumbs":
survexscansfolder = ScansFolder(fpath=ff, walletname=f)
survexscansfolder.save()
LoadListScansFile(survexscansfolder)
scansfolder = ScansFolder(fpath=ff, walletname=f)
scansfolder.save()
LoadListScansFile(scansfolder)
def FindTunnelScan(tunnelfile, path):