expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-04 01:41:44 +01:00
Code Issues 18 Projects 3 Activity

do NOT inherit *date between *include files - policy decision

Browse Source
This commit is contained in:
Philip Sargent 2023-11-04 18:27:41 +02:00
parent 55bbccb4ca
commit a63275f913
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
parsers/survex.py
View File

@ -399,6 +399,10 @@ class LoadingSurvex:
but inheriting dates across *include files is almost certainly NOT but inheriting dates across *include files is almost certainly NOT
expected behaviour, even though it is syntactically "correct", expected behaviour, even though it is syntactically "correct",
so triggers a Warning. so triggers a Warning.
In fact, rather than give a warning, I think this is where troggle should diverge from
a strict interpretation of how survex works. So I will change this so that *date
is NOT inherited between different files.
""" """
if survexblock.parent.name == "troggle_unseens": if survexblock.parent.name == "troggle_unseens":
# Bolluxed up if we try to inherit from this random junk, so don't. # Bolluxed up if we try to inherit from this random junk, so don't.
@ -429,27 +433,30 @@ class LoadingSurvex:
# parser="survex", message=message, url=None, sb=(survexblock.survexfile.path) # child # parser="survex", message=message, url=None, sb=(survexblock.survexfile.path) # child
# ) # )
if survexblock.survexfile != survexblock.parent.survexfile: if survexblock.survexfile != survexblock.parent.survexfile:
# This is noteworthy, however. # This is noteworthy, however. FORBID inheriting dates between files. NOT documented survex behaviour !!
survexblock.date = None
self.currentdate = None # unecessary duplication
return None
if survexblock.parent.name == "rootblock": # if survexblock.parent.name == "rootblock":
# Not a sensible thing to inherit a date from, even if a date exists, which it shouldn't... # # Not a sensible thing to inherit a date from, even if a date exists, which it shouldn't...
message = ( # message = (
f"- No *date. But not sensible to inherit from rootblock. From ({survexblock.parent})-{survexblock.parent.survexfile.path} to ({survexblock})-{survexblock.survexfile.path} {self.inheritdate:%Y-%m-%d}" # f"- No *date. But not sensible to inherit from rootblock. From ({survexblock.parent})-{survexblock.parent.survexfile.path} to ({survexblock})-{survexblock.survexfile.path} {self.inheritdate:%Y-%m-%d}"
)
print(self.insp + message)
# stash_data_issue(
# parser="survex", message=message, url=None, sb=(survexblock.survexfile.path)
# ) # )
return # print(self.insp + message)
else: # # stash_data_issue(
message = ( # # parser="survex", message=message, url=None, sb=(survexblock.survexfile.path)
f"- Warning *date '{self.inheritdate:%Y-%m-%d}' INHERITED from DIFFERENT file:\n ({survexblock.parent})-{survexblock.parent.survexfile.path} to ({survexblock})-{survexblock.survexfile.path} {self.inheritdate:%Y-%m-%d}\n {self.stackbegin} {self.inheritdate:%Y-%m-%d}" # # )
) # return
print(self.insp + message) # else:
stash_data_issue( # message = (
parser="survex", message=message, url=None, sb=(survexblock.parent.survexfile.path) # PARENT # f"- Warning *date '{self.inheritdate:%Y-%m-%d}' INHERITED from DIFFERENT file:\n ({survexblock.parent})-{survexblock.parent.survexfile.path} to ({survexblock})-{survexblock.survexfile.path} {self.inheritdate:%Y-%m-%d}\n {self.stackbegin} {self.inheritdate:%Y-%m-%d}"
) # )
return self.inheritdate # print(self.insp + message)
# stash_data_issue(
# parser="survex", message=message, url=None, sb=(survexblock.survexfile.path) # not the parent
# )
# return self.inheritdate
else: else:
# This is not an error in the Expo dataset. # This is not an error in the Expo dataset.
# Many files just holding *include lines do not have dates. # Many files just holding *include lines do not have dates.