[Openautomation-svn] SF.net SVN: openautomation:[1410] CometVisu/trunk/visu

[<pe...@us...>]

Revision: 1410
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1410&view=rev
Author:   peuter
Date:     2013-02-04 14:54:16 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
some fixes for the openhab backend

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/transforms/transform_oh.js

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2013-02-03 23:03:07 UTC (rev 1409)
+++ CometVisu/trunk/visu/lib/templateengine.js	2013-02-04 14:54:16 UTC (rev 1410)
@@ -87,6 +87,10 @@
   }
 
   this.initBackendClient = function() {
+	if (thisTemplateEngine.backend=="oh") {
+		// the path to the openHAB cometvisu backend is cv 
+		thisTemplateEngine.backend = "cv";
+	}
     thisTemplateEngine.backend = '/' + thisTemplateEngine.backend + '/';
     thisTemplateEngine.visu = new CometVisu(thisTemplateEngine.backend);
     thisTemplateEngine.visu.update = function(json) { // overload the handler
@@ -384,7 +388,7 @@
     predefinedDesign = $('pages', xml).attr("design");
 
     if ($('pages', xml).attr("backend")) {
-      backend = $('pages', xml).attr("backend");
+      thisTemplateEngine.backend = $('pages', xml).attr("backend");
     }
     thisTemplateEngine.initBackendClient();
 

Modified: CometVisu/trunk/visu/transforms/transform_oh.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_oh.js	2013-02-03 23:03:07 UTC (rev 1409)
+++ CometVisu/trunk/visu/transforms/transform_oh.js	2013-02-04 14:54:16 UTC (rev 1410)
@@ -41,38 +41,27 @@
   'rollershutter' : {
     name : "OH_RollerShutter",
     encode : function(phy) {
-      if (phy == 1)
-        return 'DOWN';
-      else if (phy == 0)
-        return 'UP';
-      else
-        return phy;
+      if (phy == 1) return 'DOWN';
+      else if (phy == 0)  return 'UP';
+      else return phy;
     },
     decode : function(str) {
-      if (str == "NaN" || str == 'Uninitialized')
-        return 0;
-      else if (str == "UP")
-        return 0;
-      else if (str == "DOWN")
-        return 1;
-      else
-        return str;
+      if (str=="NaN" || str=='Uninitialized') return 0;
+      else if (str=="UP") return 0;
+      else if (str=="DOWN") return 1;
+      else return str;
     },
   },
   'dimmer' : {
     name : "OH_Dimmer",
     encode : function(phy) {
-      return parseInt(phy);
+      return parseInt(phy);  
     },
     decode : function(str) {
-      if (str == "NaN" || str == 'Uninitialized')
-        return 0;
-      else if (str == "ON")
-        return 100;
-      else if (str == "OFF")
-        return 0;
-      else
-        return parseInt(str);
+      if (str=="NaN" || str=='Uninitialized') return 0;
+      else if (str=="ON") return 100;
+      else if (str=="OFF") return 0;
+      else return parseInt(str);
     },
   },
   'number' : {
@@ -81,8 +70,7 @@
       return parseFloat(phy);
     },
     decode : function(str) {
-      if (str == "NaN" || str == 'Uninitialized')
-        return 0;
+      if (str=="NaN" || str=='Uninitialized') return 0;
       return parseFloat(str);
     },
   },

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.