Update default predicate for choices from previous repeat answers

XLSForm · Sep 24, 2020 · 41c36ad · 41c36ad
1 parent ba03680
commit 41c36ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pyxform/question.py b/pyxform/question.py
@@ -254,9 +254,9 @@ def build_xml(self):
             depth = len(path)
             if depth > 2:
                 name = path[-1]
-                nodeset = "/".join(
-                    path[:-2] + [path[-2] + "[string-length(./" + name + ") > 0]"]
-                )
+                # Choices must have a value. Filter out repeat instances without
+                # an answer for the linked question
+                nodeset = "/".join(path[:-2] + [path[-2] + f"[./{name} != '']"])
                 itemset_children = [node("value", ref=name), node("label", ref=name)]
                 result.appendChild(node("itemset", *itemset_children, nodeset=nodeset))
         else:

diff --git a/pyxform/tests_v1/test_repeat.py b/pyxform/tests_v1/test_repeat.py
@@ -349,7 +349,7 @@ def test_choice_from_previous_repeat_answers(self):
         self.assertPyxformXform(
             md=xlsform_md,
             xml__contains=[
-                '<itemset nodeset="/pyxform_autotestname/rep[string-length(./name) &gt; 0]">'
+                "<itemset nodeset=\"/pyxform_autotestname/rep[./name != '']\">"
             ],
             run_odk_validate=True,
         )