Fix for json

CroatiaControlLtd · Feb 12, 2021 · ff719c4 · ff719c4
1 parent 4bb0923
commit ff719c4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/HISTORY b/HISTORY
@@ -243,4 +243,5 @@ Not versioned yet
 Issue #175 Cat021 Ed2.4 SelH is not reasonable
 Issue #174 Warning: ‘char* strncpy(char*, const char*, size_t)’ output may be truncated
 Issue #122 glibc version 2.1 behaves diffrently than glibc 2.0.6
-Added CAT004 v1.12
+Added CAT004 v1.12
+Issue #178 Explicit items with more elements then in definition should be put to list
diff --git a/src/asterix/DataItemFormatExplicit.cpp b/src/asterix/DataItemFormatExplicit.cpp
@@ -72,11 +72,13 @@ bool DataItemFormatExplicit::getText(std::string &strResult, std::string &strHea
 
     std::string tmpStr = "";
 
-    switch (formatType) {
-        case CAsterixFormat::EJSON:
-        case CAsterixFormat::EJSONH:
-        case CAsterixFormat::EJSONE: {
-            tmpStr += format("[");
+    if (nFullLength != bodyLength) {
+        switch (formatType) {
+            case CAsterixFormat::EJSON:
+            case CAsterixFormat::EJSONH:
+            case CAsterixFormat::EJSONE: {
+                tmpStr += format("[");
+            }
         }
     }
 
@@ -86,24 +88,28 @@ bool DataItemFormatExplicit::getText(std::string &strResult, std::string &strHea
             ret |= di->getText(tmpStr, strHeader, formatType, pData, bodyLength);
             pData += bodyLength;
 
-            switch (formatType) {
-                case CAsterixFormat::EJSON:
-                case CAsterixFormat::EJSONH:
-                case CAsterixFormat::EJSONE: {
-                    tmpStr += format(",");
+            if (nFullLength != bodyLength) {
+                switch (formatType) {
+                    case CAsterixFormat::EJSON:
+                    case CAsterixFormat::EJSONH:
+                    case CAsterixFormat::EJSONE: {
+                        tmpStr += format(",");
+                    }
                 }
             }
         }
     }
 
-    switch (formatType) {
-        case CAsterixFormat::EJSON:
-        case CAsterixFormat::EJSONH:
-        case CAsterixFormat::EJSONE: {
-            if (tmpStr[tmpStr.length() - 1] == ',') {
-                tmpStr[tmpStr.length() - 1] = ']';
-            } else {
-                tmpStr += ']';
+    if (nFullLength != bodyLength) {
+        switch (formatType) {
+            case CAsterixFormat::EJSON:
+            case CAsterixFormat::EJSONH:
+            case CAsterixFormat::EJSONE: {
+                if (tmpStr[tmpStr.length() - 1] == ',') {
+                    tmpStr[tmpStr.length() - 1] = ']';
+                } else {
+                    tmpStr += ']';
+                }
             }
         }
     }