Populate itemset instead of list_name value

XLSForm · Oct 28, 2020 · c21aaee · c21aaee
1 parent 2d020ba
commit c21aaee
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pyxform/xls2json.py b/pyxform/xls2json.py
@@ -1186,10 +1186,10 @@ def replace_prefix(d, prefix):
                 ):
                     new_json_dict["itemset"] = list_name
                     json_dict["choices"] = choices
-                elif file_extension in [".csv", ".xml"]:
+                elif file_extension in [".csv", ".xml"] or re.match(
+                    r"\$\{(.*?)\}", list_name
+                ):
                     new_json_dict["itemset"] = list_name
-                elif re.match(r"\$\{(.*?)\}", list_name):
-                    new_json_dict["list_name"] = list_name
                 else:
                     new_json_dict["list_name"] = list_name
                     new_json_dict[constants.CHOICES] = choices[list_name]