Correction of many fixes

Merge request reports

Loading
+x+17
Changes for EtsiServerGen/patches/applyPatches.sh: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
#!/bin/bash
patch -u ../api/DefaultApi.h -i fixHeaderModelIssue.patch
patch -u ../api/DefaultApi.cpp -i fixCppModelIssue.patch
patch -u ../api/RelocalizationInformationApi.cpp -i fixCppRelocalizationInformation.patch
patch -u ../api/TrackablesApi.cpp -i fixCppTrackables.patch
patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
patch -u ../model/Capability.cpp -i fixCppCapabilityModel.patch
patch -u ../model/RelocalizationInformations.cpp -i fixCppRelocalizationInformationsModel.patch
patch -u ../model/RelocObject.cpp -i fixCppRelocObjectModel.patch
patch -u ../model/Trackable.cpp -i fixCppTrackableModel.patch
patch -u ../model/TrackablesResponse.cpp -i fixCppTrackablesResponseModel.patch
patch -u ../model/UuidAndMode.cpp -i fixCppUuidAndModeModel.patch
patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
patch -u ../model/WorldAnchorsResponse.cpp -i fixCppWorldAnchorsResponseModel.patch
patch -u ../model/WorldLink.cpp -i fixCppWorldLinkModel.patch
patch -u ../model/WorldLinksResponse.cpp -i fixCppWorldLinksResponseModel.patch
+x+2
Changes for EtsiServerGen/patches/applyYamlPatch.sh: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
#!/bin/bash
cp ../arf005/API/worldstorage/worldstorageopenapi.yaml ../arf005/API/worldstorage/worldstorageopenapiPatched.yaml && patch -u ../arf005/API/worldstorage/worldstorageopenapiPatched.yaml -i patches/fixYAMLrestbedSchema.patch
 No newline at end of file
+22
Changes for EtsiServerGen/patches/fixCppCapabilityModel.patch: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
--- Capability.cpp	2024-09-19 23:18:16.290090280 +0200
+++ Capability-corrected.cpp	2024-09-20 13:40:09.082949533 +0200
@@ -63,7 +63,8 @@
 {
 	ptree pt;
 	ptree tmp_node;
-	pt.add_child("encodingInformation", m_EncodingInformation.toPropertyTree());
+	pt.put("trackableType", m_TrackableType.getEnumValue());
+    pt.add_child("encodingInformation", m_EncodingInformation.toPropertyTree());
 	pt.put("framerate", m_Framerate);
 	pt.put("latency", m_Latency);
 	pt.put("accuracy", m_Accuracy);
@@ -73,7 +74,8 @@
 void Capability::fromPropertyTree(ptree const &pt)
 {
 	ptree tmp_node;
-	if (pt.get_child_optional("encodingInformation")) {
+	m_TrackableType.setEnumValue(pt.get("trackableType",""));
+    if (pt.get_child_optional("encodingInformation")) {
         m_EncodingInformation = fromPt<EncodingInformationStructure>(pt.get_child("encodingInformation"));
 	}
 	m_Framerate = pt.get("framerate", 0.0);
+11
Changes for EtsiServerGen/patches/fixCppModelIssue.patch: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
 --- ../api/DefaultApi.cpp      2024-04-15 16:13:33.914375475 +0200
+++ ../api/DefaultApi.cpp      2024-04-15 16:15:50.556422843 +0200
@@ -28,8 +28,6 @@
 namespace server {
 namespace api {

-using namespace org::openapitools::server::model;
-
 namespace {
 [[maybe_unused]]
 std::string selectPreferredContentType(const std::vector<std::string>& contentTypes) {
+11
Changes for EtsiServerGen/patches/fixCppRelocObjectModel.patch: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
--- RelocObject.cpp	2024-09-26 20:00:54.937679755 +0200
+++ RelocObject_corrected.cpp	2024-09-26 19:59:16.044769402 +0200
@@ -46,7 +46,7 @@
 	std::stringstream ss;
 	write_json(ss, this->toPropertyTree(), prettyJson);
     // workaround inspired by: https://stackoverflow.com/a/56395440
-    std::regex reg("\\\"([0-9]+\\.{0,1}[0-9]*)\\\"");
+    std::regex reg("\\\"([-+]?[0-9]+\\.{0,1}[0-9]*)\\\"");
     std::string result = std::regex_replace(ss.str(), reg, "$1");
     return result;
 }
Loading
Loading