projects / contrib / cloudeebus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5e30dd)
Bug fix of dbus dictionary (interpreted as block code by eval in javascript)
authorFrederic PAUT <frederic.paut@linux.intel.com>
Tue, 14 May 2013 14:58:04 +0000 (16:58 +0200)
committerFrederic PAUT <frederic.paut@linux.intel.com>
Tue, 14 May 2013 14:58:04 +0000 (16:58 +0200)
Adding div function as sample code using floating type

cloudeebus/cloudeebus.js patch | blob | history
doc/agent/client.html patch | blob | history
doc/agent/server.html patch | blob | history

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 8e911b3..64a4a9f 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -246,8 +246,9 @@ cloudeebus.Service.prototype._addMethod = function(objectPath, ifName, method, o
                objectJS.wrapperFunc[method] = function() {
                        var result;
                        var methodId = arguments[0];
-                       var callDict = JSON.parse(arguments[1]);
                        try {
+                               // affectation of callDict in eval, otherwise dictionary(='{}') interpreted as block of code by eval
+                               eval("var callDict = " + arguments[1]);
                                result = funcToCall.apply(objectJS, callDict.args);
                                service._returnMethod(methodId, callDict.callIndex, true, result);
                        }
diff --git a/doc/agent/client.html b/doc/agent/client.html
index 1686eed..1b9b8a3 100644 (file)
--- a/doc/agent/client.html
+++ b/doc/agent/client.html
@@ -40,18 +40,25 @@ function errorCB(error) {
   cloudeebus.log(error.desc ? error.desc : error);
 }
 
-function gotAddResult(aSum) {
-  cloudeebus.log("gotAddResult: " + aSum);
+function gotDivResult(result) {
+  cloudeebus.log("gotDivResult: " + result);
 //  sampleProxy.Release();
 }
 
-function signalHandler(aSum) {
-  cloudeebus.log("signal 'ResultChanged': " + aSum);
+function gotAddResult(result) {
+  cloudeebus.log("gotAddResult: " + result);
+  logCB('Divide by 3.33');
+  sampleProxy.Div(result,3.33,gotDivResult,errorCB);
+}
+
+function signalHandler(result) {
+  cloudeebus.log("signal 'ResultChanged': " + result);
 }
 
 function gotProxy(proxy) {
   logCB(proxy);
   proxy.connectToSignal("org.cloudeebus.Sample1", "ResultChanged", signalHandler);
+  logCB('Addition');
   for (var i=-10; i<10; i++)
     proxy.Add(i,i*2,gotAddResult,errorCB);
   sampleProxy = proxy;
diff --git a/doc/agent/server.html b/doc/agent/server.html
index bfc6d6f..4351c27 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -17,7 +17,7 @@
    <body>
         <center><h1>cloudeebus</h1></center>
         <br>
-               <textarea style="width:80%" rows="32" id="script">var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="i" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method></interface></node>';
+               <textarea style="width:80%" rows="32" id="script">var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Variant"><arg type="d" name="arg1"/><arg type="d" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="d" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" name="result" direction="out"/></method></interface></node>';
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
 }
@@ -35,6 +35,9 @@ sampleObjectHandler = {
     this.ResultChanged(a+b);
     return a+b;
   }, 
+  Variant: function(a) {
+    return a;
+  }, 
   Release: function() {
     cloudeebus.SessionBus().service.delAgent("/org/cloudeebus/Sample", logCB, errorCB);
     cloudeebus.SessionBus().service.remove(logCB, errorCB);
@@ -42,6 +45,7 @@ sampleObjectHandler = {
   interfaceProxies : {
     "org.cloudeebus.Sample2" : {
       Div: function(a,b) {
+       this.ResultChanged(a/b);
         return a/b;
       } 
     }
@@ -71,9 +75,6 @@ sampleObjectHandler2 = {
 function serviceAdded(service) {
   var agentName = "/org/cloudeebus/Sample"; // = DBUS object name
   cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, sampleObjectHandler, logCB, errorCB);
-  
-  agentName = agentName + "2";
-  cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, sampleObjectHandler2, logCB, errorCB);
 }
 
 function connectSuccess() {
Domain: Service Framework / Uncategorized;