Ported new php bridge client "getall" function to python.

Added file bridgeclient_example.py (python).
Formatted code from both bridgeclients for better readability

Author: Federico Fissore

bridge/bridgeclient.py

@@ -28,9 +28,10 @@
 from tcp import TCPJSONClient
 from time import sleep
 
+
 class BridgeClient:
   def wait_response(self, json, timeout):
-    while timeout>=0:
+    while timeout >= 0:
       r = json.recv()
       if not r is None:
         return r
@@ -51,15 +52,23 @@ def wait_key(self, key, json, timeout):
 
   def get(self, key):
     json = TCPJSONClient('127.0.0.1', 5700)
-    json.send({'command':'get', 'key':key})
+    json.send({'command': 'get', 'key': key})
     r = self.wait_key(key, json, 10)
     json.close()
     return r
 
+  def getall(self):
+    json = TCPJSONClient('127.0.0.1', 5700)
+    json.send({'command': 'get'})
+    r = self.wait_response(json, 10)
+    if not r is None:
+      r = r['value']
+    json.close()
+    return r
+
   def put(self, key, value):
     json = TCPJSONClient('127.0.0.1', 5700)
-    json.send({'command':'put', 'key':key, 'value':value})
+    json.send({'command': 'put', 'key': key, 'value': value})
     r = self.wait_key(key, json, 10)
     json.close()
     return r
-

bridge/bridgeclient_example.py

@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.insert(0, '/usr/lib/python2.7/bridge/')
+
+from bridgeclient import BridgeClient as bridgeclient
+
+client = bridgeclient()
+
+print 'Assigning value to key D13'
+client.put('D13', 'Test D13')
+
+test = client.get('D13')
+print 'Value assigned to D13 is ' + test
+
+print
+
+print 'Assigning value to key D11'
+client.put('D11', 'Test D11')
+
+all = client.getall()
+print 'Listing all stored values'
+print all
+print 'Value assigned to D11 is ' + all['D11']

bridge/php/bridgeclient.class.php

@@ -26,62 +26,63 @@ class bridgeclient {
 	private $service_port = 5700;
 	private $address = "127.0.0.1";
 	private $socket;
-	
+
 	private function connect() {
-		($this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) 
-		|| die("socket_create() failed: " . socket_strerror(socket_last_error()) . "\n");
-		socket_set_option($this->socket,SOL_SOCKET, SO_RCVTIMEO, array("sec"=>3, "usec"=>0));
-		socket_connect($this->socket, $this->address, $this->service_port) 
-		|| die("socket_connect() failed: " . socket_strerror(socket_last_error($this->socket)) . "\n");
+		($this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) || die("socket_create() failed: " . socket_strerror(socket_last_error()) . "\n");
+		socket_set_option($this->socket, SOL_SOCKET, SO_RCVTIMEO, array("sec" => 3, "usec" => 0));
+		socket_connect($this->socket, $this->address, $this->service_port) || die("socket_connect() failed: " . socket_strerror(socket_last_error($this->socket)) . "\n");
 	}
-	
+
 	private function disconnect() {
 		socket_close($this->socket);
 	}
 
-	private function sendcommand($command,$key="",$value="") {
+	private function sendcommand($command, $key = "", $value = "") {
 		$jsonreceive = "";
-		$obraces=0;
-		$cbraces=0;
+		$obraces = 0;
+		$cbraces = 0;
 
 		$this->connect();
-		
-		if($key<>""){$jsonsend = '{"command":"'.$command.'","key":"'.$key.'","value":"'.$value.'"}';}
-		else{$jsonsend = '{"command":"'.$command.'"}';}
+
+		if ($key <> "") {
+			$jsonsend = "{\"command\":\"" . $command . "\",\"key\":\"" . $key . "\",\"value\":\"" . $value . "\"}";
+		} else {
+			$jsonsend = "{\"command\":\"" . $command . "\"}";
+		}
 		socket_write($this->socket, $jsonsend, strlen($jsonsend));
-	
+
 		do {
-		socket_recv($this->socket, $buffer, 1,0);
-		$jsonreceive.=$buffer;
-		if($buffer == "{") $obraces++;
-		if($buffer == "}") $cbraces++;
+			socket_recv($this->socket, $buffer, 1, 0);
+			$jsonreceive .= $buffer;
+			if ($buffer == "{") {
+				$obraces++;
+			}
+			if ($buffer == "}") {
+				$cbraces++;
+			}
 		} while ($obraces != $cbraces);
-		
+
 		$this->disconnect();
-		
-		if($key<>""){
-			$jsonarray=json_decode($jsonreceive);
-			if ($jsonarray->{'value'} == NULL) $jsonarray->{'value'}="None";
-		
-			return $jsonarray->{'value'};
-		}
-		else{
-			return $jsonreceive;
+
+		$jsonarray = json_decode($jsonreceive);
+		if ($jsonarray->{"value"} == NULL) {
+			$jsonarray->{"value"} = "None";
 		}
+
+		return $jsonarray->{"value"};
 	}
-	
+
 	public function get($key) {
-		return $this->sendcommand("get",$key);
+		return $this->sendcommand("get", $key);
 	}
-	
-	public function put($key,$value) {
-		return $this->sendcommand("put",$key,$value);
+
+	public function put($key, $value) {
+		return $this->sendcommand("put", $key, $value);
 	}
-	
+
 	public function getall() {
 		return $this->sendcommand("get");
 	}
-
 }
-?>
 
+?>

bridge/php/example.php

@@ -1,15 +1,21 @@
 <?php
-require ("bridgeclient.class.php");
+require("bridgeclient.class.php");
 
 $client = new bridgeclient();
 
-$client->put("D13","Test");
+print("Assigning value to key D13\n");
+$client->put("D13", "Test D13");
 
 $test = $client->get("D13");
-echo $test;
+print("Value assigned to D13 is " . $test . "\n");
+
+print("\n");
+
+print("Assigning value to key D11\n");
+$client->put("D11", "Test D11");
 
 $all = $client->getall();
-$all = json_decode($all, true);
+print("Listing all stored values\n");
 print_r($all);
+print("Value assigned to D11 is " . $all->{"D11"} . "\n");
 ?>
-