Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 23:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where ifcopenshell express rule validator required a logger with set_state.

Browse Source
This commit is contained in:
Dion Moult
2023-02-20 11:24:23 +11:00
parent ac81169290
commit 147602e107
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/rule_executor.py
+8 -5
View File
@@ -67,9 +67,9 @@ def run(f, logger):
if hasattr(logger, "set_instance"): if hasattr(logger, "set_instance"):
# when using the json logger, we notify it of the relevant instance # when using the json logger, we notify it of the relevant instance
pre_annotate_instance = lambda instance: logger.set_state('instance', instance) pre_annotate_instance = lambda instance: logger.set_state('instance', instance) if hasattr(logger, 'set_state') else None
post_annotate_instance = lambda instance: instance post_annotate_instance = lambda instance: instance
pre_annotate_attribute = lambda attribute: logger.set_state('attribute', attribute) pre_annotate_attribute = lambda attribute: logger.set_state('attribute', attribute) if hasattr(logger, 'set_state') else None
post_annotate_attribute = lambda attribute: None post_annotate_attribute = lambda attribute: None
else: else:
# when using the normal text logger the instance is appended to the method # when using the normal text logger the instance is appended to the method
@@ -92,7 +92,8 @@ def run(f, logger):
rules = list(filter(lambda x: hasattr(x, "SCOPE"), scope.values())) rules = list(filter(lambda x: hasattr(x, "SCOPE"), scope.values()))
logger.set_state('type', 'global_rule') if hasattr(logger, 'set_state'):
logger.set_state('type', 'global_rule')
for R in [r for r in rules if r.SCOPE == "file"]: for R in [r for r in rules if r.SCOPE == "file"]:
try: try:
@@ -110,7 +111,8 @@ def run(f, logger):
) )
) )
logger.set_state('type', 'simpletype_rule') if hasattr(logger, 'set_state'):
logger.set_state('type', 'simpletype_rule')
types = {} types = {}
subtypes = collections.defaultdict(list) subtypes = collections.defaultdict(list)
@@ -208,7 +210,8 @@ def run(f, logger):
else: else:
check(val, attr.type_of_attribute(), instance=inst) check(val, attr.type_of_attribute(), instance=inst)
logger.set_state('type', 'entity_rule') if hasattr(logger, 'set_state'):
logger.set_state('type', 'entity_rule')
for R in [r for r in rules if r.SCOPE == "entity"]: for R in [r for r in rules if r.SCOPE == "entity"]:
for inst in f.by_type(R.TYPE_NAME): for inst in f.by_type(R.TYPE_NAME):
src/ifcopenshell-python/ifcopenshell/validate.py
+2 -1
View File
@@ -291,7 +291,8 @@ def validate(f, logger, express_rules=False):
filename = None filename = None
logger.set_state('type', 'schema') if hasattr(logger, 'set_state'):
logger.set_state('type', 'schema')
if not isinstance(f, ifcopenshell.file): if not isinstance(f, ifcopenshell.file):