[dss-commits] digitalSTROM Server branch, master, updated. 8f1dcc572f7b3e0880e7b4bde854a7f2d08bfcba

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  8f1dcc572f7b3e0880e7b4bde854a7f2d08bfcba (commit)
       via  1cdf549aa38d94bf4b7a1580870e2318c3a1903a (commit)
      from  eb7d1b50ef45d83196ccad9c9c71ed2520decf62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f1dcc572f7b3e0880e7b4bde854a7f2d08bfcba
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date:   Fri Jan 8 10:59:40 2010 +0100

    Updated websrc to track latest master

commit 1cdf549aa38d94bf4b7a1580870e2318c3a1903a
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date:   Fri Jan 8 10:59:06 2010 +0100

    Fixed apartment/getCircuits JSON result

-----------------------------------------------------------------------

Changes:
diff --git a/core/web/webrequests.cpp b/core/web/webrequests.cpp
index eb1d832..218b381 100644
--- a/core/web/webrequests.cpp
+++ b/core/web/webrequests.cpp
@@ -303,12 +303,13 @@ namespace dss {
 */
       } else if(_request.getMethod() == "getCircuits") {
         boost::shared_ptr<JSONObject> resultObj(new JSONObject());
-        boost::shared_ptr<JSONArrayBase> circuits;
+        boost::shared_ptr<JSONArrayBase> circuits(new JSONArrayBase());
 
-        resultObj->addProperty("circuits", circuits);
+        resultObj->addElement("circuits", circuits);
         vector<DSMeter*>& dsMeters = getDSS().getApartment().getDSMeters();
         foreach(DSMeter* dsMeter, dsMeters) {
           boost::shared_ptr<JSONObject> circuit(new JSONObject());
+          circuits->addElement("", circuit);
           circuit->addProperty("name", dsMeter->getName());
           circuit->addProperty("dsid", dsMeter->getDSID().toString());
           circuit->addProperty("busid", dsMeter->getBusID());
diff --git a/websrc b/websrc
index 2370d8c..cf7f68d 160000
--- a/websrc
+++ b/websrc
@@ -1 +1 @@
-Subproject commit 2370d8cceb6aad46e2668a95f7f1409f6c85017a
+Subproject commit cf7f68d2d7d589926b333eab8e34203ed7e88c75


hooks/post-receive
-- 
digitalSTROM Server