expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 07:28:45 +00:00
Code Issues 18 Projects 3 Activity

partially done bulk update

Browse Source
This commit is contained in:
Philip Sargent
2026-01-28 19:26:23 +00:00
parent 0d6d1fd4b6
commit 1a7e8c94cb
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parsers/survex.py
View File

@@ -1821,8 +1821,10 @@ class LoadingSurvex:
nlegstotal = 0 nlegstotal = 0
self.relativefilename = path self.relativefilename = path
# Cache for parent blocks to save at the end # Cache for parent survex blocks to save at the end
self._pending_parent_saves = set() self._pending_parent_saves = set()
# Cache for survexblocks to save at the end (legsall/legslength)
self._pending_block_saves = set()
#self.IdentifyCave(path, svxid, depth) # this will produce null for survex files which are geographic collections #self.IdentifyCave(path, svxid, depth) # this will produce null for survex files which are geographic collections
self.currentsurvexfile = survexblock.survexfile self.currentsurvexfile = survexblock.survexfile
@@ -2106,14 +2108,23 @@ class LoadingSurvex:
self.legsnumber = nlegstotal self.legsnumber = nlegstotal
self.slength = slengthtotal self.slength = slengthtotal
# At the end, save all cached parent blocks
for parent in getattr(self, '_pending_parent_saves', set()):
try:
parent.save(update_fields=None)
except Exception as e:
print(f"Error saving parent block {parent}: {e}", file=sys.stderr)
# ...timing removed... # At the end, save all cached survexblocks using bulk_update
blocks = list(getattr(self, '_pending_block_saves', set()))
if blocks:
try:
SurvexBlock.objects.bulk_update(blocks, ["legsall", "legslength"])
except Exception as e:
print(f"Error in bulk_update for survexblocks: {e}", file=sys.stderr)
# Then save all cached parent survexblocks using bulk_update
parents = list(getattr(self, '_pending_parent_saves', set()))
if parents:
try:
SurvexBlock.objects.bulk_update(parents)
# SurvexBlock.objects.bulk_update(parents, [f.name for f in SurvexBlock._meta.fields if f.name != 'id'])
except Exception as e:
print(f"Error in bulk_update for parent blocks: {e}", file=sys.stderr)
def PushdownStackScan(self, survexblock, path, finname, flinear, io_collate): def PushdownStackScan(self, survexblock, path, finname, flinear, io_collate):
"""Follows the *include links in all the survex files from the root file (usually 1623.svx) """Follows the *include links in all the survex files from the root file (usually 1623.svx)