From cd57346cae0f047f553b8a29a46195097dec8e02 Mon Sep 17 00:00:00 2001
From: dceejay <conway@uk.ibm.com>
Date: Tue, 14 Apr 2015 17:23:31 +0100
Subject: [PATCH] Update leveldb node to try to force topic to string for key.

Add extra "help" for blink1 users.
---
 hardware/blink1/README.md       |  4 ++++
 hardware/blink1/package.json    |  2 +-
 storage/leveldb/67-leveldb.html |  2 +-
 storage/leveldb/67-leveldb.js   | 10 ++++++----
 storage/leveldb/package.json    |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hardware/blink1/README.md b/hardware/blink1/README.md
index b18500bf..0aadb4de 100644
--- a/hardware/blink1/README.md
+++ b/hardware/blink1/README.md
@@ -10,6 +10,10 @@ As the blink1 is a USB HID device you may need some extra hardware libraries as
 documented <a href="https://www.npmjs.com/package/node-blink1" target="_new">here</a>
 and <a href="https://github.com/todbot/blink1/blob/master/linux/51-blink1.rules" target="_new">here</a>.
 
+Specifically Ubuntu/Debian/Raspbian user may need to
+
+    sudo apt-get install libusb-1.0-0.dev.
+
 Install
 -------
 
diff --git a/hardware/blink1/package.json b/hardware/blink1/package.json
index bd4bdbbf..1ba39e4c 100644
--- a/hardware/blink1/package.json
+++ b/hardware/blink1/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-blink1",
-    "version"       : "0.0.6",
+    "version"       : "0.0.7",
     "description"   : "A Node-RED node to control a Thingm Blink(1)",
     "dependencies"  : {
         "node-blink1"   : "0.1.5"
diff --git a/storage/leveldb/67-leveldb.html b/storage/leveldb/67-leveldb.html
index e889a15a..1e49327f 100644
--- a/storage/leveldb/67-leveldb.html
+++ b/storage/leveldb/67-leveldb.html
@@ -48,7 +48,7 @@
     <p>Uses <a href="https://code.google.com/p/leveldb/" target="_new"><i>LevelDB</i></a> for a simple key value pair database.</p>
     <p>Use this node to <b>get</b>, or retrieve the data already saved in the database.</p>
     <p><b>msg.topic</b> must hold the <i>key</i> for the database, and the result is returned in <b>msg.payload</b>.</p>
-    <p>If nothing is found for the key then <i>null</i> is returned,</p>
+    <p>If nothing is found for the key then <b>msg.payload</b> is set to the <i>null</i> object.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/storage/leveldb/67-leveldb.js b/storage/leveldb/67-leveldb.js
index 9e1d56bf..dd09fa19 100644
--- a/storage/leveldb/67-leveldb.js
+++ b/storage/leveldb/67-leveldb.js
@@ -41,7 +41,8 @@ module.exports = function(RED) {
         if (this.levelConfig) {
             var node = this;
             node.on("input", function(msg) {
-                if (typeof msg.topic === 'string') {
+                var key = msg.topic.toString();
+                if (key && (key.length > 0)) {
                     node.levelConfig.db.get(msg.topic, function(err, value) {
                         if (err) {
                             //node.warn(err);
@@ -53,7 +54,7 @@ module.exports = function(RED) {
                     });
                 }
                 else {
-                    if (typeof msg.topic !== 'string') { node.error("msg.topic (the key is not defined"); }
+                    node.error("Cannot make key string from msg.topic");
                 }
             });
         }
@@ -73,7 +74,8 @@ module.exports = function(RED) {
         if (this.levelConfig) {
             var node = this;
             node.on("input", function(msg) {
-                if (typeof msg.topic === 'string') {
+                var key = msg.topic.toString();
+                if (key && (key.length > 0)) {
                     if (node.operation === "delete") {
                         node.levelConfig.db.del(msg.topic);
                     }
@@ -84,7 +86,7 @@ module.exports = function(RED) {
                     }
                 }
                 else {
-                    if (typeof msg.topic !== 'string') { node.error("msg.topic (the key is not defined"); }
+                    node.error("Cannot make key string from msg.topic");
                 }
             });
         }
diff --git a/storage/leveldb/package.json b/storage/leveldb/package.json
index 066c9362..dee2622f 100644
--- a/storage/leveldb/package.json
+++ b/storage/leveldb/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-leveldb",
-    "version"       : "0.0.1",
+    "version"       : "0.0.2",
     "description"   : "A Node-RED node to read and write to a LevelDB database",
     "dependencies"  : {
         "level"   : "0.18.0"