mdoku_0.2

[mDoc.git] / python / mDoc / mdoc / extractor.py

diff --git a/python/mDoc/mdoc/extractor.py b/python/mDoc/mdoc/extractor.py
index 1b9b7be705d68685453d7cb34e0f21c493fca460..1f0fd9d814f793c7e84ac85bf0ec331d9227cc2e 100644 (file)
--- a/python/mDoc/mdoc/extractor.py
+++ b/python/mDoc/mdoc/extractor.py
@@ -5,7 +5,6 @@ Created on 26.03.2021
 '''
 from mutil.XmlExtractor import XmlExtractor
 from mutil import XmlExtractor as XMLE
-from pickle import NONE, FALSE, TRUE
 
 def eval_class(classs, item):
     item_hira = item.split(".")
@@ -18,15 +17,22 @@ def eval_class(classs, item):
             return False,ilen
     return True,ilen
     
+def eval_attribute(classs, attribute):
+    for item in attribute.split(":"):
+        ret,ilen = eval_class(classs, item)
+        if ret:
+            return True,ilen
+    return False,ilen
+
 def is_for_print(classs, attrs):
     include = False
     exclude = False
     ilen    = 0
     elen    = 0
     if "include" in attrs:
-        include,ilen = eval_class(classs, attrs["include"])
+        include,ilen = eval_attribute(classs, attrs["include"])
     if "exclude" in attrs:
-        exclude,elen = eval_class(classs, attrs["exclude"])
+        exclude,elen = eval_attribute(classs, attrs["exclude"])
     if ilen > 0 and elen == 0:
         return include
     elif elen > 0 and ilen == 0: