775: Support Entities from repeats

pyxform/xls2json.py

@@ -60,6 +60,14 @@
 RE_OSM = re.compile(
     r"(?P<osm_command>(" + "|".join(aliases.osm) + r")) (?P<list_name>\S+)"
 )
+INVALID_CONTROL_END = (
+    "[row : {row}] Unmatched 'end {control_type}'. "
+    "No matching 'begin {control_type}' was found."
+)
+INVALID_CONTROL_BEGIN = (
+    "[row : {row}] Unmatched 'begin {control_type}'. "
+    "No matching 'end {control_type}' was found."
+)
 
 
 def dealias_types(dict_array):
@@ -519,6 +527,7 @@ def workbook_to_json(
             "control_type": None,
             "control_name": None,
             "parent_children": json_dict.get(constants.CHILDREN),
+            "row_number": None,
         }
     ]
     # If a group has a table-list appearance flag
@@ -533,12 +542,9 @@ def workbook_to_json(
 
     # row by row, validate questions, throwing errors and adding warnings where needed.
     for row_number, row in enumerate(survey_sheet.data, start=2):
-        if stack[-1] is not None:
-            prev_control_type = stack[-1]["control_type"]
-            parent_children_array = stack[-1]["parent_children"]
-        else:
-            prev_control_type = None
-            parent_children_array = []
+        prev_control_type = stack[-1]["control_type"]
+        parent_children_array = stack[-1]["parent_children"]
+
         # Disabled should probably be first
         # so the attributes below can be disabled.
         if "disabled" in row:
@@ -557,7 +563,6 @@ def workbook_to_json(
 
         # Get question type
         question_type = row.get(constants.TYPE)
-        question_name = row.get(constants.NAME)
 
         if not question_type:
             # if name and label are also missing,
@@ -772,16 +777,11 @@ def workbook_to_json(
             parse_dict = end_control_parse.groupdict()
             if parse_dict.get("end") and "type" in parse_dict:
                 control_type = aliases.control[parse_dict["type"]]
-                control_name = question_name
                 if prev_control_type != control_type or len(stack) == 1:
                     raise PyXFormError(
-                        ROW_FORMAT_STRING % row_number
-                        + " Unmatched end statement. Previous control type: "
-                        + str(prev_control_type)
-                        + ", Control type: "
-                        + str(control_type)
-                        + ", Control name: "
-                        + str(control_name)
+                        INVALID_CONTROL_END.format(
+                            row=row_number, control_type=control_type
+                        )
                     )
                 stack.pop()
                 table_list = None
@@ -792,9 +792,6 @@ def workbook_to_json(
             if row["type"] == "note":
                 # autogenerate names for notes without them
                 row["name"] = "generated_note_name_" + str(row_number)
-            # elif 'group' in row['type'].lower():
-            #     # autogenerate names for groups without them
-            #     row['name'] = "generated_group_name_" + str(row_number)
             else:
                 raise PyXFormError(
                     ROW_FORMAT_STRING % row_number + " Question or group with no name."
@@ -937,6 +934,7 @@ def workbook_to_json(
                         "control_type": control_type,
                         "control_name": control_name,
                         "parent_children": child_list,
+                        "row_number": row_number,
                     }
                 )
                 continue
@@ -1370,8 +1368,9 @@ def workbook_to_json(
 
     if len(stack) != 1:
         raise PyXFormError(
-            "Unmatched begin statement: "
-            + str(stack[-1]["control_type"] + " (" + stack[-1]["control_name"] + ")")
+            INVALID_CONTROL_BEGIN.format(
+                row=stack[-1]["row_number"], control_type=stack[-1]["control_type"]
+            )
         )
 
     if settings.get("flat", False):

tests/test_groups.py

@@ -5,6 +5,7 @@
 from unittest import TestCase
 
 from pyxform.builder import create_survey_element_from_dict
+from pyxform.xls2json import INVALID_CONTROL_BEGIN, INVALID_CONTROL_END
 from pyxform.xls2xform import convert
 
 from tests.pyxform_test_case import PyxformTestCase
@@ -88,7 +89,9 @@ def test_group__no_end_error(self):
         |        | text        | q1   | Q1    |
         """
         self.assertPyxformXform(
-            md=md, errored=True, error__contains=["Unmatched begin statement: group (g1)"]
+            md=md,
+            errored=True,
+            error__contains=[INVALID_CONTROL_BEGIN.format(row=2, control_type="group")],
         )
 
     def test_group__no_end_error__different_end_type(self):
@@ -103,10 +106,7 @@ def test_group__no_end_error__different_end_type(self):
         self.assertPyxformXform(
             md=md,
             errored=True,
-            error__contains=[
-                "[row : 4] Unmatched end statement. Previous control type: group, Control "
-                "type: repeat, Control name: None"
-            ],
+            error__contains=[INVALID_CONTROL_END.format(row=4, control_type="repeat")],
         )
 
     def test_group__no_end_error__with_another_closed_group(self):
@@ -120,7 +120,9 @@ def test_group__no_end_error__with_another_closed_group(self):
         |        | end group   |      |       |
         """
         self.assertPyxformXform(
-            md=md, errored=True, error__contains=["Unmatched begin statement: group (g1)"]
+            md=md,
+            errored=True,
+            error__contains=[INVALID_CONTROL_BEGIN.format(row=2, control_type="group")],
         )
 
     def test_group__no_begin_error(self):
@@ -134,10 +136,7 @@ def test_group__no_begin_error(self):
         self.assertPyxformXform(
             md=md,
             errored=True,
-            error__contains=[
-                "[row : 3] Unmatched end statement. Previous control type: None, Control "
-                "type: group, Control name: None"
-            ],
+            error__contains=[INVALID_CONTROL_END.format(row=3, control_type="group")],
         )
 
     def test_group__no_begin_error__with_another_closed_group(self):
@@ -153,10 +152,7 @@ def test_group__no_begin_error__with_another_closed_group(self):
         self.assertPyxformXform(
             md=md,
             errored=True,
-            error__contains=[
-                "[row : 5] Unmatched end statement. Previous control type: None, Control "
-                "type: group, Control name: None"
-            ],
+            error__contains=[INVALID_CONTROL_END.format(row=5, control_type="group")],
         )
 
     def test_group__no_begin_error__with_another_closed_repeat(self):
@@ -172,10 +168,7 @@ def test_group__no_begin_error__with_another_closed_repeat(self):
         self.assertPyxformXform(
             md=md,
             errored=True,
-            error__contains=[
-                "[row : 4] Unmatched end statement. Previous control type: repeat, Control"
-                " type: group, Control name: None"
-            ],
+            error__contains=[INVALID_CONTROL_END.format(row=4, control_type="group")],
         )