Merge pull request #485 from fledge-iot/1.9.2RC

1.9.2RC

.gitignore

@@ -8,6 +8,7 @@
 
 # IDE
 *.idea
+.vscode/
 
 # Data / cache files
 data/etc/storage.json

C/common/datapoint.cpp

@@ -82,7 +82,7 @@ std::string DatapointValue::toString() const
 	case T_STRING:
 	default:
 		ss << "\"";
-		ss << *m_value.str;
+		ss << escape(*m_value.str);
 		ss << "\"";
 		return ss.str();
 	}
@@ -208,3 +208,38 @@ DatapointValue& DatapointValue::operator=(const DatapointValue& rhs)
 
 	return *this;
 }
+
+/**
+ * Escape quotes etc to allow the string to be a property value within
+ * a JSON document
+ *
+ * @param str	The string to escape
+ * @return The escaped string
+ */
+const std::string DatapointValue::escape(const std::string& str) const
+{
+std::string rval;
+int bscount = 0;
+
+	for (size_t i = 0; i < str.length(); i++)
+	{
+		if (str[i] == '\\')
+		{
+			bscount++;
+		}
+		else if (str[i] == '\"')
+		{
+			if ((bscount & 1) == 0)	// not already escaped
+			{
+				rval += "\\";	// Add escape of "
+			}
+			bscount = 0;
+		}
+		else
+		{
+			bscount = 0;
+		}
+		rval += str[i];
+	}
+	return rval;
+}

C/common/include/config_category.h

@@ -84,6 +84,10 @@ class ConfigCategory {
 		void				setDescription(const std::string& description);
 		std::string                     getName() const { return m_name; };
 		std::string                     getDescription() const { return m_description; };
+
+		std::string                     getDisplayName() const { return m_displayName; };
+		void                            setDisplayName(const std::string& displayName) {m_displayName = displayName;};
+
 		unsigned int			getCount() const { return m_items.size(); };
 		bool				itemExists(const std::string& name) const;
 		bool				setItemDisplayName(const std::string& name, const std::string& displayName);
@@ -159,6 +163,7 @@ class ConfigCategory {
 		std::vector<CategoryItem *>	m_items;
 		std::string			m_name;
 		std::string			m_description;
+		std::string			m_displayName;
 
 	public:
 		using iterator = std::vector<CategoryItem *>::iterator;

C/common/include/datapoint.h

@@ -175,6 +175,7 @@ class DatapointValue {
 
 	private:
 		void deleteNestedDPV();
+		const std::string	escape(const std::string& str) const;
 		union data_t {
 			std::string*		str;
 			long			i;

C/common/include/management_client.h

@@ -75,8 +75,12 @@ class ManagementClient {
                                 std::ostringstream payload;
                                 payload << "{ \"key\" : \"" << JSONescape(t.getName());
                                 payload << "\", \"description\" : \"" << JSONescape(t.getDescription());
+                                if (! t.getDisplayName().empty() ) {
+                                	payload << "\", \"display_name\" : \"" << JSONescape(t.getDisplayName());
+                                }
                                 payload << "\", \"value\" : " << t.itemsToJSON();
 
+
 				/**
 				 * Note:
 				 * At the time being the keep_original_items is added into payload

C/common/include/reading.h

@@ -65,7 +65,7 @@ class Reading {
 		void				setUserTimestamp(const std::string& timestamp);
 		void				getUserTimestamp(struct timeval *tm) { *tm = m_userTimestamp; };
 
-		typedef enum dateTimeFormat { FMT_DEFAULT, FMT_STANDARD, FMT_ISO8601 } readingTimeFormat;
+		typedef enum dateTimeFormat { FMT_DEFAULT, FMT_STANDARD, FMT_ISO8601, FMT_ISO8601MS } readingTimeFormat;
 
 		// Return Reading asset time - ts time
 		const std::string getAssetDateTime(readingTimeFormat datetimeFmt = FMT_DEFAULT, bool addMs = true) const;
@@ -76,6 +76,7 @@ class Reading {
 		Reading() {};
 		Reading&			operator=(Reading const&);
 		void				stringToTimestamp(const std::string& timestamp, struct timeval *ts);
+		const std::string		escape(const std::string& str) const;
 		unsigned long			m_id;
 		bool				m_has_id;
 		std::string			m_asset;

C/common/include/reading_set.h

@@ -42,6 +42,7 @@ class ReadingSet {
 
 		// Return the reading id of the last  data element
 		unsigned long			getLastId() const { return m_last_id; };
+		unsigned long			getReadingId(uint32_t pos);
 		void				append(ReadingSet *);
 		void				append(ReadingSet&);
 		void				append(const std::vector<Reading *> &);

C/common/include/string_utils.h

@@ -31,6 +31,7 @@ std::string extractLastLevel(const std::string& path, char separator);
 void   StringStripCRLF(std::string& StringToManage);
 string StringStripWhiteSpacesAll(const std::string& original);
 string StringStripWhiteSpacesExtra(const  std::string& original);
+void StringStripQuotes(std::string& StringToManage);
 
 string urlEncode(const string& s);
 string urlDecode(const string& s);

C/common/include/where.h

@@ -13,6 +13,8 @@
 #include <vector>
 
 typedef enum Conditional {
+	Older,
+	Newer,
 	Equals,
 	NotEquals,
 	GreaterThan,

C/common/reading.cpp

@@ -21,7 +21,8 @@ using namespace std;
 std::vector<std::string> Reading::m_dateTypes = {
 	DEFAULT_DATE_TIME_FORMAT,
 	COMBINED_DATE_STANDARD_FORMAT,
-	ISO8601_DATE_TIME_FORMAT
+	ISO8601_DATE_TIME_FORMAT,
+	ISO8601_DATE_TIME_FORMAT	// Version with milliseconds
 };
 
 /**
@@ -174,7 +175,7 @@ string Reading::toJSON(bool minimal) const
 ostringstream convert;
 
 	convert << "{\"asset_code\":\"";
-	convert << m_asset;
+	convert << escape(m_asset);
 	convert << "\",\"user_ts\":\"";
 
 	// Add date_time with microseconds + timezone UTC:
@@ -233,7 +234,7 @@ const string Reading::getAssetDateTime(readingTimeFormat dateFormat, bool addMS)
 {
 char date_time[DATE_TIME_BUFFER_LEN];
 char micro_s[10];
-ostringstream assetTime;
+char  assetTime[DATE_TIME_BUFFER_LEN + 20];
 
         // Populate tm structure
         struct tm timeinfo;
@@ -259,9 +260,20 @@ ostringstream assetTime;
 			 m_timestamp.tv_usec);
 
 		// Add date_time + microseconds
-		assetTime << date_time << micro_s;
-
-		return assetTime.str();
+		if (dateFormat != FMT_ISO8601MS)
+		{
+			snprintf(assetTime, sizeof(assetTime), "%s%s", date_time, micro_s);
+		}
+		else
+		{
+			string dt(date_time);
+			size_t pos = dt.find_first_of("+");
+			pos--;
+			snprintf(assetTime, sizeof(assetTime), "%s%s%s",
+					dt.substr(0, pos).c_str(),
+				       	micro_s, dt.substr(pos).c_str());
+		}
+		return string(assetTime);
 	}
 	else
 	{
@@ -279,6 +291,7 @@ const string Reading::getAssetDateUserTime(readingTimeFormat dateFormat, bool ad
 {
 	char date_time[DATE_TIME_BUFFER_LEN+10];
 	char micro_s[10];
+	char  assetTime[DATE_TIME_BUFFER_LEN + 20];
 
 	// Populate tm structure with UTC time
 	struct tm timeinfo;
@@ -299,13 +312,25 @@ const string Reading::getAssetDateUserTime(readingTimeFormat dateFormat, bool ad
 	{
 		// Add microseconds
 		snprintf(micro_s,
-				 sizeof(micro_s),
-				 ".%06lu",
-				 m_userTimestamp.tv_usec);
-
-		strcat(date_time,micro_s);
+			 sizeof(micro_s),
+			 ".%06lu",
+			 m_userTimestamp.tv_usec);
 
-		return string(date_time);
+		// Add date_time + microseconds
+		if (dateFormat != FMT_ISO8601MS)
+		{
+			snprintf(assetTime, sizeof(assetTime), "%s%s", date_time, micro_s);
+		}
+		else
+		{
+			string dt(date_time);
+			size_t pos = dt.find_first_of("+");
+			pos--;
+			snprintf(assetTime, sizeof(assetTime), "%s%s%s",
+					dt.substr(0, pos).c_str(),
+				       	micro_s, dt.substr(pos).c_str());
+		}
+		return string(assetTime);
 	}
 	else
 	{
@@ -394,4 +419,40 @@ void Reading::stringToTimestamp(const string& timestamp, struct timeval *ts)
 		sscanf(ptr, "%02d:%02d", &h, &m);
 		ts->tv_sec += sign * ((3600 * h) + (60 * m));
 	}
+
+}
+
+/**
+ * Escape quotes etc to allow the string to be a property value within
+ * a JSON document
+ *
+ * @param str	The string to escape
+ * @return The escaped string
+ */
+const string Reading::escape(const string& str) const
+{
+string rval;
+int bscount = 0;
+
+	for (size_t i = 0; i < str.length(); i++)
+	{
+		if (str[i] == '\\')
+		{
+			bscount++;
+		}
+		else if (str[i] == '\"')
+		{
+			if ((bscount & 1) == 0)	// not already escaped
+			{
+				rval += "\\";	// Add escape of "
+			}
+			bscount = 0;
+		}
+		else
+		{
+			bscount = 0;
+		}
+		rval += str[i];
+	}
+	return rval;
 }

C/common/reading_set.cpp

@@ -35,7 +35,7 @@ const vector<string> JSON_characters_to_be_escaped = {
 /**
  * Construct an empty reading set
  */
-ReadingSet::ReadingSet() : m_count(0)
+ReadingSet::ReadingSet() : m_count(0), m_last_id(0)
 {
 }
 
@@ -47,11 +47,13 @@ ReadingSet::ReadingSet() : m_count(0)
  *			of readings to be copied
  *			into m_readings vector
  */
-ReadingSet::ReadingSet(vector<Reading *>* readings)
+ReadingSet::ReadingSet(vector<Reading *>* readings) : m_last_id(0)
 {
 	m_count = readings->size();
 	for (auto it = readings->begin(); it != readings->end(); ++it)
 	{
+		if ((*it)->getId() > m_last_id)
+			m_last_id = (*it)->getId();
 		m_readings.push_back(*it);
 	}
 }
@@ -62,7 +64,7 @@ ReadingSet::ReadingSet(vector<Reading *>* readings)
  *
  * @param json	The JSON document (as string) with readings data
  */
-ReadingSet::ReadingSet(const std::string& json)
+ReadingSet::ReadingSet(const std::string& json) : m_last_id(0)
 {
 	unsigned long rows = 0;
 	Document doc;
@@ -181,6 +183,8 @@ ReadingSet::append(const vector<Reading *>& readings)
 {
 	for (auto it = readings.cbegin(); it != readings.cend(); it++)
 	{
+		if ((*it)->getId() > m_last_id)
+			m_last_id = (*it)->getId();
 		m_readings.push_back(*it);
 		m_count++;
 	}
@@ -209,6 +213,21 @@ ReadingSet::clear()
 	m_readings.clear();
 }
 
+/**
+ * Return the ID of the nth reading in the reading set
+ *
+ * @param pos	The position of the reading to return the ID for
+ */
+unsigned long ReadingSet::getReadingId(uint32_t pos)
+{
+	if (pos < m_readings.size())
+	{
+		Reading *reading = m_readings[pos];
+		return reading->getId();
+	}
+	return m_last_id;
+}
+
 /**
  * Construct a reading from a JSON document
  *

C/common/string_utils.cpp

@@ -158,7 +158,7 @@ std::string StringSlashFix(const std::string& stringToFix)
 }
 
 /**
- * Strips Line feed and carige return
+ * Strips Line feed and carriage return
  *
  */
 void StringStripCRLF(std::string& StringToManage)
@@ -179,6 +179,18 @@ void StringStripCRLF(std::string& StringToManage)
 
 }
 
+/**
+ * Stripes " from the string
+ *
+ */
+void StringStripQuotes(std::string& StringToManage)
+{
+	if ( ! StringToManage.empty())
+	{
+		StringReplaceAll(StringToManage, "\"", "");
+	}
+}
+
 /**
  * Removes all the white spaces from a string
  *

C/common/where.cpp

@@ -40,6 +40,12 @@ ostringstream json;
 	json << "\"condition\" : \"";
 	switch (m_condition)
 	{
+	case Older:
+		json << "older";
+		break;
+	case Newer:
+		json << "newer";
+		break;
 	case Equals:
 		json << "=";
 		break;
@@ -58,7 +64,12 @@ ostringstream json;
 	}
 	json << "\", ";
 
-	if (m_condition != In)
+	if ( (m_condition == Older) || (m_condition == Newer) )
+	{
+		json << "\"value\" : " << m_value << "";
+
+	}
+	else if (m_condition != In)
 	{
 		json << "\"value\" : \"" << m_value << "\"";
 	}