Changeset 14540 for trunk/FACT++/src/InterpreterV8.cc

Timestamp:

10/30/12 12:52:15 (12 years ago)

Author:

tbretz

Message:

Use State in JsState and added 'time' to the data members. Make sure there is no crash if an mpty event was received. Added 'size' to service objects.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (3 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -222 +222 @@
     const String::Utf8Value str(args[0]);
 
-    const pair<int32_t, string> rc = JsState(*str);
+    const State rc = JsState(*str);
+
+    //if (rc.first<=-256)
+    //    return Undefined();
 
     Handle<ObjectTemplate> obj = ObjectTemplate::New();
 
-    obj->Set(String::New("index"), rc.first<=-256?Undefined():Integer::New(rc.first),         ReadOnly);
-    obj->Set(String::New("name"),  rc.first<=-256?Undefined():String::New(rc.second.c_str()), ReadOnly);
-    //obj->Set(String::New("toString"),  String::New(("[Object state "+string(*str)+"]").c_str()), ReadOnly);
+    obj->Set(String::New("index"), rc.index<=-256?Undefined():Integer::New(rc.index),       ReadOnly);
+    obj->Set(String::New("name"),  rc.index<=-256?Undefined():String::New(rc.name.c_str()), ReadOnly);
+    obj->Set(String::New("time"),  Date::New(rc.time.JavaDate()),                           ReadOnly);
+    //obj->Set(String::New("toString"),  String::New(("[Object state "+string(*str)+":"+to_string(rc.index)+"]").c_str()));
 
     return handle_scope.Close(obj->NewInstance());
@@ -588 +592 @@
     ret->Set(String::New("counter"), Integer::New(p.first), ReadOnly);
     ret->Set(String::New("time"),    Date::New(evt->GetJavaDate()), ReadOnly);
-    ret->Set(String::New("qos"),     Integer::New(evt->GetQoS()), ReadOnly);
+    ret->Set(String::New("qos"),     Integer::New(evt->GetQoS()),   ReadOnly);
+    ret->Set(String::New("size"),    Integer::New(evt->GetSize()),  ReadOnly);
 
     typedef boost::char_separator<char> separator;
@@ -603 +608 @@
         for (auto it=tok.begin(); it!=tok.end(); it++, pos++)
         {
+            if (ptr>=evt->GetText())
+                return handle_scope.Close(ret);
+
             char type = (*it)[0];
             it++;