Browse Source

Move the database info parsing bits for the reply to INFO in a separate function.

Daniele Alessandri 14 years ago
parent
commit
74b6d05b48
2 changed files with 10 additions and 12 deletions
  1. 9 6
      lib/Predis/Commands/Info.php
  2. 1 6
      lib/Predis/Commands/InfoV24x.php

+ 9 - 6
lib/Predis/Commands/Info.php

@@ -21,16 +21,19 @@ class Info extends Command {
                 $info[$k] = $v;
             }
             else {
-                $db = array();
-                foreach (explode(',', $v) as $dbvar) {
-                    list($dbvk, $dbvv) = explode('=', $dbvar);
-                    $db[trim($dbvk)] = $dbvv;
-                }
-                $info[$k] = $db;
+                $info[$k] = $this->parseDatabaseStats($v);
             }
         }
         return $info;
     }
+    protected function parseDatabaseStats($str) {
+        $db = array();
+        foreach (explode(',', $str) as $dbvar) {
+            list($dbvk, $dbvv) = explode('=', $dbvar);
+            $db[trim($dbvk)] = $dbvv;
+        }
+        return $db;
+    }
     protected function parseAllocationStats($str) {
         $stats = array();
         foreach (explode(',', $str) as $kv) {

+ 1 - 6
lib/Predis/Commands/InfoV24x.php

@@ -27,12 +27,7 @@ class InfoV24x extends Info {
                 $current[$k] = $v;
             }
             else {
-                $db = array();
-                foreach (explode(',', $v) as $dbvar) {
-                    list($dbvk, $dbvv) = explode('=', $dbvar);
-                    $db[trim($dbvk)] = $dbvv;
-                }
-                $current[$k] = $db;
+                $current[$k] = $this->parseDatabaseStats($v);
             }
         }
         return $info;