Use current() only for choice_filters

XLSForm · Dec 2, 2018 · 3c31570 · 3c31570
1 parent 452509d
commit 3c31570
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/pyxform/question.py b/pyxform/question.py
@@ -54,7 +54,7 @@ def xml_control(self):
         if self["query"]:
             choice_filter = self.get("choice_filter")
             query = "instance('" + self["query"] + "')/root/item"
-            choice_filter = survey.insert_xpaths(choice_filter, self)
+            choice_filter = survey.insert_xpaths(choice_filter, self, True)
             if choice_filter:
                 query += "[" + choice_filter + "]"
             result.setAttribute("query", query)
@@ -149,7 +149,7 @@ def xml_control(self):
                 itemset = self["itemset"]
                 itemset_label_ref = "jr:itext(itextId)"
             nodeset = "instance('" + itemset + "')/root/item"
-            choice_filter = survey.insert_xpaths(choice_filter, self)
+            choice_filter = survey.insert_xpaths(choice_filter, self, True)
             if choice_filter:
                 nodeset += "[" + choice_filter + "]"
 

diff --git a/pyxform/survey.py b/pyxform/survey.py
@@ -702,7 +702,7 @@ def _setup_xpath_dictionary(self):
                 else:
                     self._xpath[element.name] = element.get_xpath()
 
-    def _var_repl_function(self, matchobj, context):
+    def _var_repl_function(self, matchobj, context, use_current=False):
         """
         Given a dictionary of xpaths, return a function we can use to
         replace ${varname} with the xpath to varname.
@@ -723,17 +723,18 @@ def _var_repl_function(self, matchobj, context):
                                                        context.get_xpath())
             if steps:
                 ref_path = ref_path if ref_path.endswith(name) else "/%s" % name
-                return " " + "/".join([".."] * steps) + ref_path + " "
+                prefix = " current()/" if use_current else " "
+                return prefix + "/".join([".."] * steps) + ref_path + " "
 
         return " " + self._xpath[name] + " "
 
-    def insert_xpaths(self, text, context):
+    def insert_xpaths(self, text, context, use_current=False):
         """
         Replace all instances of ${var} with the xpath to var.
         """
         bracketed_tag = r"\$\{(.*?)\}"
         def _var_repl_function(matchobj):
-            return self._var_repl_function(matchobj, context)
+            return self._var_repl_function(matchobj, context, use_current)
 
         return re.sub(bracketed_tag, _var_repl_function, unicode(text))
 

diff --git a/pyxform/tests/test_output/yes_or_no_question.json b/pyxform/tests/test_output/yes_or_no_question.json
@@ -22,7 +22,8 @@
                 }
             ], 
             "type": "select one", 
-            "name": "good_day",
+            "name": "good_day", 
+            "parameters": {}, 
             "label": {
                 "english": "have you had a good day today?"
             }

diff --git a/pyxform/tests_v1/test_repeat.py b/pyxform/tests_v1/test_repeat.py
@@ -151,7 +151,7 @@ def test_choice_filter_relative_path(self):  # pylint: disable=invalid-name
                 |         | crop_list            | kale  | Kale   |                |
             """,  # noqa pylint: disable=line-too-long
             xml__contains=[
-                """<itemset nodeset="instance('crop_list')/root/item[name =  ../crop ]">""",  # noqa pylint: disable=line-too-long
-                """<itemset nodeset="instance('crop_list')/root/item[name =  ../../crop ]">""",  # noqa pylint: disable=line-too-long
+                """<itemset nodeset="instance('crop_list')/root/item[name =  current()/../crop ]">""",  # noqa pylint: disable=line-too-long
+                """<itemset nodeset="instance('crop_list')/root/item[name =  current()/../../crop ]">""",  # noqa pylint: disable=line-too-long
             ],
         )