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

Fix #2858. Fix #2856. BlenderBIM Add-on drawings and IfcCSV now support the new quoted and escaped selector capabilities.

Browse Source
This commit is contained in:
Dion Moult
2023-03-13 11:09:56 +11:00
parent 9ec54228f8
commit 1250a20e35
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/selector.py
+42 -12
View File
@@ -23,6 +23,31 @@ import ifcopenshell.util.fm
import ifcopenshell.util.element
def get_element_value(element, query):
l = lark.Lark(
"""start: WORD | ESCAPED_STRING | keys_regex | keys_quoted | keys_simple
keys_regex: "r" ESCAPED_STRING "." ESCAPED_STRING
keys_quoted: ESCAPED_STRING "." ESCAPED_STRING
keys_simple: /[^\\W][^.=<>]*[^\\W]/ "." /[^\\W][^.=<>]*[^\\W]/
// Embed common.lark for packaging
_STRING_INNER: /.*?/
_STRING_ESC_INNER: _STRING_INNER /(?<!\\\\)(\\\\\\\\)*?/
ESCAPED_STRING : "\\"" _STRING_ESC_INNER "\\""
LCASE_LETTER: "a".."z"
UCASE_LETTER: "A".."Z"
LETTER: UCASE_LETTER | LCASE_LETTER
WORD: LETTER+
WS: /[ \\t\\f\\r\\n]/+
%ignore WS // Disregard spaces in text
"""
)
start = l.parse(query)
filter_query = Selector.parse_filter_query(start.children[0])
return Selector.get_element_value(element, filter_query["keys"], filter_query["is_regex"])
class Selector:
@classmethod
def parse(cls, ifc_file, query, elements=None):
@@ -181,17 +206,7 @@ class Selector:
@classmethod
def filter_elements(cls, elements, filter_rule):
results = []
keys = filter_rule.children[0].children[0]
is_regex = False
if isinstance(keys, str):
keys = [keys]
elif keys.data == "keys_regex":
is_regex = True
keys = [keys.children[0][1:-1].replace("\\\"", '"'), keys.children[1][1:-1].replace("\\\"", '"')]
elif keys.data == "keys_quoted":
keys = [keys.children[0][1:-1].replace("\\\"", '"'), keys.children[1][1:-1].replace("\\\"", '"')]
elif keys.data == "keys_simple":
keys = [keys.children[0], keys.children[1]]
filter_query = cls.parse_filter_query(filter_rule.children[0].children[0])
comparison = value = None
if len(filter_rule.children) > 1:
comparison = filter_rule.children[1].children[0].data
@@ -209,7 +224,7 @@ class Selector:
elif token_type == "NULL":
value = None
for element in elements:
element_value = cls.get_element_value(element, keys, is_regex=is_regex)
element_value = cls.get_element_value(element, filter_query["keys"], is_regex=filter_query["is_regex"])
if element_value is None and value is not None and "not" not in comparison:
continue
if comparison and cls.filter_element(
@@ -220,6 +235,21 @@ class Selector:
results.append(element)
return results
@classmethod
def parse_filter_query(cls, filter_query):
keys = filter_query
is_regex = False
if isinstance(keys, str):
keys = [keys]
elif keys.data == "keys_regex":
is_regex = True
keys = [keys.children[0][1:-1].replace("\\\"", '"'), keys.children[1][1:-1].replace("\\\"", '"')]
elif keys.data == "keys_quoted":
keys = [keys.children[0][1:-1].replace("\\\"", '"'), keys.children[1][1:-1].replace("\\\"", '"')]
elif keys.data == "keys_simple":
keys = [keys.children[0], keys.children[1]]
return {"keys": keys, "is_regex": is_regex}
@classmethod
def get_element_value(cls, element, keys, is_regex=False):
value = element
src/ifcopenshell-python/test/util/test_selector.py
+7
View File
@@ -22,6 +22,13 @@ import ifcopenshell.api
import ifcopenshell.util.selector as subject
class TestGetElementValue(test.bootstrap.IFC4):
def test_selecting_an_elements_value_using_a_query(self):
element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
element.Name = "Foobar"
assert subject.get_element_value(element, "Name") == "Foobar"
class TestSelector(test.bootstrap.IFC4):
def test_selecting_by_class(self):
element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")