bobslee · euroblaze · Jan 24, 2020
diff --git a/orbeon_xml_api/__init__.py b/orbeon_xml_api/__init__.py
@@ -1,6 +1,2 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 # from . import tests
 from . import builder
diff --git a/orbeon_xml_api/builder.py b/orbeon_xml_api/builder.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
+
+
 
 from lxml import etree
 
@@ -10,7 +10,7 @@
     BooleanControl, AnyUriControl, EmailControl, DecimalControl, \
     Select1Control, OpenSelect1Control, SelectControl, ImageAnnotationControl
 from utils import generate_xml_root, unaccent_unicode
-
+#.ITERITEMS ARE MADE TO ITEMS()
 # `xforms:` types are here for backwards compatibility.
 XF_TYPE_CONTROL = {
     'xf:string': StringControl,

diff --git a/orbeon_xml_api/controls.py b/orbeon_xml_api/controls.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
+
+
 
 from datetime import datetime, time
 from lxml import etree

diff --git a/orbeon_xml_api/runner.py b/orbeon_xml_api/runner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
+
+
 
 import re
 from lxml import etree
@@ -128,28 +128,80 @@ def set_value(self, name, value):
 
     def merge(self, builder_obj, **kwargs):
         # TODO Move and rebuild into RunnerCopyBuilderMerge (class)
+        parser = etree.XMLParser(ns_clean=True, encoding='utf-8')
+        root = etree.XML('<?xml version="1.0" encoding="UTF-8"?><form></form>', parser)
+
         no_copy_prefix = kwargs.get('no_copy_prefix', None)
+
         parents = {}
-        merged_form = builder_obj.get_form_instance_raw()
-        merged_form = etree.fromstring(merged_form)
-
-        for element in merged_form.iter():
-            tag = element.tag
-            if tag not in ['annotation', 'image']:
-                if isinstance(tag, basestring):
-                    if no_copy_prefix and tag.startswith(no_copy_prefix):
-                        pass
-                    else:
-                        ov = self.xml_root.xpath('//%s' % tag)
-                        if len(ov) > 0 and ov[0].text:
-                            if len(ov[0].text.strip()) > 0:
-                                element.text = ov[0].text
 
-        merge_form_xml = etree.tostring(merged_form)
+        for tag, element in builder_obj.controls.iteritems():
+            if tag in self.builder.controls.keys():
+                # k_: Known elements (present in original runner/builder)
+                k_control = self.builder.controls.get(tag, False)
+
+                if not k_control:
+                    continue
+
+                k_parent_control = k_control._parent
+                k_form_element = self.get_form_element(tag)
+
+                # Sections (escpecially)
+                if k_parent_control is None and tag not in parents:
+                    parents[tag] = etree.Element(tag)
+                    root.append(parents[tag])
+
+                # Controls
+                if k_form_element is not None:
+                    if k_parent_control is not None and hasattr(k_parent_control, '_bind') and k_parent_control._bind.name not in parents:
+                        k_el_parent = etree.Element(k_parent_control._bind.name)
+                        parents[k_parent_control._bind.name] = k_el_parent
+                        root.append(k_el_parent)
+
+                    if no_copy_prefix is not None and re.search(r"^%s" % no_copy_prefix, tag) is not None:
+                        # Instead of the Runner control, add the Builder model_instance
+                        parents[k_parent_control._bind.name].append(k_control._model_instance)
+                    else:
+                        parents[k_parent_control._bind.name].append(k_form_element)
+                        # root.append(k_form_element)
+            else:
+                # n_: New elements
+                n_new_control = builder_obj.controls.get(tag, False)
+
+                if not n_new_control:
+                    continue
+
+                n_parent_control = n_new_control._parent
+
+                # Sections (escpecially) don't have a parent, hence it's <form> root.
+                if n_parent_control is None and tag not in parents:
+                    parents[tag] = etree.Element(tag)
+                    root.append(parents[tag])
+                elif n_parent_control is not None and hasattr(n_parent_control, '_bind') and n_parent_control._bind.name not in parents:
+                    if n_parent_control._bind.name in builder_obj._form:
+                        n_parent_form_element = builder_obj._form[n_parent_control._bind.name]
+                        n_el_parent = etree.Element(n_parent_form_element.tag)
+                        parents[n_parent_control._bind.name] = n_el_parent
+                        root.append(n_el_parent)
+
+                # Initialize parent
+                if hasattr(n_parent_control, '_bind') and n_parent_control._bind.name not in parents:
+                    parents[n_parent_control._bind.name] = None
+
+                # Controls
+                if hasattr(n_parent_control, '_bind') and n_parent_control._bind.name in parents and n_new_control and n_new_control._model_instance is not None:
+                    parents[n_parent_control._bind.name].append(n_new_control._model_instance)
+                elif n_new_control and hasattr(n_new_control._parent, '_bind'):
+                    parents[n_new_control._parent._bind.name] = n_new_control._model_instance
+
+        # Unicode support
+        merge_form_xml = etree.tostring(root)
         merge_form_xml = bytes(bytearray(merge_form_xml, encoding='utf-8'))
         merged_runner = Runner(merge_form_xml, builder_obj)
+
         return merged_runner
 
+
 class RunnerForm:
 
     def __init__(self, runner):

diff --git a/orbeon_xml_api/runner_copy_builder_merge.py b/orbeon_xml_api/runner_copy_builder_merge.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 class RunnerCopyBuilderMerge:
 
     def __init__(self, runner, builder, **kwargs):

diff --git a/orbeon_xml_api/tests/benchmark_performance.py b/orbeon_xml_api/tests/benchmark_performance.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 import unittest
 
 from ..builder import Builder

diff --git a/orbeon_xml_api/tests/controls/__init__.py b/orbeon_xml_api/tests/controls/__init__.py
@@ -1,6 +1,2 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from ..test_common import CommonTestCase
 from ...controls import *
diff --git a/orbeon_xml_api/tests/controls/test_autocomplete.py b/orbeon_xml_api/tests/controls/test_autocomplete.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_checkbox_input.py b/orbeon_xml_api/tests/controls/test_checkbox_input.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import BooleanControl

diff --git a/orbeon_xml_api/tests/controls/test_checkboxes.py b/orbeon_xml_api/tests/controls/test_checkboxes.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 from ..controls import SelectControl
 

diff --git a/orbeon_xml_api/tests/controls/test_currency.py b/orbeon_xml_api/tests/controls/test_currency.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import DecimalControl

diff --git a/orbeon_xml_api/tests/controls/test_date.py b/orbeon_xml_api/tests/controls/test_date.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from datetime import datetime
 from lxml import etree
 

diff --git a/orbeon_xml_api/tests/controls/test_datetime.py b/orbeon_xml_api/tests/controls/test_datetime.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from datetime import datetime
 from lxml import etree
 

diff --git a/orbeon_xml_api/tests/controls/test_dropdown.py b/orbeon_xml_api/tests/controls/test_dropdown.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 from ..controls import Select1Control
 

diff --git a/orbeon_xml_api/tests/controls/test_dropdown_date.py b/orbeon_xml_api/tests/controls/test_dropdown_date.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from datetime import datetime
 
 from . import CommonTestCase

diff --git a/orbeon_xml_api/tests/controls/test_dynamic_data_dropdown.py b/orbeon_xml_api/tests/controls/test_dynamic_data_dropdown.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_email.py b/orbeon_xml_api/tests/controls/test_email.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_fields_date.py b/orbeon_xml_api/tests/controls/test_fields_date.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from datetime import datetime
 from lxml import etree
 

diff --git a/orbeon_xml_api/tests/controls/test_file_attachment.py b/orbeon_xml_api/tests/controls/test_file_attachment.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 

diff --git a/orbeon_xml_api/tests/controls/test_htmlarea.py b/orbeon_xml_api/tests/controls/test_htmlarea.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_image_annotation.py b/orbeon_xml_api/tests/controls/test_image_annotation.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from collections import OrderedDict
 from lxml import etree
 

diff --git a/orbeon_xml_api/tests/controls/test_image_attachment.py b/orbeon_xml_api/tests/controls/test_image_attachment.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import AnyUriControl

diff --git a/orbeon_xml_api/tests/controls/test_input.py b/orbeon_xml_api/tests/controls/test_input.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_input_counter.py b/orbeon_xml_api/tests/controls/test_input_counter.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_link_button.py b/orbeon_xml_api/tests/controls/test_link_button.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 

diff --git a/orbeon_xml_api/tests/controls/test_multiple_list.py b/orbeon_xml_api/tests/controls/test_multiple_list.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from lxml import etree
 
 from . import CommonTestCase

diff --git a/orbeon_xml_api/tests/controls/test_number.py b/orbeon_xml_api/tests/controls/test_number.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import DecimalControl

diff --git a/orbeon_xml_api/tests/controls/test_open_select1.py b/orbeon_xml_api/tests/controls/test_open_select1.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 from ..controls import OpenSelect1Control
 

diff --git a/orbeon_xml_api/tests/controls/test_output.py b/orbeon_xml_api/tests/controls/test_output.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_radio_buttons.py b/orbeon_xml_api/tests/controls/test_radio_buttons.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import Select1Control

diff --git a/orbeon_xml_api/tests/controls/test_secret.py b/orbeon_xml_api/tests/controls/test_secret.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_standard_button.py b/orbeon_xml_api/tests/controls/test_standard_button.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 

diff --git a/orbeon_xml_api/tests/controls/test_static_image.py b/orbeon_xml_api/tests/controls/test_static_image.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from collections import OrderedDict
 from . import CommonTestCase
 

diff --git a/orbeon_xml_api/tests/controls/test_textarea.py b/orbeon_xml_api/tests/controls/test_textarea.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_textarea_counter.py b/orbeon_xml_api/tests/controls/test_textarea_counter.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from . import CommonTestCase
 
 from ..controls import StringControl

diff --git a/orbeon_xml_api/tests/controls/test_time.py b/orbeon_xml_api/tests/controls/test_time.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017-2018 Bob Leers (http://www.novacode.nl)
-# See LICENSE file for full licensing details.
-
 from datetime import datetime
 from lxml import etree