Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 09:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use schema_identifier for schema and express rule validation. See #3126

Browse Source
This commit is contained in:
Thomas Krijnen
2023-10-12 10:37:44 +02:00
parent 55e61b55d8
commit 81b4e42ca2
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/rule_executor.py
+3 -3
View File
@@ -81,7 +81,7 @@ def run(f, logger):
orig = ifcopenshell.settings.unpack_non_aggregate_inverses
ifcopenshell.settings.unpack_non_aggregate_inverses = True
fn = os.path.join(os.path.dirname(__file__), "rules", f"{f.schema}.py")
fn = os.path.join(os.path.dirname(__file__), "rules", f"{f.schema_identifier}.py")
try:
source = open(fn, "r").read()
except FileNotFoundError as e:
@@ -90,7 +90,7 @@ def run(f, logger):
import subprocess
current_dir_files = {fn.lower(): fn for fn in os.listdir('.')}
schema_name = str(f.schema).split(' ')[-1].lower()
schema_name = str(f.schema_identifier).split(' ')[-1].lower()
schema_path = current_dir_files.get(schema_name + '.exp')
fn = schema_path[:-4] + '.py'
if not os.path.exists(fn):
@@ -100,7 +100,7 @@ def run(f, logger):
a = ast.parse(source)
assertion.rewrite.rewrite_asserts(mod=a, source=source)
cd = compile(a, f"{f.schema}.py", "exec")
cd = compile(a, f"{f.schema_identifier}.py", "exec")
scope = {}
exec(cd, scope)
S = ifcopenshell.ifcopenshell_wrapper.schema_by_name(f.schema_identifier)