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

Fix #2945. Selector should expand enumerated list properties so that you can match any of them.

Browse Source
This commit is contained in:
Dion Moult
2023-04-06 19:21:14 +10:00
parent 884ee5b587
commit 6c5acfc8bb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/selector.py
+4 -1
View File
@@ -293,7 +293,10 @@ class Selector:
results = [] results = []
for prop_name, prop_value in value.items(): for prop_name, prop_value in value.items():
if re.match(key, prop_name): if re.match(key, prop_name):
results.append(prop_value) if isinstance(prop_value, (list, tuple)):
results.extend(prop_value)
else:
results.append(prop_value)
value = results value = results
else: else:
value = value.get(key, None) value = value.get(key, None)
src/ifcopenshell-python/test/util/test_selector.py
+1
View File
@@ -88,6 +88,7 @@ class TestSelector(test.bootstrap.IFC4):
ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Foo": "Bar"}) ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Foo": "Bar"})
assert subject.Selector.parse(self.file, ".IfcElement[Foo_Bar.Foo]") == [element] assert subject.Selector.parse(self.file, ".IfcElement[Foo_Bar.Foo]") == [element]
assert subject.Selector.parse(self.file, ".IfcElement[Foo_Bar.Fox]") == [] assert subject.Selector.parse(self.file, ".IfcElement[Foo_Bar.Fox]") == []
assert subject.Selector.parse(self.file, '.IfcElement[r"Foo.*ar"."Fo.*"]') == [element]
def test_selecting_by_string_property(self): def test_selecting_by_string_property(self):
element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")