Skip to content

Commit

Permalink
get "French XML" working better (#520)
Browse files Browse the repository at this point in the history 
* merge in develop/SIDD-3.0

* Squashed commit of the following:

commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:25:31 2021 -0500

    Squashed commit of the following:

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:08:04 2021 -0500

    merge in develop/8AMPI_PHSI

* Squashed commit of the following:

commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 09:29:07 2021 -0500

    test_valid_six unittests now working

commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 17:45:26 2021 -0500

    trying to re-enable more unittests

commit c787e98a7f339740389e10f5c5cb3760617f3ed1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 16:54:28 2021 -0500

    unit-test breaks on Linux

commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:25:31 2021 -0500

    Squashed commit of the following:

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:08:04 2021 -0500

    merge in develop/8AMPI_PHSI

* Squashed commit of the following:

commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 08:44:54 2021 -0500

    still can't get French XML working

commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:37:11 2021 -0500

    Squashed commit of the following:

    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit f705be9129ea7c71d6bdc25899b53fd3f655b974
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:35:35 2021 -0500

    add overloads for other code

commit d61323431bea6e33c4f91b60cb83f3401b76671d
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:57:55 2021 -0500

    option to disable XML validation for SICD too

commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:44 2021 -0500

    Squashed commit of the following:

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:16:01 2021 -0500

    Squashed commit of the following:

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:53 2021 -0500

    Squashed commit of the following:

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:47:21 2021 -0500

    trying to get the "french" SICD unit-test working

commit d63e6eace772c8d02616f467d698da48a14568dd
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:42:55 2021 -0500

    Squashed commit of the following:

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 09:29:07 2021 -0500

    test_valid_six unittests now working

commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 17:45:26 2021 -0500

    trying to re-enable more unittests

commit c787e98a7f339740389e10f5c5cb3760617f3ed1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 16:54:28 2021 -0500

    unit-test breaks on Linux

commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:25:31 2021 -0500

    Squashed commit of the following:

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:08:04 2021 -0500

    merge in develop/8AMPI_PHSI

* Squashed commit of the following:

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* use new xml.lite APIs to simplify code

* more use of new xml.lite infrastructure

* Squashed commit of the following:

commit 33bd17059640d2a02f9766285f05dcdff5de50a8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:44:54 2021 -0500

    nitro release 2.10.7

commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:42:09 2021 -0500

    coda-oss release 2021-12-13

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* xml.lite changes that need to get back to coda-oss

* Squashed commit of the following:

commit 3610f8e6e0f11a643831280819efb0aff3bb373d
Author: Dan Smith <[email protected]>
Date:   Tue Dec 14 09:46:21 2021 -0500

    xml.lite tweaks from coda-oss

commit 813be14c563d9f4829d342ec008b86da5ef77b27
Merge: 873d4b9d6 9ed21bed3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 17:25:22 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
Merge: 1c1a7222c ef191da2f
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:59:08 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:01:14 2021 -0500

    Squashed commit of the following:

    commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 13:00:02 2021 -0500

        xml.lite changes that need to get back to coda-oss

    commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:45:39 2021 -0500

        Squashed commit of the following:

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 12:26:10 2021 -0500

        more use of new xml.lite infrastructure

    commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:58:22 2021 -0500

        use new xml.lite APIs to simplify code

    commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:57 2021 -0500

        Squashed commit of the following:

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 09:06:38 2021 -0500

        Squashed commit of the following:

        commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 08:44:54 2021 -0500

            still can't get French XML working

        commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:37:11 2021 -0500

            Squashed commit of the following:

            commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 17:36:09 2021 -0500

                test_xmlParser might be be running in coda-oss

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit f705be9129ea7c71d6bdc25899b53fd3f655b974
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:35:35 2021 -0500

            add overloads for other code

        commit d61323431bea6e33c4f91b60cb83f3401b76671d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:57:55 2021 -0500

            option to disable XML validation for SICD too

        commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:44 2021 -0500

            Squashed commit of the following:

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:16:01 2021 -0500

            Squashed commit of the following:

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:53 2021 -0500

            Squashed commit of the following:

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:47:21 2021 -0500

            trying to get the "french" SICD unit-test working

        commit d63e6eace772c8d02616f467d698da48a14568dd
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:42:55 2021 -0500

            Squashed commit of the following:

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit 67768ea901bbd983becc4790b478afe0f17828d5
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 10:02:19 2021 -0500

        Squashed commit of the following:

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:26:24 2021 -0500

        Squashed commit of the following:

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit 33bd17059640d2a02f9766285f05dcdff5de50a8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:44:54 2021 -0500

    nitro release 2.10.7

commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:42:09 2021 -0500

    coda-oss release 2021-12-13

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* adjust to latest xml.lite changes

* start using xml::lite::Uri

* more use of xml::lite::Uri

* setAttribute() now uses just xml::lite::QName

* use xml::lite::QName() for newElement()

* use xml::lite::QName() in createValue()

* more use of xml::lite::QName

* remove unused code

* use QName for createDate()

* use xml::lite::QName for createDateTime()

* use QName for some createString() routines

* still more use of xml::lite::QName

* use QName for createBooleanType()

* use QName for createDouble()

* use QName for createInt()

* simplify createInt()

* remove unused createInt() code

* don't need addClassAttributes() as member-function

* simplify createString()

* prefer reference versions of newElement() as that minimizes the opportunity for memory leaks

* we always have std::u8string

* makeQName() utility

* Squashed commit of the following:

commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 08:50:17 2021 -0500

    simple URI validation

commit 3610f8e6e0f11a643831280819efb0aff3bb373d
Author: Dan Smith <[email protected]>
Date:   Tue Dec 14 09:46:21 2021 -0500

    xml.lite tweaks from coda-oss

commit 813be14c563d9f4829d342ec008b86da5ef77b27
Merge: 873d4b9d6 9ed21bed3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 17:25:22 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
Merge: 1c1a7222c ef191da2f
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:59:08 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:01:14 2021 -0500

    Squashed commit of the following:

    commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 13:00:02 2021 -0500

        xml.lite changes that need to get back to coda-oss

    commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:45:39 2021 -0500

        Squashed commit of the following:

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 12:26:10 2021 -0500

        more use of new xml.lite infrastructure

    commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:58:22 2021 -0500

        use new xml.lite APIs to simplify code

    commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:57 2021 -0500

        Squashed commit of the following:

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 09:06:38 2021 -0500

        Squashed commit of the following:

        commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 08:44:54 2021 -0500

            still can't get French XML working

        commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:37:11 2021 -0500

            Squashed commit of the following:

            commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 17:36:09 2021 -0500

                test_xmlParser might be be running in coda-oss

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit f705be9129ea7c71d6bdc25899b53fd3f655b974
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:35:35 2021 -0500

            add overloads for other code

        commit d61323431bea6e33c4f91b60cb83f3401b76671d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:57:55 2021 -0500

            option to disable XML validation for SICD too

        commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:44 2021 -0500

            Squashed commit of the following:

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:16:01 2021 -0500

            Squashed commit of the following:

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:53 2021 -0500

            Squashed commit of the following:

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:47:21 2021 -0500

            trying to get the "french" SICD unit-test working

        commit d63e6eace772c8d02616f467d698da48a14568dd
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:42:55 2021 -0500

            Squashed commit of the following:

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit 67768ea901bbd983becc4790b478afe0f17828d5
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 10:02:19 2021 -0500

        Squashed commit of the following:

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:26:24 2021 -0500

        Squashed commit of the following:

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit 33bd17059640d2a02f9766285f05dcdff5de50a8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:44:54 2021 -0500

    nitro release 2.10.7

commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:42:09 2021 -0500

    coda-oss release 2021-12-13

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* Squashed commit of the following:

commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 09:38:14 2021 -0500

    create a "path" after splitting on ":"

commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 08:50:17 2021 -0500

    simple URI validation

commit 3610f8e6e0f11a643831280819efb0aff3bb373d
Author: Dan Smith <[email protected]>
Date:   Tue Dec 14 09:46:21 2021 -0500

    xml.lite tweaks from coda-oss

commit 813be14c563d9f4829d342ec008b86da5ef77b27
Merge: 873d4b9d6 9ed21bed3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 17:25:22 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
Merge: 1c1a7222c ef191da2f
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:59:08 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:01:14 2021 -0500

    Squashed commit of the following:

    commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 13:00:02 2021 -0500

        xml.lite changes that need to get back to coda-oss

    commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:45:39 2021 -0500

        Squashed commit of the following:

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 12:26:10 2021 -0500

        more use of new xml.lite infrastructure

    commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:58:22 2021 -0500

        use new xml.lite APIs to simplify code

    commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:57 2021 -0500

        Squashed commit of the following:

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 09:06:38 2021 -0500

        Squashed commit of the following:

        commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 08:44:54 2021 -0500

            still can't get French XML working

        commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:37:11 2021 -0500

            Squashed commit of the following:

            commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 17:36:09 2021 -0500

                test_xmlParser might be be running in coda-oss

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit f705be9129ea7c71d6bdc25899b53fd3f655b974
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:35:35 2021 -0500

            add overloads for other code

        commit d61323431bea6e33c4f91b60cb83f3401b76671d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:57:55 2021 -0500

            option to disable XML validation for SICD too

        commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:44 2021 -0500

            Squashed commit of the following:

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:16:01 2021 -0500

            Squashed commit of the following:

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:53 2021 -0500

            Squashed commit of the following:

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:47:21 2021 -0500

            trying to get the "french" SICD unit-test working

        commit d63e6eace772c8d02616f467d698da48a14568dd
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:42:55 2021 -0500

            Squashed commit of the following:

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit 67768ea901bbd983becc4790b478afe0f17828d5
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 10:02:19 2021 -0500

        Squashed commit of the following:

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:26:24 2021 -0500

        Squashed commit of the following:

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit 33bd17059640d2a02f9766285f05dcdff5de50a8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:44:54 2021 -0500

    nitro release 2.10.7

commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:42:09 2021 -0500

    coda-oss release 2021-12-13

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit…
  • Loading branch information
J. Daniel Smith authored Dec 29, 2021
1 parent 29405e5 commit f1f19bd
Show file tree
Hide file tree
Showing 26 changed files with 561 additions and 477 deletions.
6 changes: 3 additions & 3 deletions six/modules/c++/cphd/include/cphd/CPHDXMLControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class CPHDXMLControl

private:
//! \return Hardcoded version to uri mapping
static std::unordered_map<std::string, std::string> getVersionUriMap();
static std::unordered_map<std::string, xml::lite::Uri> getVersionUriMap();

/*!
* This function takes in a Metadata object and converts
Expand All @@ -165,10 +165,10 @@ class CPHDXMLControl
* \param uri A string specifying CPHD uri
*/
std::unique_ptr<CPHDXMLParser>
getParser(const std::string& uri) const;
getParser(const xml::lite::Uri&) const;

// Given the URI get associated version
std::string uriToVersion(const std::string& uri) const;
std::string uriToVersion(const xml::lite::Uri&) const;
};
}

Expand Down
5 changes: 3 additions & 2 deletions six/modules/c++/cphd/source/CPHDReader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <xml/lite/MinidomParser.h>
#include <gsl/gsl.h>

#include <six/XmlLite.h>
#include <cphd/CPHDXMLControl.h>

namespace cphd
Expand Down Expand Up @@ -63,7 +64,7 @@ void CPHDReader::initialize(std::shared_ptr<io::SeekableInputStream> inStream,
// Read in the XML string
inStream->seek(mFileHeader.getXMLBlockByteOffset(), io::Seekable::START);

xml::lite::MinidomParser xmlParser;
six::MinidomParser xmlParser;
xmlParser.preserveCharacterData(true);
xmlParser.parse(*inStream, gsl::narrow<int>(mFileHeader.getXMLBlockSize()));

Expand All @@ -75,7 +76,7 @@ void CPHDReader::initialize(std::shared_ptr<io::SeekableInputStream> inStream,
std::vector<std::filesystem::path> schemaPaths;
std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths),
[](const std::string& s) { return s; });
mMetadata = CPHDXMLControl(logger.get()).fromXML(*(xmlParser.getDocument()), schemaPaths);
mMetadata = CPHDXMLControl(logger.get()).fromXML(xmlParser.getDocument(), schemaPaths);

mSupportBlock = std::make_unique<SupportBlock>(inStream, mMetadata.data, mFileHeader);

Expand Down
23 changes: 12 additions & 11 deletions six/modules/c++/cphd/source/CPHDXMLControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <xml/lite/MinidomParser.h>

#include <six/XMLControl.h>
#include <six/XmlLite.h>
#include <cphd/CPHDXMLParser.h>
#include <cphd/Enums.h>
#include <cphd/Metadata.h>
Expand Down Expand Up @@ -74,11 +75,11 @@ mem::auto_ptr<xml::lite::Document> CPHDXMLControl::toXML(
return doc;
}

std::unordered_map<std::string, std::string> CPHDXMLControl::getVersionUriMap()
std::unordered_map<std::string, xml::lite::Uri> CPHDXMLControl::getVersionUriMap()
{
return {
{"1.0.0", "urn:CPHD:1.0.0"},
{"1.0.1", "http://api.nsgreg.nga.mil/schema/cphd/1.0.1"}
{"1.0.0", xml::lite::Uri("urn:CPHD:1.0.0")},
{"1.0.1", xml::lite::Uri("http://api.nsgreg.nga.mil/schema/cphd/1.0.1")}
};
}

Expand All @@ -102,9 +103,9 @@ std::unique_ptr<Metadata> CPHDXMLControl::fromXML(const std::string& xmlString,
{
io::StringStream stringStream;
stringStream.write(xmlString);
xml::lite::MinidomParser parser;
six::MinidomParser parser;
parser.parse(stringStream);
return fromXML(parser.getDocument(), schemaPaths);
return fromXML(&parser.getDocument(), schemaPaths);
}

std::unique_ptr<Metadata> CPHDXMLControl::fromXML(const xml::lite::Document* doc,
Expand Down Expand Up @@ -133,19 +134,19 @@ std::unique_ptr<Metadata> CPHDXMLControl::fromXMLImpl(const xml::lite::Document*
}

std::unique_ptr<CPHDXMLParser>
CPHDXMLControl::getParser(const std::string& uri) const
CPHDXMLControl::getParser(const xml::lite::Uri& uri) const
{
return std::make_unique<CPHDXMLParser>(uri, false, mLog);
return std::make_unique<CPHDXMLParser>(uri.value, false, mLog);
}

std::string CPHDXMLControl::uriToVersion(const std::string& uri) const
std::string CPHDXMLControl::uriToVersion(const xml::lite::Uri& uri) const
{
const auto versionUriMap = getVersionUriMap();
for (auto it = versionUriMap.begin(); it != versionUriMap.end(); ++it)
for (const auto& p : versionUriMap)
{
if (it->second == uri)
if (p.second == uri)
{
return it->first;
return p.first;
}
}
std::ostringstream ostr;
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/cphd/source/CPHDXMLParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ std::unique_ptr<Metadata> CPHDXMLParser::fromXML(
{
std::unique_ptr<Metadata> cphd(new Metadata());

XMLElem root = doc->getRootElement();
const auto root = doc->getRootElement();

XMLElem collectionIDXML = getFirstAndOnly(root, "CollectionID");
XMLElem globalXML = getFirstAndOnly(root, "Global");
Expand Down
5 changes: 3 additions & 2 deletions six/modules/c++/cphd03/source/CPHDReader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <mem/ScopedArray.h>
#include <xml/lite/MinidomParser.h>
#include <cphd03/CPHDXMLControl.h>
#include <six/XmlLite.h>

namespace cphd03
{
Expand Down Expand Up @@ -57,7 +58,7 @@ void CPHDReader::initialize(std::shared_ptr<io::SeekableInputStream> inStream,
const auto xmlSize = static_cast<int>(mFileHeader.getXMLsize());
inStream->seek(mFileHeader.getXMLoffset(), io::Seekable::START);

xml::lite::MinidomParser xmlParser;
six::MinidomParser xmlParser;
xmlParser.preserveCharacterData(true);
xmlParser.parse(*inStream, xmlSize);

Expand All @@ -66,7 +67,7 @@ void CPHDReader::initialize(std::shared_ptr<io::SeekableInputStream> inStream,
logger = std::make_shared<logging::NullLogger>();
}

mMetadata = CPHDXMLControl(logger.get()).fromXML(*xmlParser.getDocument());
mMetadata = CPHDXMLControl(logger.get()).fromXML(xmlParser.getDocument());

// Load the VBP into memory
mVBM = VBM(mMetadata);
Expand Down
9 changes: 5 additions & 4 deletions six/modules/c++/cphd03/source/CPHDXMLControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <io/StringStream.h>
#include <logging/NullLogger.h>
#include <six/Utilities.h>
#include <six/XmlLite.h>

// CPHD Spec is not enforced
#define ENFORCESPEC 0
Expand Down Expand Up @@ -489,16 +490,16 @@ mem::auto_ptr<Metadata> CPHDXMLControl::fromXML(const std::string& xmlString)
{
io::StringStream stringStream;
stringStream.write(xmlString);
xml::lite::MinidomParser parser;
six::MinidomParser parser;
parser.parse(stringStream);
return fromXML(parser.getDocument());
return fromXML(&parser.getDocument());
}

mem::auto_ptr<Metadata> CPHDXMLControl::fromXML(const xml::lite::Document* doc)
{
auto cphd03 = std::make_unique<Metadata>();

XMLElem root = doc->getRootElement();
const auto root = doc->getRootElement();

XMLElem collectionInfoXML = getFirstAndOnly(root, "CollectionInfo");
XMLElem dataXML = getFirstAndOnly(root, "Data");
Expand Down Expand Up @@ -547,7 +548,7 @@ void CPHDXMLControl::fromXML(const xml::lite::Element* dataXML, Data& data)
throw except::Exception(Ctxt("Expected at least one ArraySize"));
}

for (std::vector<xml::lite::Element*>::iterator it = arraySizeXML.begin();
for (auto it = arraySizeXML.begin();
it != arraySizeXML.end();
++it)
{
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/six.convert/include/six/convert/BaseConverter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct BaseConverter : protected six::XMLParser

protected:
static mem::auto_ptr<xml::lite::Document>
readXML(const std::string& xmlPathname);
readXML(const std::string& xmlPathname, bool storeEncoding=false);

XMLElem findUniqueElement(const xml::lite::Element* root,
const std::string& xmlPath) const;
Expand Down
15 changes: 10 additions & 5 deletions six/modules/c++/six.convert/source/BaseConverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
*
*/
#include "six/convert/BaseConverter.h"

#include <iostream>

#include <io/FileInputStream.h>
#include <xml/lite/MinidomParser.h>
#include <iostream>

#include <six/XmlLite.h>

namespace six
{
Expand All @@ -34,13 +38,14 @@ BaseConverter::BaseConverter() :
}

mem::auto_ptr<xml::lite::Document>
BaseConverter::readXML(const std::string& xmlPathname)
BaseConverter::readXML(const std::string& xmlPathname, bool storeEncoding)
{
xml::lite::MinidomParser parser;
six::MinidomParser parser(storeEncoding);
io::FileInputStream xmlInputStream(xmlPathname);
parser.parse(xmlInputStream);
return mem::auto_ptr<xml::lite::Document>(
parser.getDocument(true));
std::unique_ptr<xml::lite::Document> pDocument;
parser.getDocument(pDocument);
return mem::auto_ptr<xml::lite::Document>(pDocument.release());
}

BaseConverter::XMLElem BaseConverter::findUniqueElement(
Expand Down
16 changes: 7 additions & 9 deletions six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <str/Convert.h>

#include <import/six/sicd.h>
#include <six/XmlLite.h>

#ifdef _MSC_VER
#pragma warning(disable: 4464) // relative include path contains '..'
Expand Down Expand Up @@ -66,11 +67,10 @@ TEST_CASE(Classification)
io::StringStream ss;
ss.stream() << six::sicd::Utilities::toXMLString(*data, schemaPaths);

xml::lite::MinidomParser xmlParser;
six::MinidomParser xmlParser(false /*storeEncoding*/);
xmlParser.parse(ss);
const auto doc = xmlParser.getDocument();
TEST_ASSERT(doc != nullptr);
const auto root = doc->getRootElement();
const auto& doc = getDocument(xmlParser);
const auto root = doc.getRootElement();
TEST_ASSERT(root != nullptr);

const auto classificationElements = root->getElementsByTagName("Classification", true /*recurse*/);
Expand Down Expand Up @@ -107,12 +107,10 @@ TEST_CASE(ClassificationCanada)

io::StringStream ss;
ss.stream() << strXml;
xml::lite::MinidomParser xmlParser(true /*storeEncoding*/);
xmlParser.preserveCharacterData(true); // needed to parse UTF-8 XML
six::MinidomParser xmlParser(true /*storeEncoding*/);
xmlParser.parse(ss);
const auto doc = xmlParser.getDocument();
TEST_ASSERT(doc != nullptr);
const auto root = doc->getRootElement();
const auto& doc = getDocument(xmlParser);
const auto root = doc.getRootElement();
TEST_ASSERT(root != nullptr);

const auto classificationElements = root->getElementsByTagName("Classification", true /*recurse*/);
Expand Down
Loading

0 comments on commit f1f19bd

Please sign in to comment.