defensiveness, [value] is optional? implement [exists]

aothms · web-flow · commit 61d4441b6a84 · 2024-01-19T22:24:57.000+01:00
diff --git a/mvd.py b/mvd.py
@@ -1,11 +1,11 @@
 import ifcopenshell
 import ifcopenshell.geom
 
-import itertools
 import os
+import itertools
 
-import xlsxwriter
 import csv
+import xlsxwriter
 
 
 def is_applicability(concept):
@@ -431,10 +431,14 @@ def transform_data(d):
         Transform dictionary keys from tree nodes to rule ids
         """
         
-        return {(k.parent if k.bind is None and k.parent.bind is not None else k).bind: v for k, v in d.items()}
+        return {(k.parent if k.bind is None and (k.parent is not None and k.parent.bind is not None) else k).bind: v for k, v in d.items()}
 
     
     def parse_mvdxml_token(v):
+        if v.lower() == "true":
+            return True
+        if v.lower() == "false":
+            return False
         # @todo make more permissive and tolerant
         return ast.literal_eval(v)
 
@@ -468,10 +472,14 @@ def translate(v):
                         if isinstance(v, str):
                             return getattr(operator, v.lower() + "_")
                         else:
-                            if v.b == "Value":
+                            if v.b == "Value" or v.b is None:
                                 return d.get(v.a) == parse_mvdxml_token(v.c)
                             elif v.b == "Type":
-                                return d.get(v.a) and d.get(v.a).is_a(parse_mvdxml_token(v.c))
+                                return d.get(v.a) is not None and d.get(v.a).is_a(parse_mvdxml_token(v.c))
+                            elif v.b == "Exists":
+                                return (d.get(v.a) is not None) == parse_mvdxml_token(v.c)
+                            else:
+                                raise RuntimeError(f"Invalid rule predicate {v.b}")
                             
                     r2 = list(map(translate, r))
                     yield reduce(operation_reduce, r2)
