A rework of emoncms focusing on an improved timestore based native fe…

…ed engine and new nodes and inputs inerfaces

.gitignore

@@ -3,7 +3,6 @@ settings.php
 Modules/sync
 Modules/event
 Modules/energyaudit
-Modules/node
 Modules/auto
 Modules/energy
 Modules/energyform

Modules/feed/engine/PHPFina.php

@@ -100,6 +100,8 @@ public function post($id,$timestamp,$value)
 
         $meta->npoints = $pos + 1;
         $this->set_meta($id,$meta);
+
+        return $value;
     }
 
     /**
@@ -109,9 +111,51 @@ public function post($id,$timestamp,$value)
      * @param integer $time The unix timestamp of the data point, in seconds
      * @param float $value The value of the data point
     */
-    public function update($feedid,$time,$value)
+    public function update($id,$timestamp,$value)
     {
-
+        $id = (int) $id;
+        $timestamp = (int) $timestamp;
+        $value = (float) $value;
+
+        // If meta data file does not exist then exit
+        if (!$meta = $this->get_meta($id)) return false;
+
+        // Calculate interval that this datapoint belongs too
+        $timestamp = floor($timestamp / $meta->interval) * $meta->interval;
+
+        // If this is a new feed (npoints == 0) then set the start time to the current datapoint
+        if ($meta->npoints == 0) {
+            $meta->start_time = $timestamp;
+        }
+
+        if ($timestamp < $meta->start_time) {
+            return false; // in the past
+        }	
+
+        // Calculate position in base data file of datapoint
+        $pos = floor(($timestamp - $meta->start_time) / $meta->interval);
+
+        $last_pos = $meta->npoints - 1;
+
+        $fh = fopen($this->dir.$meta->id.".dat", 'c+');
+
+        // Write padding
+        $padding = ($pos - $last_pos)-1;
+        if ($padding>0) $this->write_padding($fh,$meta->npoints,$padding);
+
+        // Write new datapoint
+	    fseek($fh,4*$pos);
+        if (!is_nan($value)) fwrite($fh,pack("f",$value)); else fwrite($fh,pack("f",NAN));
+
+        // Close file
+        fclose($fh);
+
+        if (($pos+1)>$meta->npoints) {
+          $meta->npoints = $pos + 1;
+          $this->set_meta($id,$meta);
+        }
+
+        return $value;
     }
 
     /**

Modules/feed/feed.js

@@ -17,6 +17,17 @@ var feed = {
     return result;
   },
 
+  'list_assoc':function()
+  {
+    var result = {};
+    $.ajax({ url: path+"feed/list.json", dataType: 'json', async: false, success: function(data) {result = data;} });
+
+    var feeds = {};
+    for (z in result) feeds[result[z].id] = result[z];
+
+    return feeds;
+  },
+
   'list_by_id':function()
   {
     var feeds = {};

Modules/input/Views/input.js

@@ -7,6 +7,17 @@ var input = {
     $.ajax({ url: path+"input/list.json", dataType: 'json', async: false, success: function(data) {result = data;} });
     return result;
   },
+
+  'list_assoc':function()
+  {
+    var result = {};
+    $.ajax({ url: path+"input/list.json", dataType: 'json', async: false, success: function(data) {result = data;} });
+
+    var inputs = {};
+    for (z in result) inputs[result[z].id] = result[z];
+
+    return inputs;
+  },
 
   'set':function(id, fields)
   {
@@ -33,6 +44,23 @@ var input = {
   {
     var result = {};
     $.ajax({ url: path+"input/process/list.json", data: "inputid="+inputid, async: false, dataType: 'json', success: function(data){result = data;} });
+    var processlist = [];
+    if (result!="")
+    {
+        var tmp = result.split(",");
+        for (n in tmp)
+        {
+            var process = tmp[n].split(":"); 
+            processlist.push(process);
+        }
+    }
+    return processlist;
+  },
+
+  'getallprocesses':function(inputid)
+  {
+    var result = {};
+    $.ajax({ url: path+"input/getallprocesses.json", data: "inputid="+inputid, async: false, dataType: 'json', success: function(data){result = data;} });
     return result;
   },
 

Modules/input/Views/input_node.php

@@ -45,8 +45,8 @@
     table.fields = {
         //'id':{'type':"fixed"},
         'nodeid':{'title':'<?php echo _("Node:"); ?>','type':"fixed"},
-        'name':{'title':'<?php echo _("name"); ?>','type':"text"},
-        'description':{'title':'<?php echo _('Description'); ?>','type':"text"},
+        'name':{'title':'<?php echo _("Key"); ?>','type':"text"},
+        'description':{'title':'<?php echo _("Name"); ?>','type':"text"},
         'processList':{'title':'<?php echo _('Process list'); ?>','type':"processlist"},
         'time':{'title':'last updated', 'type':"updated"},
         'value':{'type':"value"},