Commit fc551c85 authored by schmitting's avatar schmitting
Browse files

Update ttwb 1.12

parent ccbc671f

CDIV/CDIV_TC_Functions.ttcn

+1 −5
Original line number Diff line number Diff line
@@ -15,13 +15,9 @@ module CDIV_TC_Functions { 
    import from LibSip_Templates all;

	import from LibSip_SIPTypesAndValues language "TTCN-3:2005" all;

    

    import from org_etsi_uri__ngn_params_xml_comm_div_info language "XSD" all

    with {

        extension "File:../xsd/CDIVN.xsd"

    }



    import from LibCommon_Sync all;



    import from http_uri_etsi_org_ngn_params_xml_comm_div_info language "XSD" all;



    group SuplementaryService_CDIV {

CDIV/CDIV_Templates.ttcn

+15 −21
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ module CDIV_Templates{ 
    

    import from LibSip_XMLTypes all;

    

    import from org_etsi_uri__ngn_params_xml_comm_div_info language "XSD" all

    import from http_uri_etsi_org_ngn_params_xml_comm_div_info language "XSD" all

    with {

        extension "File:../xsd/CDIVN.xsd"

    }
@@ -257,7 +257,7 @@ group MessageTemplates{ 
        template User_selection_criteria_type m_orig_user(template charstring p_userURI) :=

        {

            anyAttributes := omit,

            user_info := {m_user_info(p_userURI)}

            user_info_list := {m_user_info(p_userURI)}

        }

        

        template User_info_type m_user_info(template charstring p_userURI) :=
@@ -270,7 +270,7 @@ group MessageTemplates{ 
        template Time_range_selection_criteria_type m_time_selection(template charstring p_start_time,template charstring p_end_time) :=

        {

            anyAttributes := omit,

            time_range := {m_time_range(p_start_time, p_end_time)}

            time_range_list := {m_time_range(p_start_time, p_end_time)}

        }

        

        template Time_range_type m_time_range(template charstring p_start_time,template charstring p_end_time) :=
@@ -306,20 +306,20 @@ group MessageTemplates{ 
                diverted_to_user_selection_criteria:= p_divToUserURI,

                diversion_time_selection_criteria:= m_time_selection(p_start_time_subs,p_end_time_subs),

                diversion_reason_selection_criteria:= m_reason_type(p_enumReason),

                elem:= omit

                elem_list:= omit

            },

            comm_div_ntfy_trigger_criteria := {

                anyAttributes := omit,

                notification_time_selection_criteria := m_time_selection(p_start_time_ntfy,p_end_time_ntfy),

                presence_status_selection_criteria := omit,

                notification_buffer_interval := omit,

                elem := omit   

                elem_list := omit   

            },

            comm_div_info_selection_criteria := omit,

            elem := omit

            elem_list := omit

          },

          comm_div_ntfy_info := omit,

          elem := omit

          elem_list := omit

        }

        

        template Comm_div_info_type mw_comm_div_subs_info(Diversion_reason_info_type p_enumReason) := {
@@ -335,20 +335,14 @@ group MessageTemplates{ 
                diverted_to_user_selection_criteria:= *,

                diversion_time_selection_criteria:= *,

                diversion_reason_selection_criteria:= m_reason_type(p_enumReason),

                elem:= *

            },

            comm_div_ntfy_trigger_criteria := {

                anyAttributes := *,

                notification_time_selection_criteria := *,

                presence_status_selection_criteria := *,

                notification_buffer_interval := *,

                elem := *   

                elem_list := *

            },

            comm_div_ntfy_trigger_criteria := *,

            comm_div_info_selection_criteria := *,

            elem := *

            elem_list := *

          },

          comm_div_ntfy_info := *,

          elem := *

          elem_list := *

        }

        

        template Comm_div_info_type m_comm_div_ntfy_info(Diversion_reason_info_type p_enumReason) := {
@@ -365,9 +359,9 @@ group MessageTemplates{ 
                  anyAttributes := omit,

                  diversion_rule := "Any text"

                },

              elem := omit

              elem_list := omit

          },

          elem := omit

          elem_list := omit

        }

        

        template Comm_div_info_type mw_comm_div_ntfy_info(template User_info_type p_user_info_type) := {
@@ -384,9 +378,9 @@ group MessageTemplates{ 
                  anyAttributes := *,

                  diversion_rule := "Any text"

                },

              elem := *

              elem_list := *

          },

          elem := *

          elem_list := *

        }

        

    }//end xmlTemplates group