From 78cb4105cacb35d29e9ebaa285a40a5e0ed51392 Mon Sep 17 00:00:00 2001
From: Matt Ranney <mjr@ranney.com>
Date: Fri, 17 Sep 2010 11:26:46 -0700
Subject: [PATCH] Update example.

---
 README.md  | 46 ++++++++++++++++++++++++----------------------
 example.js | 24 ++++++++++--------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index eb8bde1968..2169aaed49 100644
--- a/README.md
+++ b/README.md
@@ -14,38 +14,40 @@ The most popular Redis client, `redis-node-client` by fictorial, is very mature
 of node or value the maturity and stability of `redis-node-client`, I encourage you to use that one instead.
 
 `node_redis` is designed with performance in mind.  The included `test.js` runs similar tests to `redis-benchmark`, included with the Redis 
-distribution, and `test.js` is faster for some patterns and slower for others.  `node_redis` is roughly 6X faster at these benchmarks
-than `redis-node-client`.
+distribution, and `test.js` is faster than `redis-benchmarks` for some patterns and slower for others.  `node_redis` is roughly 6X faster at
+these benchmarks than `redis-node-client`.
 
 ## Usage
 
-Simple example:
+Simple example, included as `example.js`:
 
     var redis = require("redis"),
         client = redis.createClient();
 
     client.on("connect", function () {
-        client.set("string key", "string val", function (err, results) {
-            console.log("SET: " + results);
-        });
-        client.hset("hash key", "hashtest 1", "should be a hash", function (err, results) {
-            console.log("HSET: " + results);
-        });
-        client.hset(["hash key", "hashtest 2", "should be a hash"], function (err, results) {
-            console.log("HSET: " + results);
-        });
-        client.hkeys("hash key", function (err, results) {
-            console.log("HKEYS: " + results);
-            process.exit();
+        client.set("string key", "string val", redis.print);
+        client.hset("hash key", "hashtest 1", "some value", redis.print);
+        client.hset(["hash key", "hashtest 2", "some other value"], redis.print);
+        client.hkeys("hash key", function (err, replies) {
+            console.log(replies.length + " replies:");
+            replies.forEach(function (reply, i) {
+                console.log("    " + i + ": " + reply);
+            });
+            client.end();
         });
     });
 
 This will display:
 
-    SET: OK
-    HSET: 1
-    HSET: 1
-    HKEYS: hashtest 1,hashtest 2
+    mjr:~/work/node_redis (master)$ node example.js 
+    Reply: OK
+    Reply: 0
+    Reply: 0
+    2 replies:
+        0: hashtest 1
+        1: hashtest 2
+    mjr:~/work/node_redis (master)$ 
+
 
 ### Sending Commands
 
@@ -97,15 +99,15 @@ I guess we also need a callback when `MULTI` finishes, in case the last command
 
 `client` will emit some events about the state of the connection to the Redis server.
 
-### `connect`
+### "connect"
 
 `client` will emit `connect` when a connection is established to the Redis server.
 
-### `error`
+### "error"
 
 `client` will emit `error` when encountering an error connecting to the Redis server.
 
-### `end`
+### "end"
 
 `client` will emit `end` when an established Redis server connection has closed.
 
diff --git a/example.js b/example.js
index fabe0ea60b..1433c66990 100644
--- a/example.js
+++ b/example.js
@@ -2,19 +2,15 @@ var redis = require("redis"),
     client = redis.createClient();
 
 client.on("connect", function () {
-    client.set("string key", "string val", function (err, results) {
-        console.log("SET: " + results);
+    client.set("string key", "string val", redis.print);
+    client.hset("hash key", "hashtest 1", "some value", redis.print);
+    client.hset(["hash key", "hashtest 2", "some other value"], redis.print);
+    client.hkeys("hash key", function (err, replies) {
+        console.log(replies.length + " replies:");
+        replies.forEach(function (reply, i) {
+            console.log("    " + i + ": " + reply);
+        });
+        client.end();
     });
-    client.hset("hash key", "hashtest 1", "should be a hash", function (err, results) {
-        console.log("HSET: " + results);
-    });
-    client.hset(["hash key", "hashtest 2", "should be a hash"], function (err, results) {
-        console.log("HSET: " + results);
-    });
-    client.hkeys("hash key", function (err, results) {
-        console.log("HKEYS: " + results);
-        process.exit();
-    });
-    client.set("some key", "some val");
-    client.set(["some other key", "some val"]);
 });
+