Changeset 10144

Timestamp:

07/14/10 16:44:59 (3 years ago)

Author:

p_lindheimer

Message:

proposed caching of astdb during open astman session, must be enabled to take advantage, re #4435

Files:

• freepbx/trunk/amp_conf/htdocs/admin/common/php-asmanager.php (modified) (8 diffs)

freepbx/trunk/amp_conf/htdocs/admin/common/php-asmanager.php

@@ -113 +113 @@
-  */
-  var $event_handlers;
+
+  var $useCaching = false;
+  var $memAstDB = null;
-  
-  /**
@@ -137 +140 @@
-    if(!isset($this->config['asmanager']['username'])) $this->config['asmanager']['username'] = 'phpagi';
-    if(!isset($this->config['asmanager']['secret'])) $this->config['asmanager']['secret'] = 'phpagi';
-
-
+
+
+
+
+
+
+
+
+
-  /**
-  * Send a request
@@ -735 +745 @@
-   */
-  function database_show($family='') {
+    if ($this->useCaching && $this->memAstDB != null) {
+      if ($family == '') {
+        return $this->memAstDB;
+      } else {
+        $key = '/'.$family;
+        if (isset($this->memAstDB[$key])) {
+          return array($key => $this->memAstDB[$key]);
+        } else {
+          $key .= '/';
+          $len = strlen($key);
+          $fam_arr = array();
+          foreach ($this->memAstDB as $this_key => $value) {
+            if (substr($this_key,0,$len) ==  $key) {
+              $fam_arr[$this_key] = $value;
+            }
+          }
+          return $fam_arr;
+        }
+      }
+    }
-    $r = $this->command("database show $family");
-    
@@ -762 +792 @@
-    $value = (trim($value) == '')?'"'.$value.'"':$value;
-    $r = $this->command("database put ".str_replace(" ","/",$family)." ".str_replace(" ","/",$key)." ".$value);
+    if (!empty($this->memAstDB)){
+      $keyUsed="/".str_replace(" ","/",$family)."/".str_replace(" ","/",$key);
+      $this->memAstDB[$keyUsed] = $value;
+    }
-    return (bool)strstr($r["data"], "success");
-  }
@@ -770 +804 @@
-   * @return mixed Value of the key, or false if error
-   */
+   /*
-  function database_get($family, $key) {
-    $r = $this->command("database get ".str_replace(" ","/",$family)." ".str_replace(" ","/",$key));
@@ -779 +814 @@
-    }
-  }
+  */
+  function database_get($family, $key) {
+    if ($this->useCaching) {
+      if ($this->memAstDB == null) {
+        $this->LoadAstDB();
+      }
+      $keyUsed="/".str_replace(" ","/",$family)."/".str_replace(" ","/",$key);
+      if (array_key_exists($keyUsed,$this->memAstDB)){            
+        return $this->memAstDB[$keyUsed];
+      }
+    } else {
+      $r = $this->command("database get ".str_replace(" ","/",$family)." ".str_replace(" ","/",$key));
+      $data = strpos($r["data"],"Value:");
+      if ($data !== false) {
+        return trim(substr($r["data"],6+$data));
+      }
+    }
+    return false;
+  }
+
-  
-  /** Delete an entry from the asterisk database
@@ -786 +841 @@
-   */
-  function database_del($family, $key) {
+    if (!empty($this->memAstDB)){
+      $keyUsed="/".str_replace(" ","/",$family)."/".str_replace(" ","/",$key);
+      unset($this->memAstDB[$keyUsed]);
+    }
-    $r = $this->command("database del ".str_replace(" ","/",$family)." ".str_replace(" ","/",$key));
-    return (bool)strstr($r["data"], "removed");
@@ -795 +854 @@
-   */
-  function database_deltree($family) {
+    if (!empty($this->memAstDB)){
+      $keyUsed="/".str_replace(" ","/",$family);
+      unset($this->memAstDB[$keyUsed]);
+    }
-    $r = $this->command("database deltree ".str_replace(" ","/",$family));
-    return (bool)strstr($r["data"], "removed");