Fixed json mapping

Author: wsobel

schemas/MTConnectAssets_2.1.xsd

@@ -181,7 +181,7 @@ namespace mtconnect {
           if (it->get() == old.get())
           {
             *it = xform;
-            for (auto nxt = old->m_next.begin(); it != old->m_next.end(); it++)
+            for (auto nxt = old->m_next.begin(); nxt != old->m_next.end(); nxt++)
             {
               xform->bind(*nxt);
             }
@@ -196,7 +196,7 @@ namespace mtconnect {
           if (it->get() == old.get())
           {
             m_next.erase(it);
-            for (auto nxt = old->m_next.begin(); it != old->m_next.end(); it++)
+            for (auto nxt = old->m_next.begin(); nxt != old->m_next.end(); nxt++)
             {
               bind(*nxt);
             }

schemas/MTConnectAssets_2.1_1.0.xsd

@@ -395,7 +395,8 @@ namespace mtconnect::ruby {
           [](mrb_state *mrb, mrb_value self) {
             auto entity = MRubySharedPtr<Entity>::unwrap(self);
             const char *key;
-            mrb_get_args(mrb, "s", &key);
+            
+            mrb_get_args(mrb, "z", &key);
 
             auto props = entity->getProperties();
             auto it = props.find(key);
@@ -411,7 +412,7 @@ namespace mtconnect::ruby {
             auto entity = MRubySharedPtr<Entity>::unwrap(self);
             const char *key;
             mrb_value value;
-            mrb_get_args(mrb, "so", &key, &value);
+            mrb_get_args(mrb, "zo", &key, &value);
 
             entity->setProperty(key, valueFromRuby(mrb, value));
 

schemas/MTConnectDevices_2.1.xsd

@@ -63,10 +63,22 @@ namespace mtconnect::ruby {
   inline Timestamp timestampFromRuby(mrb_state *mrb, mrb_value value)
   {
     using namespace std::chrono;
-
-    auto tm = static_cast<mrb_time *>(DATA_PTR(value));
-    auto dur = duration_cast<microseconds>(seconds {tm->sec} + microseconds {tm->usec});
-    return time_point<system_clock> {duration_cast<system_clock::duration>(dur)};
+    if (mrb_string_p(value))
+    {
+      auto text = std::string(mrb_str_to_cstr(mrb, value));
+      return parseTimestamp(text);
+    }
+    auto dp = DATA_TYPE(value);
+    if (strncmp(dp->struct_name, "Time", 4) == 0)
+    {
+      auto tm = static_cast<mrb_time *>(DATA_PTR(value));
+      auto dur = duration_cast<microseconds>(seconds {tm->sec} + microseconds {tm->usec});
+      return time_point<system_clock> {duration_cast<system_clock::duration>(dur)};      
+    }
+    else
+    {
+      return Timestamp();
+    }
   }
 
   inline mrb_value toRuby(mrb_state *mrb, const Timestamp &ts)

schemas/MTConnectDevices_2.1_1.0.xsd

@@ -74,6 +74,9 @@ typedef unsigned __int64 uint64_t;
 #include <boost/property_tree/ptree.hpp>
 #include <boost/regex.hpp>
 
+#include <date/date.h>
+#include <chrono>
+
 #include <version.h>
 
 //####### CONSTANTS #######
@@ -576,6 +579,24 @@ namespace mtconnect {
 
     return camel;
   }
+  
+  inline Timestamp parseTimestamp(const std::string &timestamp)
+  {
+    using namespace date;
+    using namespace std::chrono;
+    using namespace std::chrono_literals;
+    using namespace date::literals;
+    
+    Timestamp ts;
+    std::istringstream in(timestamp);
+    in >> std::setw(6) >> parse("%FT%T", ts);
+    if (!in.good())
+    {
+      ts = std::chrono::system_clock::now();
+    }
+    return ts;
+  }
+
 
 #define SCHEMA_VERSION(major, minor) (major * 100 + minor)