fiftyone-devicedetection-onpremise 4.5.0a26__tar.gz → 4.5.0a28__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a26
+Version: 4.5.0a28
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/EngineBase.cpp

@@ -23,6 +23,7 @@
 #include "EngineBase.hpp"
 
 #include "fiftyone.h"
+#include "string_pp.hpp"
 
 using namespace FiftyoneDegrees::Common;
 
@@ -66,7 +67,7 @@ void EngineBase::initOverrideKeys(
 			if (overrideProperties->prefix == true) {
 				key.append("51D_");
 			}
-			tempKey = STRING(
+			tempKey = STRING( // name is string
 				overrideProperties->items[i].available->name.data.ptr);
 			if (tempKey != nullptr) {
 				key.append(tempKey);
@@ -79,7 +80,7 @@ void EngineBase::initOverrideKeys(
 			if (overrideProperties->prefix == true) {
 				key.append("51D_");
 			}
-			tempKey = STRING(
+			tempKey = STRING( // name is string
 				overrideProperties->items[i].available->name.data.ptr);
 			if (tempKey != nullptr) {
 				key.append(tempKey);
@@ -150,17 +151,39 @@ bool EngineBase::getIsThreadSafe() const {
 	return ThreadingGetIsThreadSafe();
 }
 
-void EngineBase::appendString(
+void EngineBase::appendValue(
 	stringstream &stream,
 	fiftyoneDegreesCollection *strings,
-	uint32_t offset) const {
+	uint32_t offset,
+	PropertyValueType storedValueType) const {
 	EXCEPTION_CREATE;
 	Item item;
 	DataReset(&item.data);
-	String *string = StringGet(strings, offset, &item, exception);
-	if (string != NULL && EXCEPTION_OKAY) {
-		stream << STRING(string);
+	const StoredBinaryValue * const binaryValue = StoredBinaryValueGet(
+		strings,
+		offset,
+		storedValueType,
+		&item,
+		exception);
+	if (binaryValue != nullptr && EXCEPTION_OKAY) {
+		writeStoredBinaryValueToStringStream(
+			binaryValue,
+			storedValueType,
+			stream,
+			MAX_DOUBLE_DECIMAL_PLACES,
+			exception);
 		COLLECTION_RELEASE(strings, &item);
 	}
 	EXCEPTION_THROW;
+}
+
+void EngineBase::appendString(
+	stringstream &stream,
+	fiftyoneDegreesCollection *strings,
+	uint32_t offset) const {
+	appendValue(
+		stream,
+		strings,
+		offset,
+		FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING); // legacy contract
 }

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/EngineBase.hpp

@@ -275,6 +275,19 @@ namespace FiftyoneDegrees {
 			/** Keys which should be added to evidence. */
 			vector<string> keys;
 
+			/**
+			 * Gets a string from a strings collection, and appends to a stream.
+			 * @param stream to append the string to
+			 * @param strings collection to get the string from
+			 * @param offset of the string in the collection
+			 * @param storedValueType format of byte array representation.
+			 */
+			virtual void appendValue(
+				stringstream &stream,
+				fiftyoneDegreesCollection *strings,
+				uint32_t offset,
+				fiftyoneDegreesPropertyValueType storedValueType) const;
+
 			/**
 			 * Gets a string from a strings collection, and appends to a stream.
 			 * @param stream to append the string to

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/EntityMetaDataBuilder.hpp

@@ -26,7 +26,10 @@
 #include <string>
 #include "Exceptions.hpp"
 #include "collection.h"
+#include "constants.h"
+#include "storedBinaryValue.h"
 #include "string.h"
+#include "string_pp.hpp"
 
 
 using namespace FiftyoneDegrees;
@@ -57,23 +60,51 @@ namespace FiftyoneDegrees {
 			static string getString(
 				fiftyoneDegreesCollection *stringsCollection,
 				uint32_t offset) {
+				return getValue(
+					stringsCollection,
+					offset,
+					FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING); // legacy contract
+			}
+
+			/**
+			 * Get a copy of a binary value (as string) from the strings collection at the offset
+			 * provided.
+			 * @param stringsCollection pointer to the collection to copy the
+			 * value (as string) from
+			 * @param offset offset in the strings collection of the binary value to
+			 * copy (as string)
+			 * @param storedValueType format of byte array representation.
+			 * @return string describing contents of binary value the offset provided
+			 */
+			static string getValue(
+				fiftyoneDegreesCollection *stringsCollection,
+				uint32_t offset,
+				fiftyoneDegreesPropertyValueType storedValueType) {
 				FIFTYONE_DEGREES_EXCEPTION_CREATE;
 				string result;
 				fiftyoneDegreesCollectionItem item;
-				fiftyoneDegreesString *str;
 				fiftyoneDegreesDataReset(&item.data);
-				str = fiftyoneDegreesStringGet(
+				const fiftyoneDegreesStoredBinaryValue * const binaryValue = fiftyoneDegreesStoredBinaryValueGet(
 					stringsCollection,
 					offset,
+					storedValueType,
 					&item,
 					exception);
 				FIFTYONE_DEGREES_EXCEPTION_THROW;
-					if (str != nullptr) {
-						result.append(&str->value);
-					}
-					FIFTYONE_DEGREES_COLLECTION_RELEASE(
-						stringsCollection,
-						&item);
+				if (binaryValue != nullptr) {
+					std::stringstream stream;
+					writeStoredBinaryValueToStringStream(
+						binaryValue,
+						storedValueType,
+						stream,
+						FIFTYONE_DEGREES_MAX_DOUBLE_DECIMAL_PLACES,
+						exception);
+					FIFTYONE_DEGREES_EXCEPTION_THROW;
+					result.append(stream.str());
+				}
+				FIFTYONE_DEGREES_COLLECTION_RELEASE(
+					stringsCollection,
+					&item);
 				return result;
 			}
 

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/MetaData.cpp

@@ -21,8 +21,12 @@
  * ********************************************************************* */
 
 #include "MetaData.hpp"
+
+#include <sstream>
+
 #include "Exceptions.hpp"
 #include "fiftyone.h"
+#include "string_pp.hpp"
 
 using namespace FiftyoneDegrees::Common;
 
@@ -33,23 +37,30 @@ MetaData::MetaData(shared_ptr<fiftyoneDegreesResourceManager> manager) {
 MetaData::~MetaData() {
 }
 
-string MetaData::getString(
+string MetaData::getValue(
 	fiftyoneDegreesCollection *strings,
-	uint32_t offset) {
+	uint32_t offset,
+	fiftyoneDegreesPropertyValueType storedValueType) {
 	EXCEPTION_CREATE;
-	string result;
 	Item item;
-	String *str;
+	StoredBinaryValue *binaryValue;
 	DataReset(&item.data);
-	str = StringGet(
+	binaryValue = StoredBinaryValueGet(
 		strings,
 		offset,
+		storedValueType,
 		&item,
 		exception);
 	EXCEPTION_THROW;
-	if (str != nullptr) {
-		result.append(&str->value);
+	std::stringstream ss;
+	if (binaryValue != nullptr) {
+		writeStoredBinaryValueToStringStream(
+			binaryValue,
+			storedValueType,
+			ss,
+			(uint8_t)ss.precision(),
+			exception);
 	}
 	COLLECTION_RELEASE(strings, &item);
-	return result;
+	return ss.str();
 }

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/MetaData.hpp

@@ -225,16 +225,18 @@ namespace FiftyoneDegrees {
 			shared_ptr<fiftyoneDegreesResourceManager> manager;
 
 			/**
-			 * Get a string from the collection and copy it to a C++ string
+			 * Get a value from the collection and copy it as string to a C++ string
 			 * instance. This method releases the collection item before
 			 * returning.
 			 * @param strings pointer to the collection containing the string
 			 * @param offset of the string in the collection
-			 * @return copy of the requested string from the collection
+			 * @param storedValueType format of byte array representation.
+			 * @return copy of the requested value from the collection as string
 			 */
-			string getString(
+			string getValue(
 				fiftyoneDegreesCollection *strings,
-				uint32_t offset);
+				uint32_t offset,
+				fiftyoneDegreesPropertyValueType storedValueType);
 		};
 	}
 }

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/ResultsBase.cpp

@@ -62,7 +62,7 @@ string ResultsBase::getPropertyName(
 	const char *cName;
 	if (requiredPropertyIndex >= 0 &&
 		requiredPropertyIndex < (int)available->count) {
-		cName = STRING(PropertiesGetNameFromRequiredIndex(
+		cName = STRING(PropertiesGetNameFromRequiredIndex( // name is string
 			available,
 			requiredPropertyIndex));
 		if (cName != nullptr) {

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/collection.c

@@ -107,6 +107,7 @@ static void releaseCache(Item *item) {
 	if (item->handle != NULL) {
 		CacheRelease((CacheNode*)item->handle);
 		item->handle = NULL;
+		DataReset(&item->data); // data is not owned by the item
 	}
 }
 
@@ -1051,7 +1052,7 @@ static void* readFileVariable(
 
 		// Read the item header minus the last part of the structure 
 		// that may not always be included with every item.
-		if (fread(initial, initialSize, 1, handle->file) == 1) {
+		if ((!initialSize) || (fread(initial, initialSize, 1, handle->file) == 1)) {
 
 			// Calculate the number of bytes needed to store the item.
 			bytesNeeded = getFinalSize(initial);

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/component.c

@@ -55,11 +55,12 @@ fiftyoneDegreesString* fiftyoneDegreesComponentGetName(
 	fiftyoneDegreesComponent *component,
 	fiftyoneDegreesCollectionItem *item,
 	fiftyoneDegreesException *exception) {
-	return StringGet(
+	return &StoredBinaryValueGet(
 		stringsCollection, 
-		component->nameOffset, 
+		component->nameOffset,
+		FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING, // name is string
 		item,
-		exception);
+		exception)->stringValue;
 }
 
 const fiftyoneDegreesComponentKeyValuePair* 

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/constants.h

@@ -31,4 +31,14 @@
  */
 static const uint8_t fiftyoneDegreesIpAddressStringMaxLength = 50;
 
+/**
+ * The length for the buffer most WKT strings are expected to fit into.
+ */
+#define FIFTYONE_DEGREES_REASONABLE_WKT_STRING_LENGTH 128
+
+/**
+ * Max. number of decimal places to be printed for a double.
+ */
+#define FIFTYONE_DEGREES_MAX_DOUBLE_DECIMAL_PLACES 15
+
 #endif //FIFTYONE_DEGREES_CONSTANTS_H

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h

@@ -65,6 +65,7 @@
 #include "resource.h"
 #include "results.h"
 #include "status.h"
+#include "storedBinaryValue.h"
 #include "string.h"
 #include "property.h"
 #include "value.h"
@@ -73,7 +74,6 @@
 #include "tree.h"
 #include "ip.h"
 #include "float.h"
-#include "coordinate.h"
 #include "snprintf.h"
 #include "bool.h"
 #include "process.h"
@@ -144,8 +144,10 @@ MAP_TYPE(PropertiesGetMethod)
 MAP_TYPE(HeadersGetMethod)
 MAP_TYPE(DataSetInitFromFileMethod)
 MAP_TYPE(String)
-MAP_TYPE(StringFormat)
+MAP_TYPE(VarLengthByteArray)
+MAP_TYPE(StoredBinaryValue)
 MAP_TYPE(Property)
+MAP_TYPE(PropertyTypeRecord)
 MAP_TYPE(Component)
 MAP_TYPE(ComponentKeyValuePair)
 MAP_TYPE(Value)
@@ -157,6 +159,7 @@ MAP_TYPE(OverrideValueArray)
 MAP_TYPE(EvidenceKeyValuePair)
 MAP_TYPE(EvidenceKeyValuePairArray)
 MAP_TYPE(PropertyAvailable)
+MAP_TYPE(PropertyValueType)
 MAP_TYPE(PropertiesAvailable)
 MAP_TYPE(EvidencePropertyIndex)
 MAP_TYPE(EvidenceProperties)
@@ -173,7 +176,6 @@ MAP_TYPE(TreeRoot)
 MAP_TYPE(ProfileOffset)
 MAP_TYPE(ProfileIterateMethod)
 MAP_TYPE(Float)
-MAP_TYPE(Coordinate)
 MAP_TYPE(KeyValuePair)
 MAP_TYPE(HeaderID)
 MAP_TYPE(IndicesPropertyProfile)
@@ -188,6 +190,7 @@ MAP_TYPE(WkbtotResult)
 #define OverrideValuesAdd fiftyoneDegreesOverrideValuesAdd /**< Synonym for #fiftyoneDegreesOverrideValuesAdd function. */
 #define ExceptionGetMessage fiftyoneDegreesExceptionGetMessage /**< Synonym for #fiftyoneDegreesExceptionGetMessage function. */
 #define ProfileGetByProfileId fiftyoneDegreesProfileGetByProfileId /**< Synonym for #fiftyoneDegreesProfileGetByProfileId function. */
+#define ProfileGetByProfileIdIndirect fiftyoneDegreesProfileGetByProfileIdIndirect /**< Synonym for #fiftyoneDegreesProfileGetByProfileIdIndirect function. */
 #define ProfileGetByIndex fiftyoneDegreesProfileGetByIndex /**< Synonym for #fiftyoneDegreesProfileGetByIndex function. */
 #define OverridesAdd fiftyoneDegreesOverridesAdd /**< Synonym for #fiftyoneDegreesOverridesAdd function. */
 #define OverrideProfileIds fiftyoneDegreesOverrideProfileIds /**< Synonym for #fiftyoneDegreesOverrideProfileIds function. */
@@ -281,6 +284,11 @@ MAP_TYPE(WkbtotResult)
 #define MemoryStandardFreeAligned fiftyoneDegreesMemoryStandardFreeAligned /**< Synonym for #fiftyoneDegreesMemoryStandardFreeAligned function. */
 #define ResourceManagerFree fiftyoneDegreesResourceManagerFree /**< Synonym for #fiftyoneDegreesResourceManagerFree function. */
 #define StringGet fiftyoneDegreesStringGet /**< Synonym for #fiftyoneDegreesStringGet function. */
+#define StoredBinaryValueGet fiftyoneDegreesStoredBinaryValueGet /**< Synonym for #fiftyoneDegreesStoredBinaryValueGet function. */
+#define StoredBinaryValueCompareWithString fiftyoneDegreesStoredBinaryValueCompareWithString /**< Synonym for #fiftyoneDegreesStoredBinaryValueCompareWithString function. */
+#define StoredBinaryValueToIntOrDefault fiftyoneDegreesStoredBinaryValueToIntOrDefault /**< Synonym for #fiftyoneDegreesStoredBinaryValueToIntOrDefault function. */
+#define StoredBinaryValueToDoubleOrDefault fiftyoneDegreesStoredBinaryValueToDoubleOrDefault /**< Synonym for #fiftyoneDegreesStoredBinaryValueToDoubleOrDefault function. */
+#define StoredBinaryValueToBoolOrDefault fiftyoneDegreesStoredBinaryValueToBoolOrDefault /**< Synonym for #fiftyoneDegreesStoredBinaryValueToBoolOrDefault function. */
 #define EvidenceFree fiftyoneDegreesEvidenceFree /**< Synonym for #fiftyoneDegreesEvidenceFree function. */
 #define EvidenceCreate fiftyoneDegreesEvidenceCreate /**< Synonym for #fiftyoneDegreesEvidenceCreate function. */
 #define EvidenceMapPrefix fiftyoneDegreesEvidenceMapPrefix /**< Synonym for #fiftyoneDegreesEvidenceMapPrefix function. */
@@ -322,11 +330,17 @@ MAP_TYPE(WkbtotResult)
 #define HeadersIsHttp fiftyoneDegreesHeadersIsHttp /**< Synonym for #fiftyoneDegreesHeadersIsHttp function. */
 #define ListReset fiftyoneDegreesListReset /**< Synonym for #fiftyoneDegreesListReset function. */
 #define ListRelease fiftyoneDegreesListRelease /**< Synonym for #fiftyoneDegreesListRelease function. */
+#define ValueGetContent fiftyoneDegreesValueGetContent /**< Synonym for #fiftyoneDegreesValueGetContent function. */
 #define ValueGetName fiftyoneDegreesValueGetName /**< Synonym for #fiftyoneDegreesValueGetName function. */
 #define ValueGetByName fiftyoneDegreesValueGetByName /**< Synonym for #fiftyoneDegreesValueGetByName function. */
+#define ValueGetByNameAndType fiftyoneDegreesValueGetByNameAndType /**< Synonym for #fiftyoneDegreesValueGetByNameAndType function. */
+#define ValueGetIndexByName fiftyoneDegreesValueGetIndexByName /**< Synonym for #fiftyoneDegreesValueGetIndexByName function. */
+#define ValueGetIndexByNameAndType fiftyoneDegreesValueGetIndexByNameAndType /**< Synonym for #fiftyoneDegreesValueGetIndexByNameAndType function. */
 #define ValueGet fiftyoneDegreesValueGet /**< Synonym for #fiftyoneDegreesValueGet function. */
 #define CollectionBinarySearch fiftyoneDegreesCollectionBinarySearch /**< Synonym for #fiftyoneDegreesCollectionBinarySearch function. */
 #define PropertyGetName fiftyoneDegreesPropertyGetName /**< Synonym for #fiftyoneDegreesPropertyGetName function. */
+#define PropertyGetStoredType fiftyoneDegreesPropertyGetStoredType /**< Synonym for #fiftyoneDegreesPropertyGetStoredType function. */
+#define PropertyGetStoredTypeByIndex fiftyoneDegreesPropertyGetStoredTypeByIndex /**< Synonym for #fiftyoneDegreesPropertyGetStoredTypeByIndex function. */
 #define CollectionReadFileVariable fiftyoneDegreesCollectionReadFileVariable /**< Synonym for #fiftyoneDegreesCollectionReadFileVariable function. */
 #define PropertyGetByName fiftyoneDegreesPropertyGetByName /**< Synonym for #fiftyoneDegreesPropertyGetByName function. */
 #define ComponentGetKeyValuePair fiftyoneDegreesComponentGetKeyValuePair /**< Synonym for #fiftyoneDegreesComponentGetKeyValuePair function., */
@@ -364,12 +378,15 @@ MAP_TYPE(WkbtotResult)
 #define IpAddressParse fiftyoneDegreesIpAddressParse /**< Synonym for fiftyoneDegreesIpAddressParse */
 #define IpAddressesCompare fiftyoneDegreesIpAddressesCompare /**< Synonym for fiftyoneDegreesIpAddressesCompare */
 #define ConvertWkbToWkt fiftyoneDegreesConvertWkbToWkt /**< Synonym for fiftyoneDegreesConvertWkbToWkt */
+#define WriteWkbAsWktToStringBuilder fiftyoneDegreesWriteWkbAsWktToStringBuilder /**< Synonym for fiftyoneDegreesWriteWkbAsWktToStringBuilder */
 
 /* <-- only one asterisk to avoid inclusion in documentation
  * Shortened constants.
  */
 
-#define IpAddressStringMaxLength fiftyoneDegreesIpAddressStringMaxLength /**< Synonym for #fiftyoneDegreesIpAddressStringMaxLength macro. */
+#define IpAddressStringMaxLength fiftyoneDegreesIpAddressStringMaxLength /**< Synonym for #fiftyoneDegreesIpAddressStringMaxLength constant. */
+#define REASONABLE_WKT_STRING_LENGTH FIFTYONE_DEGREES_REASONABLE_WKT_STRING_LENGTH /**< Synonym for #FIFTYONE_DEGREES_REASONABLE_WKT_STRING_LENGTH constant macro. */
+#define MAX_DOUBLE_DECIMAL_PLACES FIFTYONE_DEGREES_MAX_DOUBLE_DECIMAL_PLACES /**< Synonym for #FIFTYONE_DEGREES_MAX_DOUBLE_DECIMAL_PLACES constant macro. */
 
 /* <-- only one asterisk to avoid inclusion in documentation
  * Shortened macros.
@@ -383,7 +400,6 @@ MAP_TYPE(WkbtotResult)
 #define EXCEPTION_THROW FIFTYONE_DEGREES_EXCEPTION_THROW /**< Synonym for #FIFTYONE_DEGREES_EXCEPTION_THROW macro. */
 #define EXCEPTION_CHECK FIFTYONE_DEGREES_EXCEPTION_CHECK /**< Synonym for #FIFTYONE_DEGREES_EXCEPTION_CHECK macro. */
 #define STRING FIFTYONE_DEGREES_STRING /**< Synonym for #FIFTYONE_DEGREES_STRING macro. */
-#define IP_ADDRESS FIFTYONE_DEGREES_IP_ADDRESS /**< Synonym for #FIFTYONE_DEGREES_IP_ADDRESS macro. */
 #define COLLECTION_RELEASE FIFTYONE_DEGREES_COLLECTION_RELEASE /**< Synonym for #FIFTYONE_DEGREES_COLLECTION_RELEASE macro. */
 #define FILE_MAX_PATH FIFTYONE_DEGREES_FILE_MAX_PATH /**< Synonym for #FIFTYONE_DEGREES_FILE_MAX_PATH macro. */
 #define THREAD_CREATE FIFTYONE_DEGREES_THREAD_CREATE /**< Synonym for #FIFTYONE_DEGREES_THREAD_CREATE macro. */
@@ -449,6 +465,7 @@ MAP_TYPE(WkbtotResult)
 #define DATA_FILE_NEEDS_UPDATED FIFTYONE_DEGREES_STATUS_DATA_FILE_NEEDS_UPDATED /**< Synonym for #FIFTYONE_DEGREES_STATUS_DATA_FILE_NEEDS_UPDATED status code. */
 #define INSUFFICIENT_CAPACITY FIFTYONE_DEGREES_STATUS_INSUFFICIENT_CAPACITY /**< Synonym for #FIFTYONE_DEGREES_STATUS_INSUFFICIENT_CAPACITY status code. */
 #define INVALID_INPUT FIFTYONE_DEGREES_STATUS_INVALID_INPUT /**< Synonym for #FIFTYONE_DEGREES_STATUS_INVALID_INPUT status code.*/
+#define UNSUPPORTED_STORED_VALUE_TYPE FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE /**< Synonym for #FIFTYONE_DEGREES_STATUS_UNSUPPORTED_STORED_VALUE_TYPE status code.*/
 #define IPV6_LENGTH FIFTYONE_DEGREES_IPV6_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV6_LENGTH status code.*/
 #define IPV4_LENGTH FIFTYONE_DEGREES_IPV4_LENGTH /**< Synonym for #FIFTYONE_DEGREES_IPV4_LENGTH status code.*/
 #define IP_TYPE_IPV4 FIFTYONE_DEGREES_IP_TYPE_IPV4 /**< Synonym for #FIFTYONE_DEGREES_IP_TYPE_IPV4 status code.*/

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/headers.c

@@ -121,11 +121,11 @@ static int countAllSegments(void* state, HeadersGetMethod get) {
 	Item item;
 	DataReset(&item.data);
 	while (get(state, index, &item) >= 0) {
-		name = STRING(item.data.ptr);
+		name = STRING(item.data.ptr); // header is string
 		if (isHeaderValid(name)) {
 
 			// Count the number of segments.
-			segments = countHeaderSegments(STRING(item.data.ptr));
+			segments = countHeaderSegments(STRING(item.data.ptr)); // header is string
 			count += segments;
 
 			// If there are more than one segment then this is a pseudo header 
@@ -272,7 +272,7 @@ static bool addHeadersFromDataSet(
 	// Loop through all the available headers in the data set adding those that
 	// are valid and unique to the headers collection.
 	while ((headerId = get(state, index++, &item)) >= 0) {
-		name = STRING(item.data.ptr);
+		name = STRING(item.data.ptr); // header is string
 		if (isHeaderValid(name) && isUnique(headers, name)) {
 
 			// Set the next header from the data set name item aborting if 

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/json.c

@@ -61,17 +61,40 @@ static void addStringEscape(
 	}
 }
 
-// Adds a string including surrounding double quotes and escaping special 
-// characters.
-static void addString(
-	fiftyoneDegreesJson* s,
-	const char* value,
-	size_t length) {
+/**
+ * Adds a binary including surrounding double quotes and escaping special
+ * characters.
+ * @param s fiftyoneDegreesJson to add to
+ * @param binaryValue pointer to raw bytes as stored in data file
+ * @param storedValueType format of byte array representation
+ */
+static void addValueContents(
+	fiftyoneDegreesJson * const s,
+	const StoredBinaryValue * const binaryValue,
+	const PropertyValueType storedValueType) {
+
+	Exception * const exception = s->exception;
 	StringBuilderAddChar(&s->builder, '\"');
-	addStringEscape(s, value, length);
+	if (storedValueType == FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING) {
+		addStringEscape(
+			s,
+			&binaryValue->stringValue.value,
+			binaryValue->stringValue.size - 1);
+	} else {
+		StringBuilderAddStringValue(
+			&s->builder,
+			binaryValue,
+			storedValueType,
+			MAX_DOUBLE_DECIMAL_PLACES,
+			s->exception);
+		if (EXCEPTION_FAILED) {
+			return;
+		}
+	}
 	StringBuilderAddChar(&s->builder, '\"');
 }
 
+
 // Adds a comma separator.
 static void addSeparator(fiftyoneDegreesJson* s) {
 	StringBuilderAddChar(&s->builder, ',');
@@ -92,7 +115,7 @@ void fiftyoneDegreesJsonPropertySeparator(fiftyoneDegreesJson* s) {
 }
 
 void fiftyoneDegreesJsonPropertyStart(fiftyoneDegreesJson* s) {
-	fiftyoneDegreesString* name;
+	fiftyoneDegreesStoredBinaryValue* name;
 	fiftyoneDegreesCollectionItem stringItem;
 	fiftyoneDegreesException* exception = s->exception;
 
@@ -105,17 +128,20 @@ void fiftyoneDegreesJsonPropertyStart(fiftyoneDegreesJson* s) {
 
 	// Get the property name as a string.
 	fiftyoneDegreesDataReset(&stringItem.data);
-	name = fiftyoneDegreesStringGet(
+	name = fiftyoneDegreesStoredBinaryValueGet(
 		s->strings,
 		s->property->nameOffset,
+		FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING, // name is string
 		&stringItem,
 		exception);
 	if (name != NULL && FIFTYONE_DEGREES_EXCEPTION_OKAY) {
 
-		// Add the property name to the JSON buffer considering whether 
+		// Add the property name to the JSON buffer considering whether
 		// it's a list or single value property.
-		const char* value = FIFTYONE_DEGREES_STRING(name);
-		addString(s, value, strlen(value));
+		addValueContents(
+			s,
+			name,
+			FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING); // name is string
 		StringBuilderAddChar(&s->builder, ':');
 		if (s->property->isList) {
 			StringBuilderAddChar(&s->builder, '[');
@@ -139,8 +165,8 @@ void fiftyoneDegreesJsonPropertyEnd(fiftyoneDegreesJson* s) {
 }
 
 void fiftyoneDegreesJsonPropertyValues(fiftyoneDegreesJson* s) {
-	const char* value;
-	fiftyoneDegreesException* exception = s->exception;
+	const StoredBinaryValue* value;
+	fiftyoneDegreesException * const exception = s->exception;
 
 	// Check that the values is populated.
 	if (s->values == NULL) {
@@ -153,10 +179,15 @@ void fiftyoneDegreesJsonPropertyValues(fiftyoneDegreesJson* s) {
 		if (i > 0) {
 			addSeparator(s);
 		}
-		value = FIFTYONE_DEGREES_STRING(
-			(fiftyoneDegreesString*)s->values->items[i].data.ptr);
+		value = (StoredBinaryValue*)s->values->items[i].data.ptr;
 		if (value != NULL) {
-			addString(s, value, strlen(value));
+			addValueContents(
+				s,
+				value,
+				s->storedPropertyType);
+			if (EXCEPTION_FAILED) {
+				return;
+			}
 		}
 	}
 }

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/json.h

@@ -82,6 +82,7 @@ typedef struct fiftyone_degrees_json {
 	fiftyoneDegreesProperty* property; /**< The property being added */
 	fiftyoneDegreesList* values; /**< The values for the property */
 	fiftyoneDegreesException* exception; /**< Exception */
+	fiftyoneDegreesPropertyValueType storedPropertyType; /**< Stored type of the values for the property */
 } fiftyoneDegreesJson;
 
 /**

{fiftyone_devicedetection_onpremise-4.5.0a26 → fiftyone_devicedetection_onpremise-4.5.0a28}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/overrides.c

@@ -127,7 +127,7 @@ static int getRequiredPropertyIndexFromName(
 	// being overridden.
 	for (i = 0; i < properties->count; i++) {
 		property = &properties->items[i];
-		current = STRING(property->available->name.data.ptr);
+		current = STRING(property->available->name.data.ptr); // name is string
 		if (StringCompare((char*)current, (char*)name) == 0) {
 			return property->requiredPropertyIndex;
 		}