Add new template for derivations (8dc3cd81) · Commits · CDM - Common information sharing environment and Data Model / CISE Data Model

ccsrc/Protocols/Xml/xml_codec.cc

+3 −3

titan-test-system-framework @ c38a2f26

Original line number	Original line	Diff line number	Diff line
	Subproject commit c7b208ea9b477564472cf523f6000ed1e43000cf		Subproject commit c38a2f267cb659c8180548bc82721d34dc71ef85

ttcn/AtsCise/AtsCise_TestCases.ttcn

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1202,16 +1202,16 @@ module AtsCise_TestCases {
	-, -,		-, -,
	{		{
	m_involved_agent_rel(		m_involved_agent_rel(
	m_agent_derivations_agent(		/*m_agent_derivations_agent(
	m_agent(		m_agent(
	PX_AGENT_CONTACT,		PX_AGENT_CONTACT,
	m_unique_identifier(		m_unique_identifier(
	-, -, -,		-, -, -,
	PX_AGENT_UUID		PX_AGENT_UUID
	))),		))),*/
	/*m_agent_derivations_organization(		m_agent_derivations_organization(
	m_organization()		m_organization()
	),*/		),
	nonSpecified		nonSpecified
	)		)
	},		},

ttcn/LibCise/ttcn/LibCise_Templates.ttcn

+767 −30

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -57,13 +57,13 @@ int xml_codec::encode(const LibHttp__XmlMessageBodyTypes::XmlBody& body, OCTETST
	data = OCTETSTRING(canonicalized.length(), (const unsigned char*)canonicalized.c_str());		data = OCTETSTRING(canonicalized.length(), (const unsigned char*)canonicalized.c_str());
	}		}

	/*{ // TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization">		{ // TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization">
	// ==> xmlns:xsi=http://www.cise.eu/datamodel/v1/entity/organization/ xsi:type="ns4:Organization"		// ==> xmlns:xsi=http://www.cise.eu/datamodel/v1/entity/organization/ xsi:type="ns4:Organization"
	loggers::get_instance().log("xml_codec::encode: Apply TITAN workaround");		loggers::get_instance().log("xml_codec::encode: Apply TITAN workaround");
	std::string s(static_cast<const unsigned char>(data), data.lengthof() + static_cast<const unsigned char>(data));		std::string s(static_cast<const unsigned char>(data), data.lengthof() + static_cast<const unsigned char>(data));
	size_t idx = 0;		size_t idx = 0;
	std::string f(" xsi:type=\"agent:Organization\"");		std::string f(" xsi:type=\"agent:Organization\"");
	std::string t("");		std::string t(" xsi:type=\"ns6:Organization\" xmlns:ns6=\"http://www.cise.eu/datamodel/v1/entity/organization/\"");
	// std::string f("\"agent:Organization\"");		// std::string f("\"agent:Organization\"");
	// std::string t("\"xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"ns4:Organization\"");		// std::string t("\"xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"ns4:Organization\"");
	loggers::get_instance().log("xml_codec::encode: Apply TITAN workaround: %s --> %s", f.c_str(), t.c_str());		loggers::get_instance().log("xml_codec::encode: Apply TITAN workaround: %s --> %s", f.c_str(), t.c_str());
	@@ -73,7 +73,7 @@ int xml_codec::encode(const LibHttp__XmlMessageBodyTypes::XmlBody& body, OCTETST
	} // End of 'while' statement		} // End of 'while' statement

	data = OCTETSTRING(s.length(), (const unsigned char*)s.c_str());		data = OCTETSTRING(s.length(), (const unsigned char*)s.c_str());
	}*/		}

	// Add header		// Add header
	CHARSTRING h("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n");		CHARSTRING h("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n");

Admin message