From ce1842bbc42aa127561bd6482c06311a6818dd58 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Fri, 20 Dec 2019 10:01:56 -0800
Subject: [PATCH 1/3] select1 is not a valid bind type

---
 pyxform/question.py                           |  2 +-
 pyxform/question_type_dictionary.py           |  8 +-
 .../tests/example_xls/instance_xmlns_test.xml |  2 +-
 .../example_xls/spec_test_expected_output.xml | 18 ++--
 pyxform/tests/example_xls/widgets.xml         | 22 ++---
 pyxform/tests/fixtures/strings.ini            |  2 +-
 .../attribute_columns_test.xml                | 18 ++--
 .../test_expected_output/cascades_old.xml     | 82 +++++++++----------
 .../cascading_select_test.xml                 |  6 +-
 .../flat_xlsform_test.xml                     | 18 ++--
 .../new_cascading_select.xml                  |  6 +-
 .../test_expected_output/old_cascades.xml     |  6 +-
 .../tests/test_expected_output/or_other.xml   |  4 +-
 .../test_expected_output/repeat_date_test.xml |  4 +-
 .../search_and_select.xml                     |  2 +-
 .../select_one_external.xml                   |  2 +-
 .../tests/test_expected_output/table-list.xml |  6 +-
 .../tests/test_expected_output/widgets.xml    | 22 ++---
 .../xlsform_spec_test.xml                     | 18 ++--
 .../test_expected_output/xml_escaping.xml     |  2 +-
 pyxform/tests/test_output/cascades_old.xml    | 82 +++++++++----------
 pyxform/tests/xml_tests.py                    |  2 +-
 pyxform/tests_v1/test_sheet_columns.py        |  2 +-
 23 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/pyxform/question.py b/pyxform/question.py
index 7947692b0..c25eff794 100644
--- a/pyxform/question.py
+++ b/pyxform/question.py
@@ -134,7 +134,7 @@ def validate(self):
             choice.validate()
 
     def xml_control(self):
-        assert self.bind["type"] in ["select", "select1", "odk:rank"]
+        assert self.bind["type"] in ["select", "string", "odk:rank"]
         survey = self.get_root()
         control_dict = self.control.copy()
         # Resolve field references in attributes
diff --git a/pyxform/question_type_dictionary.py b/pyxform/question_type_dictionary.py
index 49df1f07e..90549ef99 100644
--- a/pyxform/question_type_dictionary.py
+++ b/pyxform/question_type_dictionary.py
@@ -128,7 +128,7 @@ def generate_new_dict():
         }
     },
     "q location": {"control": {"tag": "input"}, "bind": {"type": "geopoint"}},
-    "select one": {"control": {"tag": "select1"}, "bind": {"type": "select1"}},
+    "select one": {"control": {"tag": "select1"}, "bind": {"type": "string"}},
     "select one external": {"control": {"tag": "input"}, "bind": {"type": "string"}},
     "add image prompt": {
         "control": {"tag": "upload", "mediatype": "image/*"},
@@ -174,7 +174,7 @@ def generate_new_dict():
     },
     "q barcode": {"control": {"tag": "input"}, "bind": {"type": "barcode"}},
     "q select": {"control": {"tag": "select"}, "bind": {"type": "select"}},
-    "select one using": {"control": {"tag": "select1"}, "bind": {"type": "select1"}},
+    "select one using": {"control": {"tag": "select1"}, "bind": {"type": "string"}},
     "rank": {"control": {"tag": "odk:rank"}, "bind": {"type": "odk:rank"}},
     "image": {
         "control": {"tag": "upload", "mediatype": "image/*"},
@@ -272,7 +272,7 @@ def generate_new_dict():
     "add integer prompt": {"control": {"tag": "input"}, "bind": {"type": "int"}},
     "q dateTime": {"control": {"tag": "input"}, "bind": {"type": "dateTime"}},
     "date": {"control": {"tag": "input"}, "bind": {"type": "date"}},
-    "q select1": {"control": {"tag": "select1"}, "bind": {"type": "select1"}},
+    "q select1": {"control": {"tag": "select1"}, "bind": {"type": "string"}},
     "start time": {
         "bind": {
             "jr:preload": "timestamp",
@@ -293,7 +293,7 @@ def generate_new_dict():
     },
     "add select one prompt using": {
         "control": {"tag": "select1"},
-        "bind": {"type": "select1"},
+        "bind": {"type": "string"},
     },
     "hidden": {"bind": {"type": "string"}},
     "uri:subscriberid": {
diff --git a/pyxform/tests/example_xls/instance_xmlns_test.xml b/pyxform/tests/example_xls/instance_xmlns_test.xml
index 27b8a104c..c75defcb1 100644
--- a/pyxform/tests/example_xls/instance_xmlns_test.xml
+++ b/pyxform/tests/example_xls/instance_xmlns_test.xml
@@ -10,7 +10,7 @@
             </meta>
         </instance_xmlns_test>
       </instance>
-      <bind nodeset="/instance_xmlns_test/yes_or_no" type="select1"/>
+      <bind nodeset="/instance_xmlns_test/yes_or_no" type="string"/>
       <bind jr:preload="uid" nodeset="/instance_xmlns_test/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/example_xls/spec_test_expected_output.xml b/pyxform/tests/example_xls/spec_test_expected_output.xml
index 11e199df6..33dddd9ea 100644
--- a/pyxform/tests/example_xls/spec_test_expected_output.xml
+++ b/pyxform/tests/example_xls/spec_test_expected_output.xml
@@ -624,25 +624,25 @@
           </meta>
         </xlsform_spec_test>
       </instance>
-      <bind nodeset="/xlsform_spec_test/skip_to_end" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/skip_to_end" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything" relevant="not(selected(/xlsform_spec_test/skip_to_end, 'yes'))"/>
       <bind nodeset="/xlsform_spec_test/everything/some_text" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/number_label" readonly="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/text_image_audio_video_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/display_image_test" readonly="true()" type="string"/>
-      <bind nodeset="/xlsform_spec_test/everything/autocomplete_test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/autocomplete_chars_test" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/everything/autocomplete_test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/autocomplete_chars_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/a_integer" type="int"/>
       <bind constraint=". &lt;= /xlsform_spec_test/everything/a_integer" nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind nodeset="/xlsform_spec_test/everything/num_repeat_times" relevant="false()" type="int"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
       <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="you can't select yes and no" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_23" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/table_list_question" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-2-test" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_23" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/table_list_question" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-2-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/acknowledge_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/date_test" type="date"/>
       <bind nodeset="/xlsform_spec_test/everything/time_test" type="time"/>
diff --git a/pyxform/tests/example_xls/widgets.xml b/pyxform/tests/example_xls/widgets.xml
index 88ccb5200..eddbec7a8 100644
--- a/pyxform/tests/example_xls/widgets.xml
+++ b/pyxform/tests/example_xls/widgets.xml
@@ -116,7 +116,7 @@
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
       <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
-      <bind nodeset="/widgets/my_select1" type="select1"/>
+      <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
       <bind nodeset="/widgets/my_barcode" type="barcode"/>
@@ -126,18 +126,18 @@
       <bind nodeset="/widgets/numberAsString" type="string"/>
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
-      <bind nodeset="/widgets/spinner" type="select1"/>
+      <bind nodeset="/widgets/spinner" type="string"/>
       <bind nodeset="/widgets/spinner_all" type="select"/>
-      <bind nodeset="/widgets/selectadvance" type="select1"/>
-      <bind nodeset="/widgets/grid_test" type="select1"/>
-      <bind nodeset="/widgets/grid_test_audio" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_test_label" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_1" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_2" type="select1"/>
+      <bind nodeset="/widgets/selectadvance" type="string"/>
+      <bind nodeset="/widgets/grid_test" type="string"/>
+      <bind nodeset="/widgets/grid_test_audio" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_test_label" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_1" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_2" type="string"/>
       <bind nodeset="/widgets/table_list_test2/generated_table_list_label_29" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="select1"/>
-      <bind nodeset="/widgets/table_list_test2/table_list_3" type="select1"/>
-      <bind nodeset="/widgets/table_list_test2/table_list_4" type="select1"/>
+      <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
+      <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
+      <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
diff --git a/pyxform/tests/fixtures/strings.ini b/pyxform/tests/fixtures/strings.ini
index 8fc6fe41d..75c32b7ad 100644
--- a/pyxform/tests/fixtures/strings.ini
+++ b/pyxform/tests/fixtures/strings.ini
@@ -6,7 +6,7 @@ test_answers_can_be_imported_from_xml = <?xml version='1.0' ?><data id="build_Wa
 test_question_type_string_control = <input ref="/test/enumerator_name"><label ref="jr:itext('/test/enumerator_name:label')"/></input>
 test_question_type_string_binding = <bind nodeset="/test/enumerator_name" type="string"/>
 test_select_one_question_multilingual_control = <select1 ref="/test/qname"><label ref="jr:itext('/test/qname:label')"/><item><label ref="jr:itext('/test/qname/a:label')"/><value>a</value></item><item><label ref="jr:itext('/test/qname/b:label')"/><value>b</value></item></select1>
-test_select_one_question_multilingual_binding = <bind nodeset="/test/qname" type="select1"/>
+test_select_one_question_multilingual_binding = <bind nodeset="/test/qname" type="string"/>
 test_simple_integer_question_type_multilingual_control = <input ref="/test/integer_q"><label ref="jr:itext('/test/integer_q:label')"/></input>
 test_simple_integer_question_type_multilingual_binding = <bind nodeset="/test/integer_q" type="int"/>
 test_simple_date_question_type_multilingual_control = <input ref="/test/date_q"><label ref="jr:itext('/test/date_q:label')"/></input>
diff --git a/pyxform/tests/test_expected_output/attribute_columns_test.xml b/pyxform/tests/test_expected_output/attribute_columns_test.xml
index 219cf4170..515600a00 100644
--- a/pyxform/tests/test_expected_output/attribute_columns_test.xml
+++ b/pyxform/tests/test_expected_output/attribute_columns_test.xml
@@ -675,7 +675,7 @@
           </meta>
         </attribute_columns_test>
       </instance>
-      <bind nodeset="/attribute_columns_test/skip_to_end" saveIncomplete="true()" type="select1"/>
+      <bind nodeset="/attribute_columns_test/skip_to_end" saveIncomplete="true()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything" relevant="not(selected( /attribute_columns_test/skip_to_end , 'yes'))"/>
       <bind nodeset="/attribute_columns_test/everything/my_name" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/invalid_variable" readonly="true()" type="string"/>
@@ -684,20 +684,20 @@
       <bind nodeset="/attribute_columns_test/everything/number_label" readonly="true()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/text_image_audio_video_test" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/display_image_test" readonly="true()" type="string"/>
-      <bind nodeset="/attribute_columns_test/everything/autocomplete_test" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/autocomplete_chars_test" type="select1"/>
+      <bind nodeset="/attribute_columns_test/everything/autocomplete_test" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/autocomplete_chars_test" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/a_integer" type="int"/>
       <bind constraint=". &lt;=  /attribute_columns_test/everything/a_integer " nodeset="/attribute_columns_test/everything/a_decimal" type="decimal"/>
       <bind calculate="2" nodeset="/attribute_columns_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/repeat_test"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/attribute_columns_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
       <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/label-test" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/name/table_list_question" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/compact-test" type="select1"/>
-      <bind nodeset="/attribute_columns_test/everything/repeat_test/compact-2-test" type="select1"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/name/table_list_question" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/compact-test" type="string"/>
+      <bind nodeset="/attribute_columns_test/everything/repeat_test/compact-2-test" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/acknowledge_test" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/date_test" type="date"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/time_test" type="time"/>
diff --git a/pyxform/tests/test_expected_output/cascades_old.xml b/pyxform/tests/test_expected_output/cascades_old.xml
index 61b101445..0a45bfdad 100644
--- a/pyxform/tests/test_expected_output/cascades_old.xml
+++ b/pyxform/tests/test_expected_output/cascades_old.xml
@@ -2745,60 +2745,60 @@
       <bind jr:preload="property" jr:preloadParams="subscriberid" nodeset="/cascades_old/subscriberid" type="string"/>
       <bind jr:preload="property" jr:preloadParams="deviceid" nodeset="/cascades_old/simserial" type="string"/>
       <bind jr:preload="property" jr:preloadParams="phonenumber" nodeset="/cascades_old/phonenumber" type="string"/>
-      <bind nodeset="/cascades_old/sectionA/q1_surveyor1" type="select1"/>
+      <bind nodeset="/cascades_old/sectionA/q1_surveyor1" type="string"/>
       <bind nodeset="/cascades_old/sectionA/q2_surveyor2" relevant=" /cascades_old/sectionA/q1_surveyor1  = 'othername'" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionA/q3_datetime" required="true()" type="dateTime"/>
       <bind nodeset="/cascades_old/sectionA/q4_gps_location" required="false()" type="geopoint"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site_phase" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site_district" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q6_construction_site_summary1" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site_phase" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site_district" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q6_construction_site_summary1" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionB/q7_construction_site_summary2" relevant=" /cascades_old/sectionB/q6_construction_site_summary1 ='no'" required="true()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC1/q10_wm_trained_aftercare" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC1/q10_wm_trained_aftercare" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q11_households_water_access" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC1/q12_system_functional" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC1/q12_system_functional" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q13_male_hh_latrines" required="true()" type="int"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q14_female_hh_latrines" required="true()" type="int"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q15_child_hh_latrines" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q16_vwhc_meeting" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q17_vwhc_collect_tariffs" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q18_vwhc_reports" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q19_conflicts_community" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q16_vwhc_meeting" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q17_vwhc_collect_tariffs" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q18_vwhc_reports" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q19_conflicts_community" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC2/q20_yes_conflict_description" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q21_yes_problem_resolved" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q22_gender_chair" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q23_gender_treasurer" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q24_gender_secretary" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q21_yes_problem_resolved" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q22_gender_chair" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q23_gender_treasurer" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q24_gender_secretary" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC3/note_hygiene" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q25_faeces_mouth" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q26_prevent_faeces_mouth" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q27_handwashing" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q28_handwashing_facilities" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q29_water_storage" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q30_diseases" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q31_child_faeces_disposal" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q32_latrine_hygiene" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q25_faeces_mouth" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q26_prevent_faeces_mouth" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q27_handwashing" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q28_handwashing_facilities" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q29_water_storage" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q30_diseases" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q31_child_faeces_disposal" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q32_latrine_hygiene" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC4/sectionC4_note" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q33_hh_latrine_usage" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q34_latrine_screen_vent" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q35_latrine_seat_cover" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q36_latrine_door" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q37_latrine_flies" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q38_latrine_odour" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q39_latrine_cleaned" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q40_latrine_handwash" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q41_latrine_soap" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q33_hh_latrine_usage" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q34_latrine_screen_vent" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q35_latrine_seat_cover" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q36_latrine_door" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q37_latrine_flies" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q38_latrine_odour" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q39_latrine_cleaned" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q40_latrine_handwash" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q41_latrine_soap" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC5/sectionC5_note" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q42_wm_layout_system" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q43_wm_components_system" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q44_wm_pipes_fittings" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q45_wm_hygiene" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q46_wm_report_breakdowns" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q42_wm_layout_system" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q43_wm_components_system" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q44_wm_pipes_fittings" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q45_wm_hygiene" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q46_wm_report_breakdowns" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC5/q47_wm_number_breakdowns" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q48_wm_preventive_maintenance" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q49_wm_pump_operation" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q50_wm_minor_repairs" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q51_wm_repair_supplies" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q48_wm_preventive_maintenance" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q49_wm_pump_operation" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q50_wm_minor_repairs" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q51_wm_repair_supplies" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC6/q52_add_comments" required="false()" type="string"/>
       <bind jr:preload="uid" nodeset="/cascades_old/meta/instanceID" readonly="true()" type="string"/>
     </model>
diff --git a/pyxform/tests/test_expected_output/cascading_select_test.xml b/pyxform/tests/test_expected_output/cascading_select_test.xml
index 8bdd59d65..c16d2e3f6 100644
--- a/pyxform/tests/test_expected_output/cascading_select_test.xml
+++ b/pyxform/tests/test_expected_output/cascading_select_test.xml
@@ -101,9 +101,9 @@
           </item>
         </root>
       </instance>
-      <bind nodeset="/cascading_select_test/mylga_zone" type="select1"/>
-      <bind nodeset="/cascading_select_test/mylga_state" type="select1"/>
-      <bind nodeset="/cascading_select_test/mylga" type="select1"/>
+      <bind nodeset="/cascading_select_test/mylga_zone" type="string"/>
+      <bind nodeset="/cascading_select_test/mylga_state" type="string"/>
+      <bind nodeset="/cascading_select_test/mylga" type="string"/>
       <bind jr:preload="uid" nodeset="/cascading_select_test/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/flat_xlsform_test.xml b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
index 48b1b5b9c..444901de4 100644
--- a/pyxform/tests/test_expected_output/flat_xlsform_test.xml
+++ b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
@@ -631,7 +631,7 @@
           </meta>
         </flat_xlsform_test>
       </instance>
-      <bind nodeset="/flat_xlsform_test/skip_to_end" type="select1"/>
+      <bind nodeset="/flat_xlsform_test/skip_to_end" type="string"/>
       <bind nodeset="/flat_xlsform_test/email_note" readonly="true()" relevant="regex( /flat_xlsform_test/address , '[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}')" type="string"/>
       <bind nodeset="/flat_xlsform_test/number_label" readonly="true()" type="string"/>
       <bind nodeset="/flat_xlsform_test/my_name" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
@@ -639,18 +639,18 @@
       <bind nodeset="/flat_xlsform_test/address" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/text_image_audio_video_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/display_image_test" readonly="true()" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
-      <bind nodeset="/flat_xlsform_test/autocomplete_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/autocomplete_chars_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
+      <bind nodeset="/flat_xlsform_test/autocomplete_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
+      <bind nodeset="/flat_xlsform_test/autocomplete_chars_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/a_integer" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="int"/>
       <bind constraint=". &lt;=  /flat_xlsform_test/a_integer " nodeset="/flat_xlsform_test/a_decimal" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="decimal"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/flat_xlsform_test/required_text" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
       <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/flat_xlsform_test/select_multiple_test:jr:constraintMsg')" nodeset="/flat_xlsform_test/select_multiple_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="false()" type="select"/>
-      <bind nodeset="/flat_xlsform_test/label-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/list-nolabel-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/reserved_name_for_field_list_labels_25" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/table_list_question" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/compact-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
-      <bind nodeset="/flat_xlsform_test/compact-2-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="select1"/>
+      <bind nodeset="/flat_xlsform_test/label-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
+      <bind nodeset="/flat_xlsform_test/list-nolabel-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
+      <bind nodeset="/flat_xlsform_test/reserved_name_for_field_list_labels_25" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
+      <bind nodeset="/flat_xlsform_test/table_list_question" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
+      <bind nodeset="/flat_xlsform_test/compact-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
+      <bind nodeset="/flat_xlsform_test/compact-2-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/acknowledge_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/date_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="date"/>
       <bind nodeset="/flat_xlsform_test/time_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="time"/>
diff --git a/pyxform/tests/test_expected_output/new_cascading_select.xml b/pyxform/tests/test_expected_output/new_cascading_select.xml
index 685fd0e88..7bfb2134d 100644
--- a/pyxform/tests/test_expected_output/new_cascading_select.xml
+++ b/pyxform/tests/test_expected_output/new_cascading_select.xml
@@ -101,9 +101,9 @@
           </item>
         </root>
       </instance>
-      <bind nodeset="/new_cascading_select/state" type="select1"/>
-      <bind nodeset="/new_cascading_select/county" type="select1"/>
-      <bind nodeset="/new_cascading_select/city" type="select1"/>
+      <bind nodeset="/new_cascading_select/state" type="string"/>
+      <bind nodeset="/new_cascading_select/county" type="string"/>
+      <bind nodeset="/new_cascading_select/city" type="string"/>
       <bind jr:preload="uid" nodeset="/new_cascading_select/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/old_cascades.xml b/pyxform/tests/test_expected_output/old_cascades.xml
index f6af6e939..62e8590d6 100644
--- a/pyxform/tests/test_expected_output/old_cascades.xml
+++ b/pyxform/tests/test_expected_output/old_cascades.xml
@@ -101,9 +101,9 @@
           </item>
         </root>
       </instance>
-      <bind nodeset="/old_cascades/state_states" type="select1"/>
-      <bind nodeset="/old_cascades/state_counties" type="select1"/>
-      <bind nodeset="/old_cascades/state" type="select1"/>
+      <bind nodeset="/old_cascades/state_states" type="string"/>
+      <bind nodeset="/old_cascades/state_counties" type="string"/>
+      <bind nodeset="/old_cascades/state" type="string"/>
       <bind jr:preload="uid" nodeset="/old_cascades/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/or_other.xml b/pyxform/tests/test_expected_output/or_other.xml
index 0a96c2ac3..d3da1c81e 100644
--- a/pyxform/tests/test_expected_output/or_other.xml
+++ b/pyxform/tests/test_expected_output/or_other.xml
@@ -42,9 +42,9 @@
           </item>
         </root>
       </instance>
-      <bind nodeset="/or_other/fav_color" type="select1"/>
+      <bind nodeset="/or_other/fav_color" type="string"/>
       <bind nodeset="/or_other/fav_color_other" relevant="selected(../fav_color, 'other')" type="string"/>
-      <bind nodeset="/or_other/fav_pastel" type="select1"/>
+      <bind nodeset="/or_other/fav_pastel" type="string"/>
       <bind jr:preload="uid" nodeset="/or_other/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/repeat_date_test.xml b/pyxform/tests/test_expected_output/repeat_date_test.xml
index 578342c48..39c182879 100644
--- a/pyxform/tests/test_expected_output/repeat_date_test.xml
+++ b/pyxform/tests/test_expected_output/repeat_date_test.xml
@@ -25,8 +25,8 @@
       <bind nodeset="/repeat_date_test/generated_note_name_2" readonly="true()" type="string"/>
       <bind calculate="1" nodeset="/repeat_date_test/repeat_count" type="string"/>
       <bind calculate=" /repeat_date_test/repeat_count " nodeset="/repeat_date_test/repeat_test_count" readonly="true()" type="string"/>
-      <bind nodeset="/repeat_date_test/repeat_test/table_list_3" type="select1"/>
-      <bind nodeset="/repeat_date_test/repeat_test/table_list_4" type="select1"/>
+      <bind nodeset="/repeat_date_test/repeat_test/table_list_3" type="string"/>
+      <bind nodeset="/repeat_date_test/repeat_test/table_list_4" type="string"/>
       <bind nodeset="/repeat_date_test/generated_note_name_8" readonly="true()" type="string"/>
       <bind jr:preload="uid" nodeset="/repeat_date_test/meta/instanceID" readonly="true()" type="string"/>
     </model>
diff --git a/pyxform/tests/test_expected_output/search_and_select.xml b/pyxform/tests/test_expected_output/search_and_select.xml
index 2cd1dd656..b0af4c589 100644
--- a/pyxform/tests/test_expected_output/search_and_select.xml
+++ b/pyxform/tests/test_expected_output/search_and_select.xml
@@ -12,7 +12,7 @@
           </meta>
         </search_and_select>
       </instance>
-      <bind nodeset="/search_and_select/fruit" type="select1"/>
+      <bind nodeset="/search_and_select/fruit" type="string"/>
       <bind nodeset="/search_and_select/note_fruit" readonly="true()" type="string"/>
       <bind jr:preload="uid" nodeset="/search_and_select/meta/instanceID" readonly="true()" type="string"/>
     </model>
diff --git a/pyxform/tests/test_expected_output/select_one_external.xml b/pyxform/tests/test_expected_output/select_one_external.xml
index 134e4cec7..a0ef4c84c 100644
--- a/pyxform/tests/test_expected_output/select_one_external.xml
+++ b/pyxform/tests/test_expected_output/select_one_external.xml
@@ -13,7 +13,7 @@
           </meta>
         </select_one_external>
       </instance>
-      <bind nodeset="/select_one_external/state" type="select1"/>
+      <bind nodeset="/select_one_external/state" type="string"/>
       <bind nodeset="/select_one_external/county" type="string"/>
       <bind nodeset="/select_one_external/city" type="string"/>
       <bind jr:preload="uid" nodeset="/select_one_external/meta/instanceID" readonly="true()" type="string"/>
diff --git a/pyxform/tests/test_expected_output/table-list.xml b/pyxform/tests/test_expected_output/table-list.xml
index 88b45c80e..25ac6a45a 100644
--- a/pyxform/tests/test_expected_output/table-list.xml
+++ b/pyxform/tests/test_expected_output/table-list.xml
@@ -47,9 +47,9 @@
       </instance>
       <bind nodeset="/table-list/intro" readonly="true()" type="string"/>
       <bind nodeset="/table-list/table_list_test2/generated_table_list_label_3" readonly="true()" type="string"/>
-      <bind nodeset="/table-list/table_list_test2/reserved_name_for_field_list_labels_4" type="select1"/>
-      <bind nodeset="/table-list/table_list_test2/table_list_3" type="select1"/>
-      <bind nodeset="/table-list/table_list_test2/table_list_4" type="select1"/>
+      <bind nodeset="/table-list/table_list_test2/reserved_name_for_field_list_labels_4" type="string"/>
+      <bind nodeset="/table-list/table_list_test2/table_list_3" type="string"/>
+      <bind nodeset="/table-list/table_list_test2/table_list_4" type="string"/>
       <bind nodeset="/table-list/happy_sad_table/generated_table_list_label_7" readonly="true()" type="string"/>
       <bind nodeset="/table-list/happy_sad_table/reserved_name_for_field_list_labels_8" type="select"/>
       <bind nodeset="/table-list/happy_sad_table/happy_sad_brian" type="select"/>
diff --git a/pyxform/tests/test_expected_output/widgets.xml b/pyxform/tests/test_expected_output/widgets.xml
index bec649657..2fea79781 100644
--- a/pyxform/tests/test_expected_output/widgets.xml
+++ b/pyxform/tests/test_expected_output/widgets.xml
@@ -116,7 +116,7 @@
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
       <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
-      <bind nodeset="/widgets/my_select1" type="select1"/>
+      <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
       <bind nodeset="/widgets/my_barcode" type="barcode"/>
@@ -126,18 +126,18 @@
       <bind nodeset="/widgets/numberAsString" type="string"/>
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
-      <bind nodeset="/widgets/spinner" type="select1"/>
+      <bind nodeset="/widgets/spinner" type="string"/>
       <bind nodeset="/widgets/spinner_all" type="select"/>
-      <bind nodeset="/widgets/selectadvance" type="select1"/>
-      <bind nodeset="/widgets/grid_test" type="select1"/>
-      <bind nodeset="/widgets/grid_test_audio" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_test_label" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_1" type="select1"/>
-      <bind nodeset="/widgets/table_list_test/table_list_2" type="select1"/>
+      <bind nodeset="/widgets/selectadvance" type="string"/>
+      <bind nodeset="/widgets/grid_test" type="string"/>
+      <bind nodeset="/widgets/grid_test_audio" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_test_label" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_1" type="string"/>
+      <bind nodeset="/widgets/table_list_test/table_list_2" type="string"/>
       <bind nodeset="/widgets/table_list_test2/generated_table_list_label_29" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="select1"/>
-      <bind nodeset="/widgets/table_list_test2/table_list_3" type="select1"/>
-      <bind nodeset="/widgets/table_list_test2/table_list_4" type="select1"/>
+      <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
+      <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
+      <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
       <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
diff --git a/pyxform/tests/test_expected_output/xlsform_spec_test.xml b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
index e63a32a9d..27d9a589b 100644
--- a/pyxform/tests/test_expected_output/xlsform_spec_test.xml
+++ b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
@@ -667,7 +667,7 @@
           </meta>
         </xlsform_spec_test>
       </instance>
-      <bind nodeset="/xlsform_spec_test/skip_to_end" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/skip_to_end" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything" relevant="not(selected( /xlsform_spec_test/skip_to_end , 'yes'))"/>
       <bind nodeset="/xlsform_spec_test/everything/my_name" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/invalid_variable" readonly="true()" type="string"/>
@@ -676,19 +676,19 @@
       <bind nodeset="/xlsform_spec_test/everything/number_label" readonly="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/text_image_audio_video_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/display_image_test" readonly="true()" type="string"/>
-      <bind nodeset="/xlsform_spec_test/everything/autocomplete_test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/autocomplete_chars_test" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/everything/autocomplete_test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/autocomplete_chars_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/a_integer" type="int"/>
       <bind constraint=". &lt;=  /xlsform_spec_test/everything/a_integer " nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind calculate="2" nodeset="/xlsform_spec_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
       <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/table_list_question" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-test" type="select1"/>
-      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-2-test" type="select1"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/table_list_question" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-test" type="string"/>
+      <bind nodeset="/xlsform_spec_test/everything/repeat_test/compact-2-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/acknowledge_test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/date_test" type="date"/>
       <bind nodeset="/xlsform_spec_test/everything/time_test" type="time"/>
diff --git a/pyxform/tests/test_expected_output/xml_escaping.xml b/pyxform/tests/test_expected_output/xml_escaping.xml
index 036c436f6..58a23c760 100644
--- a/pyxform/tests/test_expected_output/xml_escaping.xml
+++ b/pyxform/tests/test_expected_output/xml_escaping.xml
@@ -15,7 +15,7 @@
       </instance>
       <bind calculate="2" nodeset="/xml_escaping/a" type="string"/>
       <bind calculate="1" nodeset="/xml_escaping/b" type="string"/>
-      <bind nodeset="/xml_escaping/table_list_3" type="select1"/>
+      <bind nodeset="/xml_escaping/table_list_3" type="string"/>
       <bind jr:preload="uid" nodeset="/xml_escaping/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_output/cascades_old.xml b/pyxform/tests/test_output/cascades_old.xml
index f31f3d63f..4aeaf4bab 100644
--- a/pyxform/tests/test_output/cascades_old.xml
+++ b/pyxform/tests/test_output/cascades_old.xml
@@ -1871,60 +1871,60 @@
       <bind jr:preload="property" jr:preloadParams="subscriberid" nodeset="/cascades_old/subscriberid" type="string"/>
       <bind jr:preload="property" jr:preloadParams="deviceid" nodeset="/cascades_old/simserial" type="string"/>
       <bind jr:preload="property" jr:preloadParams="phonenumber" nodeset="/cascades_old/phonenumber" type="string"/>
-      <bind nodeset="/cascades_old/sectionA/q1_surveyor1" type="select1"/>
+      <bind nodeset="/cascades_old/sectionA/q1_surveyor1" type="string"/>
       <bind nodeset="/cascades_old/sectionA/q2_surveyor2" relevant=" /cascades_old/sectionA/q1_surveyor1  = 'othername'" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionA/q3_datetime" required="true()" type="dateTime"/>
       <bind nodeset="/cascades_old/sectionA/q4_gps_location" required="false()" type="geopoint"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site_phase" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site_district" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q5_construction_site" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionB/q6_construction_site_summary1" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site_phase" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site_district" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q5_construction_site" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionB/q6_construction_site_summary1" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionB/q7_construction_site_summary2" relevant=" /cascades_old/sectionB/q6_construction_site_summary1 ='no'" required="true()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC1/q10_wm_trained_aftercare" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC1/q10_wm_trained_aftercare" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q11_households_water_access" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC1/q12_system_functional" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC1/q12_system_functional" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q13_male_hh_latrines" required="true()" type="int"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q14_female_hh_latrines" required="true()" type="int"/>
       <bind nodeset="/cascades_old/sectionC/sectionC1/q15_child_hh_latrines" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q16_vwhc_meeting" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q17_vwhc_collect_tariffs" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q18_vwhc_reports" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q19_conflicts_community" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q16_vwhc_meeting" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q17_vwhc_collect_tariffs" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q18_vwhc_reports" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q19_conflicts_community" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC2/q20_yes_conflict_description" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q21_yes_problem_resolved" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q22_gender_chair" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q23_gender_treasurer" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC2/q24_gender_secretary" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q21_yes_problem_resolved" relevant=" /cascades_old/sectionC/sectionC2/q19_conflicts_community ='yes'" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q22_gender_chair" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q23_gender_treasurer" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC2/q24_gender_secretary" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC3/note_hygiene" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q25_faeces_mouth" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q26_prevent_faeces_mouth" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q27_handwashing" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q28_handwashing_facilities" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q29_water_storage" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q30_diseases" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q31_child_faeces_disposal" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q32_latrine_hygiene" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q25_faeces_mouth" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q26_prevent_faeces_mouth" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q27_handwashing" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q28_handwashing_facilities" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q29_water_storage" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q30_diseases" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q31_child_faeces_disposal" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC3/villager/q32_latrine_hygiene" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC4/sectionC4_note" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q33_hh_latrine_usage" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q34_latrine_screen_vent" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q35_latrine_seat_cover" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q36_latrine_door" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q37_latrine_flies" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q38_latrine_odour" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q39_latrine_cleaned" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q40_latrine_handwash" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q41_latrine_soap" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q33_hh_latrine_usage" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q34_latrine_screen_vent" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q35_latrine_seat_cover" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q36_latrine_door" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q37_latrine_flies" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q38_latrine_odour" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q39_latrine_cleaned" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q40_latrine_handwash" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC4/household/q41_latrine_soap" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC5/sectionC5_note" readonly="true()" required="false()" type="string"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q42_wm_layout_system" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q43_wm_components_system" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q44_wm_pipes_fittings" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q45_wm_hygiene" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q46_wm_report_breakdowns" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q42_wm_layout_system" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q43_wm_components_system" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q44_wm_pipes_fittings" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q45_wm_hygiene" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q46_wm_report_breakdowns" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC5/q47_wm_number_breakdowns" required="true()" type="int"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q48_wm_preventive_maintenance" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q49_wm_pump_operation" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q50_wm_minor_repairs" required="true()" type="select1"/>
-      <bind nodeset="/cascades_old/sectionC/sectionC5/q51_wm_repair_supplies" required="true()" type="select1"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q48_wm_preventive_maintenance" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q49_wm_pump_operation" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q50_wm_minor_repairs" required="true()" type="string"/>
+      <bind nodeset="/cascades_old/sectionC/sectionC5/q51_wm_repair_supplies" required="true()" type="string"/>
       <bind nodeset="/cascades_old/sectionC/sectionC6/q52_add_comments" required="false()" type="string"/>
       <bind jr:preload="uid" nodeset="/cascades_old/meta/instanceID" readonly="true()" type="string"/>
     </model>
diff --git a/pyxform/tests/xml_tests.py b/pyxform/tests/xml_tests.py
index a4323bcbe..41596e1f2 100644
--- a/pyxform/tests/xml_tests.py
+++ b/pyxform/tests/xml_tests.py
@@ -50,7 +50,7 @@ def test_to_xml(self):
           </meta>
         </yes_or_no_question>
       </instance>
-      <bind nodeset="/yes_or_no_question/good_day" type="select1"/>
+      <bind nodeset="/yes_or_no_question/good_day" type="string"/>
       <bind jr:preload="uid"
         nodeset="/yes_or_no_question/meta/instanceID"
         readonly="true()" type="string"/>
diff --git a/pyxform/tests_v1/test_sheet_columns.py b/pyxform/tests_v1/test_sheet_columns.py
index 6f506cdf6..f3c67a830 100644
--- a/pyxform/tests_v1/test_sheet_columns.py
+++ b/pyxform/tests_v1/test_sheet_columns.py
@@ -175,7 +175,7 @@ def test_value_and_name(self):
                 """
                 % ({"name_alias": name_alias}),
                 instance__contains=["<q1/>"],
-                model__contains=['<bind nodeset="/aliases/q1" type="select1"/>'],
+                model__contains=['<bind nodeset="/aliases/q1" type="string"/>'],
                 xml__contains=[
                     '<select1 ref="/aliases/q1">',
                     "<value>yes</value>",

From 5c26ba3ed82a59c6b9bdbcbec534d6077a3767a0 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Fri, 20 Dec 2019 10:19:01 -0800
Subject: [PATCH 2/3] select is not a valid bind type

---
 pyxform/question.py                              |  2 +-
 pyxform/question_type_dictionary.py              | 12 ++++++------
 .../example_xls/spec_test_expected_output.xml    |  2 +-
 pyxform/tests/example_xls/widgets.xml            | 16 ++++++++--------
 pyxform/tests/fixtures/strings.ini               |  2 +-
 .../attribute_columns_test.xml                   |  2 +-
 .../test_expected_output/flat_xlsform_test.xml   |  2 +-
 .../tests/test_expected_output/table-list.xml    |  6 +++---
 pyxform/tests/test_expected_output/widgets.xml   | 16 ++++++++--------
 .../test_expected_output/xlsform_spec_test.xml   |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pyxform/question.py b/pyxform/question.py
index c25eff794..7a852f0c5 100644
--- a/pyxform/question.py
+++ b/pyxform/question.py
@@ -134,7 +134,7 @@ def validate(self):
             choice.validate()
 
     def xml_control(self):
-        assert self.bind["type"] in ["select", "string", "odk:rank"]
+        assert self.bind["type"] in ["string", "odk:rank"]
         survey = self.get_root()
         control_dict = self.control.copy()
         # Resolve field references in attributes
diff --git a/pyxform/question_type_dictionary.py b/pyxform/question_type_dictionary.py
index 90549ef99..1611999f9 100644
--- a/pyxform/question_type_dictionary.py
+++ b/pyxform/question_type_dictionary.py
@@ -47,7 +47,7 @@ def generate_new_dict():
     },
     "add select multiple prompt using": {
         "control": {"tag": "select"},
-        "bind": {"type": "select"},
+        "bind": {"type": "string"},
     },
     "add note prompt": {
         "control": {"tag": "input"},
@@ -59,7 +59,7 @@ def generate_new_dict():
     "text": {"control": {"tag": "input"}, "bind": {"type": "string"}},
     "select all that apply from": {
         "control": {"tag": "select"},
-        "bind": {"type": "select"},
+        "bind": {"type": "string"},
     },
     "simserial": {
         "bind": {
@@ -134,7 +134,7 @@ def generate_new_dict():
         "control": {"tag": "upload", "mediatype": "image/*"},
         "bind": {"type": "binary"},
     },
-    "select all that apply": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select all that apply": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "get end time": {
         "bind": {
             "jr:preload": "timestamp",
@@ -150,7 +150,7 @@ def generate_new_dict():
     "geopoint": {"control": {"tag": "input"}, "bind": {"type": "geopoint"}},
     "geoshape": {"control": {"tag": "input"}, "bind": {"type": "geoshape"}},
     "geotrace": {"control": {"tag": "input"}, "bind": {"type": "geotrace"}},
-    "select multiple from": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select multiple from": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "end time": {
         "bind": {
             "jr:preload": "timestamp",
@@ -173,7 +173,7 @@ def generate_new_dict():
         }
     },
     "q barcode": {"control": {"tag": "input"}, "bind": {"type": "barcode"}},
-    "q select": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "q select": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "select one using": {"control": {"tag": "select1"}, "bind": {"type": "string"}},
     "rank": {"control": {"tag": "odk:rank"}, "bind": {"type": "odk:rank"}},
     "image": {
@@ -234,7 +234,7 @@ def generate_new_dict():
     },
     "int": {"control": {"tag": "input"}, "bind": {"type": "int"}},
     "add barcode prompt": {"control": {"tag": "input"}, "bind": {"type": "barcode"}},
-    "select multiple using": {"control": {"tag": "select"}, "bind": {"type": "select"}},
+    "select multiple using": {"control": {"tag": "select"}, "bind": {"type": "string"}},
     "q decimal": {"control": {"tag": "input"}, "bind": {"type": "decimal"}},
     "end": {
         "bind": {
diff --git a/pyxform/tests/example_xls/spec_test_expected_output.xml b/pyxform/tests/example_xls/spec_test_expected_output.xml
index 33dddd9ea..c8dfe612a 100644
--- a/pyxform/tests/example_xls/spec_test_expected_output.xml
+++ b/pyxform/tests/example_xls/spec_test_expected_output.xml
@@ -636,7 +636,7 @@
       <bind constraint=". &lt;= /xlsform_spec_test/everything/a_integer" nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind nodeset="/xlsform_spec_test/everything/num_repeat_times" relevant="false()" type="int"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="you can't select yes and no" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="you can't select yes and no" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_23" type="string"/>
diff --git a/pyxform/tests/example_xls/widgets.xml b/pyxform/tests/example_xls/widgets.xml
index eddbec7a8..ed039194f 100644
--- a/pyxform/tests/example_xls/widgets.xml
+++ b/pyxform/tests/example_xls/widgets.xml
@@ -115,7 +115,7 @@
       <bind constraint=". &gt; 10.51 and . &lt; 18.39" jr:constraintMsg="number must be between 10.51 and 18.39" nodeset="/widgets/my_decimal" type="decimal"/>
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
-      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
+      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="string"/>
       <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
@@ -127,7 +127,7 @@
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
       <bind nodeset="/widgets/spinner" type="string"/>
-      <bind nodeset="/widgets/spinner_all" type="select"/>
+      <bind nodeset="/widgets/spinner_all" type="string"/>
       <bind nodeset="/widgets/selectadvance" type="string"/>
       <bind nodeset="/widgets/grid_test" type="string"/>
       <bind nodeset="/widgets/grid_test_audio" type="string"/>
@@ -138,13 +138,13 @@
       <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="string"/>
       <bind nodeset="/widgets/happy_sad_table/generated_table_list_label_38" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/widgets/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/fixtures/strings.ini b/pyxform/tests/fixtures/strings.ini
index 75c32b7ad..a46e9cded 100644
--- a/pyxform/tests/fixtures/strings.ini
+++ b/pyxform/tests/fixtures/strings.ini
@@ -14,7 +14,7 @@ test_simple_date_question_type_multilingual_binding = <bind nodeset="/test/date_
 test_simple_phone_number_question_type_multilingual_control = <input ref="/test/phone_number_q"><label ref="jr:itext('/test/phone_number_q:label')"/><hint>Enter numbers only.</hint></input>
 test_simple_phone_number_question_type_multilingual_binding = <bind constraint="regex(., '^\d*$')" nodeset="/test/phone_number_q" type="string"/>
 test_simple_select_all_question_multilingual_control = <select ref="/test/select_all_q"><label ref="jr:itext('/test/select_all_q:label')"/><item><label ref="jr:itext('/test/select_all_q/f:label')"/><value>f</value></item><item><label ref="jr:itext('/test/select_all_q/g:label')"/><value>g</value></item><item><label ref="jr:itext('/test/select_all_q/h:label')"/><value>h</value></item></select>
-test_simple_select_all_question_multilingual_binding = <bind nodeset="/test/select_all_q" type="select"/>
+test_simple_select_all_question_multilingual_binding = <bind nodeset="/test/select_all_q" type="string"/>
 test_simple_decimal_question_multilingual_control = <input ref="/test/decimal_q"><label ref="jr:itext('/test/decimal_q:label')"/></input>
 test_simple_decimal_question_multilingual_binding = <bind nodeset="/test/decimal_q" type="decimal"/>
 
diff --git a/pyxform/tests/test_expected_output/attribute_columns_test.xml b/pyxform/tests/test_expected_output/attribute_columns_test.xml
index 515600a00..87cd6d7ec 100644
--- a/pyxform/tests/test_expected_output/attribute_columns_test.xml
+++ b/pyxform/tests/test_expected_output/attribute_columns_test.xml
@@ -691,7 +691,7 @@
       <bind calculate="2" nodeset="/attribute_columns_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind bindAttribute="test" nodeset="/attribute_columns_test/everything/repeat_test"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/attribute_columns_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/attribute_columns_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/attribute_columns_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>
diff --git a/pyxform/tests/test_expected_output/flat_xlsform_test.xml b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
index 444901de4..0d3dd5ec3 100644
--- a/pyxform/tests/test_expected_output/flat_xlsform_test.xml
+++ b/pyxform/tests/test_expected_output/flat_xlsform_test.xml
@@ -644,7 +644,7 @@
       <bind nodeset="/flat_xlsform_test/a_integer" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="int"/>
       <bind constraint=". &lt;=  /flat_xlsform_test/a_integer " nodeset="/flat_xlsform_test/a_decimal" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="decimal"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/flat_xlsform_test/required_text" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/flat_xlsform_test/select_multiple_test:jr:constraintMsg')" nodeset="/flat_xlsform_test/select_multiple_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/flat_xlsform_test/select_multiple_test:jr:constraintMsg')" nodeset="/flat_xlsform_test/select_multiple_test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="false()" type="string"/>
       <bind nodeset="/flat_xlsform_test/label-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
       <bind nodeset="/flat_xlsform_test/list-nolabel-test" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" required="true()" type="string"/>
       <bind nodeset="/flat_xlsform_test/reserved_name_for_field_list_labels_25" relevant="not(selected( /flat_xlsform_test/skip_to_end , 'yes'))" type="string"/>
diff --git a/pyxform/tests/test_expected_output/table-list.xml b/pyxform/tests/test_expected_output/table-list.xml
index 25ac6a45a..a2232c02b 100644
--- a/pyxform/tests/test_expected_output/table-list.xml
+++ b/pyxform/tests/test_expected_output/table-list.xml
@@ -51,9 +51,9 @@
       <bind nodeset="/table-list/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/table-list/table_list_test2/table_list_4" type="string"/>
       <bind nodeset="/table-list/happy_sad_table/generated_table_list_label_7" readonly="true()" type="string"/>
-      <bind nodeset="/table-list/happy_sad_table/reserved_name_for_field_list_labels_8" type="select"/>
-      <bind nodeset="/table-list/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/table-list/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/table-list/happy_sad_table/reserved_name_for_field_list_labels_8" type="string"/>
+      <bind nodeset="/table-list/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/table-list/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/table-list/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/widgets.xml b/pyxform/tests/test_expected_output/widgets.xml
index 2fea79781..833263931 100644
--- a/pyxform/tests/test_expected_output/widgets.xml
+++ b/pyxform/tests/test_expected_output/widgets.xml
@@ -115,7 +115,7 @@
       <bind constraint=". &gt; 10.51 and . &lt; 18.39" jr:constraintMsg="number must be between 10.51 and 18.39" nodeset="/widgets/my_decimal" type="decimal"/>
       <bind constraint=". &gt;= today()" jr:constraintMsg="only future dates allowed" nodeset="/widgets/my_date" type="date"/>
       <bind nodeset="/widgets/my_time" type="time"/>
-      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="select"/>
+      <bind constraint="not(selected(., 'c') and selected(., 'd'))" jr:constraintMsg="option c and d cannot be selected together" nodeset="/widgets/my_select" type="string"/>
       <bind nodeset="/widgets/my_select1" type="string"/>
       <bind nodeset="/widgets/my_output" readonly="true()" type="string"/>
       <bind nodeset="/widgets/my_geopoint" type="geopoint"/>
@@ -127,7 +127,7 @@
       <bind nodeset="/widgets/locationMap" type="geopoint"/>
       <bind nodeset="/widgets/dateTime" type="dateTime"/>
       <bind nodeset="/widgets/spinner" type="string"/>
-      <bind nodeset="/widgets/spinner_all" type="select"/>
+      <bind nodeset="/widgets/spinner_all" type="string"/>
       <bind nodeset="/widgets/selectadvance" type="string"/>
       <bind nodeset="/widgets/grid_test" type="string"/>
       <bind nodeset="/widgets/grid_test_audio" type="string"/>
@@ -138,13 +138,13 @@
       <bind nodeset="/widgets/table_list_test2/reserved_name_for_field_list_labels_30" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_3" type="string"/>
       <bind nodeset="/widgets/table_list_test2/table_list_4" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_second_method" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_brian2" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table_2/happy_sad_michael2" type="string"/>
       <bind nodeset="/widgets/happy_sad_table/generated_table_list_label_38" readonly="true()" type="string"/>
-      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="select"/>
-      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="select"/>
+      <bind nodeset="/widgets/happy_sad_table/reserved_name_for_field_list_labels_39" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_brian" type="string"/>
+      <bind nodeset="/widgets/happy_sad_table/happy_sad_michael" type="string"/>
       <bind jr:preload="uid" nodeset="/widgets/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
diff --git a/pyxform/tests/test_expected_output/xlsform_spec_test.xml b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
index 27d9a589b..6ff582cf9 100644
--- a/pyxform/tests/test_expected_output/xlsform_spec_test.xml
+++ b/pyxform/tests/test_expected_output/xlsform_spec_test.xml
@@ -682,7 +682,7 @@
       <bind constraint=". &lt;=  /xlsform_spec_test/everything/a_integer " nodeset="/xlsform_spec_test/everything/a_decimal" type="decimal"/>
       <bind calculate="2" nodeset="/xlsform_spec_test/everything/repeat_test_count" readonly="true()" type="string"/>
       <bind jr:requiredMsg="Custom required message." nodeset="/xlsform_spec_test/everything/repeat_test/group_test/required_text" required="true()" type="string"/>
-      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="select"/>
+      <bind constraint="not(selected(., 'yes') and selected (., 'no'))" jr:constraintMsg="jr:itext('/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test:jr:constraintMsg')" nodeset="/xlsform_spec_test/everything/repeat_test/group_test/select_multiple_test" required="false()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/label-test" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/labeled_select_group/list-nolabel-test" required="true()" type="string"/>
       <bind nodeset="/xlsform_spec_test/everything/repeat_test/name/reserved_name_for_field_list_labels_25" type="string"/>

From 2193bbfe1ff333e16cb4cf3f2009f0a8abf334b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= <lognaturel@gmail.com>
Date: Mon, 27 Jan 2020 13:32:07 -0800
Subject: [PATCH 3/3] Use body type for selects when converting XForm to JSON

---
 pyxform/tests/xls2json_tests.py | 1 -
 pyxform/xform2json.py           | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pyxform/tests/xls2json_tests.py b/pyxform/tests/xls2json_tests.py
index 1bc0710c7..8ae2a256f 100644
--- a/pyxform/tests/xls2json_tests.py
+++ b/pyxform/tests/xls2json_tests.py
@@ -250,7 +250,6 @@ class DefaultToSurveyTest(TestCase):
     def test_default_sheet_name_to_survey(self):
         xls_path = utils.path_to_text_fixture("survey_no_name.xlsx")
         dict_value = xls_to_dict(xls_path)
-        print(json.dumps(dict_value))
         self.assertTrue("survey" in json.dumps(dict_value))
         self.assertTrue("state" in json.dumps(dict_value))
         self.assertTrue("The State" in json.dumps(dict_value))
diff --git a/pyxform/xform2json.py b/pyxform/xform2json.py
index 6b20d5996..1ea0c2975 100644
--- a/pyxform/xform2json.py
+++ b/pyxform/xform2json.py
@@ -408,10 +408,12 @@ def _get_question_from_object(self, obj, type=None):
         if "autoplay" in obj:
             question["control"].update({"autoplay": obj["autoplay"]})
         question_params = self._get_question_params_from_bindings(ref)
+
         if isinstance(question_params, dict):
             for k, v in iter(question_params.items()):
                 question[k] = v
-        # has to come after the above block
+
+        # Some values set from bindings are incorrect or incomplete. Correct them now.
         if "mediatype" in obj:
             question["type"] = obj["mediatype"].replace("/*", "")
         if "item" in obj:
@@ -450,6 +452,11 @@ def _get_question_from_object(self, obj, type=None):
             question["type"] = question_type
         if type == "trigger":
             question["type"] = "acknowledge"
+        if type in [
+            "select1",
+            "select",
+        ]:  # Select bind type is 'string' https://github.com/XLSForm/pyxform/issues/168
+            question["type"] = self.QUESTION_TYPES[type]
         if question_type == "geopoint" and "hint" in question:
             del question["hint"]
         if "type" not in question and type: