Update with new agent function prototype, and formatting error

diff --git a/doc/agent/server.html b/doc/agent/server.html
index 8ce51dd..df81774 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -18,7 +18,6 @@
         <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><method name="Variant"><arg type="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" 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>';
-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="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" 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";
 }
@@ -28,7 +27,7 @@ function logCB(result) {
 }
 
 function errorCB(error) {
-  cloudeebus.log(error.desc ? error.desc : error);
+  cloudeebus.log(cloudeebus.getError(error));
 }
 
 sampleObjectHandler = {
@@ -81,14 +80,13 @@ sampleObjectHandler2 = {
 };
 
 function addAgents(service) {
-  var agentName = "/org/cloudeebus/Sample"; // = DBUS object name
-  cloudeebus.log("Adding agent " + agentName + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler");
-  cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, sampleObjectHandler, logCB, errorCB);
+  var agent1 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
+  cloudeebus.log("Adding agent " + agent1.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler");
+  service.addAgent(agent1, logCB, errorCB);
   
-  // adding another agent using parameter 'service'
-  agentName = agentName +"2";
-  cloudeebus.log("Adding agent " + agentName + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler2'");
-  service.addAgent(agentName, sampleXml, sampleObjectHandler2, logCB, errorCB);
+  var agent2 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample2", sampleObjectHandler2, sampleXml);
+  cloudeebus.log("Adding agent " + agent2.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler2");
+  service.addAgent(agent2, logCB, errorCB);
 }
 
 function connectSuccess() {