Fix handling of unverifiable and condition

- caused false positives
- fixes #32

.github/workflows/testsuite.yml

@@ -33,7 +33,7 @@ jobs:
           python -m pytest dicom_validator
         fi
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       if: ${{ success() && matrix.python-version == 3.9 && matrix.os == 'ubuntu-latest' }}
       with:
         name: codecov-dicom-validator

CHANGES.md

@@ -6,6 +6,9 @@ The released versions correspond to PyPi releases.
 ### Features
 * added initial support for validating functional group macros
 
+### Fixes
+* fixes handling of unverifiable and condition, see [#32](../.. /issues/32)
+
 ### Infrastructure
 * Added pre-commit configuration for use with pre-commit hook
 

dicom_validator/spec_reader/condition_parser.py

@@ -304,6 +304,10 @@ def _parse_tag_expressions(self, condition: str, nested: bool = False) -> Condit
                     cond_list.append(next_result)
                     result.type = None
                     result = new_result
+                elif logical_op == "and":
+                    # the second part of the condition could not be parsed
+                    # this invalidates the whole condition
+                    result = next_result
         if not nested and rest is not None:
             other_cond = self._get_other_condition(rest)
             if other_cond is not None and other_cond.type != "U":

dicom_validator/tests/spec_reader/test_condition_parser.py

@@ -485,16 +485,24 @@ def test_and_condition(self, parser):
         assert result2.operator == "="
         assert result2.values == ["Y"]
 
-    def test_ignore_unverifyable_and_condition(self, parser):
+    def test_ignore_unverifyable_or_condition(self, parser):
         result = parser.parse(
-            "Required if Delivery Type (300A,00CE) is CONTINUATION and "
+            "Required if Delivery Type (300A,00CE) is CONTINUATION or "
             "one or more channels of any Application Setup are omitted."
         )
         assert result.type == "MN"
         assert len(result.and_conditions) == 0
         assert result.operator == "="
         assert result.values == ["CONTINUATION"]
 
+    def test_unverifyable_and_condition_invalidates_condition(self, parser):
+        result = parser.parse(
+            "Required if Delivery Type (300A,00CE) is CONTINUATION and "
+            "one or more channels of any Application Setup are omitted."
+        )
+        assert result.type == "U"
+        assert result.tag is None
+
     def test_and_without_value(self, parser):
         result = parser.parse(
             "Required if Recorded Channel Sequence (3008,0130) is sent and "

dicom_validator/tests/validator/test_iod_validator_func_groups.py

@@ -82,7 +82,6 @@ def validator(iod_info, module_info, request):
                 {
                     "CodeValue": "T-D3000",
                     "CodingSchemeDesignator": "SRT",
-                    "CodingSchemeVersion": "1",
                     "CodeMeaning": "Chest",
                 }
             ],