From bbed4bab9ad3454e5aee56023b61e5d1014705f1 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@dhcp-9-20-202-110.hursley.ibm.com>
Date: Wed, 9 Dec 2015 13:21:42 +0000
Subject: [PATCH] Emoncms - drop time if not a number

and update docs.
---
 io/emoncms/88-emoncms.html | 11 ++++++-----
 io/emoncms/88-emoncms.js   |  2 +-
 io/emoncms/README.md       | 13 +++++++++----
 io/emoncms/package.json    |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/io/emoncms/88-emoncms.html b/io/emoncms/88-emoncms.html
index 5551d1d0..853a56e3 100644
--- a/io/emoncms/88-emoncms.html
+++ b/io/emoncms/88-emoncms.html
@@ -20,8 +20,8 @@
         <input type="text" id="node-input-emonServer">
     </div>
     <div class="form-row">
-        <label for="node-input-nodegroup"><i class="fa fa-tag"></i> Node</label>
-        <input type="text" id="node-input-nodegroup" placeholder="">
+        <label for="node-input-nodegroup"><i class="fa fa-object-group"></i> Nodegroup</label>
+        <input type="text" id="node-input-nodegroup" placeholder="number eg: 3">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
@@ -34,8 +34,9 @@
     <p>The <b>msg.payload</b> can contain either a comma separated list of name
     value pairs e.g. <pre>name:value,...</pre> or a comma separated list of values e.g. <pre>1,2,...</pre>
     or a simple javascript object e.g. <pre>msg.payload = {temp:12}</pre>
-    <p>If Node is left blank <b>msg.nodegroup</b> will used.</p>
-    <p>Insertion time can be manipulated by setting <b>msg.time</b>.</p>
+    <p>If <i>Nodegroup</i> is left blank <b>msg.nodegroup</b> will used.</p>
+    <p>Insertion time can be manipulated by setting <b>msg.time</b>.
+    This must be in epoch format - seconds since 1970.</p>
 </script>
 
 <script type="text/javascript">
@@ -45,7 +46,7 @@
         defaults: {
             name: {value:"Emoncms"},
             emonServer: {type:"emoncms-server", required:true},
-            nodegroup: {value:""}
+            nodegroup: {value:"", validate:function(v) {return ((v === undefined)||(/^\d+$/).test(v)); }}
         },
         inputs:1,
         outputs:0,
diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
index c6b914dd..5ef89e8d 100644
--- a/io/emoncms/88-emoncms.js
+++ b/io/emoncms/88-emoncms.js
@@ -59,7 +59,7 @@ module.exports = function(RED) {
                 this.url += '&node=' + nodegroup;
             }
             if (typeof msg.time !== 'undefined') {
-                this.url += '&time=' + msg.time;
+                if (!isNaN(parseInt(msg.time))) { this.url += '&time=' + msg.time; }
             }
             http.get(this.url, function(res) {
                 msg.rc = res.statusCode;
diff --git a/io/emoncms/README.md b/io/emoncms/README.md
index 48c15ef2..11a7caee 100644
--- a/io/emoncms/README.md
+++ b/io/emoncms/README.md
@@ -16,7 +16,7 @@ Usage
 
 ### Emoncms post.
 
-The **msg.payload** can contain either a comma separated list of name
+The `msg.payload` can contain either a comma separated list of name
 value pairs, e.g.
 
         name:value,...
@@ -25,11 +25,16 @@ or a comma separated list of values, e.g.
 
         1,2,..
 
+or a simple javascript object e.g.
 
-If Node is left blank **msg.nodegroup** will used.
+        msg.payload = {temp:12, humidity:56};
 
-Insertion time can be manipulated by setting **msg.time**.
+If *Nodegroup* is left blank `msg.nodegroup` will used (if set).
+This should be a numeric value.
+
+Insertion time can be manipulated by setting `msg.time`. This **must** be in
+epoch format - i.e. seconds since 1970.
 
 ### Emoncms In:
 
-Fetches last emoncms feed value, returns numberical value.
\ No newline at end of file
+Fetches last emoncms feed value, returns a numerical value.
diff --git a/io/emoncms/package.json b/io/emoncms/package.json
index f08422db..ceccb82f 100644
--- a/io/emoncms/package.json
+++ b/io/emoncms/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-emoncms",
-    "version"       : "0.0.6",
+    "version"       : "0.0.8",
     "description"   : "A Node-RED node to fetch/post data to/from emoncms",
     "dependencies"  : {
     },