begin work on call detaillers (load name from ldap, load location from opengeodb)

diff --git a/src/callnotifier/CLI.php b/src/callnotifier/CLI.php
index 2a6d3ca6ea4aa5d96c233ff5d2ff28ae235ef8a8..8958f78a86404331a71b59920507e5afbf1ae46f 100644 (file)
--- a/src/callnotifier/CLI.php
+++ b/src/callnotifier/CLI.php
@@ -36,6 +36,8 @@ class CLI
         );
 
         $callMonitor = new CallMonitor($this->config, $log);
         );
 
         $callMonitor = new CallMonitor($this->config, $log);

+        $callMonitor->addDetailler(new CallMonitor_Detailler_LDAP());
+        $callMonitor->addDetailler(new CallMonitor_Detailler_OpenGeoDb());

 
         $handler = new MessageHandler($this->config, $log, $callMonitor);
 
 
         $handler = new MessageHandler($this->config, $log, $callMonitor);
 

diff --git a/src/callnotifier/CallMonitor.php b/src/callnotifier/CallMonitor.php
index 428136fb5dff0df2757f249542e941677a95e9c0..7c6168cd2e68bae14b32e504f213f7031d911b29 100644 (file)
--- a/src/callnotifier/CallMonitor.php
+++ b/src/callnotifier/CallMonitor.php
@@ -13,12 +13,24 @@ class CallMonitor
 {
     protected $currentCalls = array();
 
 {
     protected $currentCalls = array();
 

+    /**
+     * Array of objects that are able to load details for a call
+     *
+     * @var array
+     */
+    protected $detaillers = array();
+

     public function __construct($config, $log)
     {
         $this->config = $config;
         $this->log = $log;
     }
 
     public function __construct($config, $log)
     {
         $this->config = $config;
         $this->log = $log;
     }
 

+    public function addDetailler(CallMonitor_Detailler $detailler)
+    {
+        $this->detaillers[] = $detailler;
+    }
+

     public function handle(EDSS1_Message $msg)
     {
         $callId = $msg->callRef;
     public function handle(EDSS1_Message $msg)
     {
         $callId = $msg->callRef;


@@ -82,6 +94,7 @@ class CallMonitor
                     unset($this->currentCalls[$otherCallId]);
                 }
             }
                     unset($this->currentCalls[$otherCallId]);
                 }
             }

+            $this->loadCallDetails($call);

             $this->log->log('startingCall', array('call' => $call));
             break;
 
             $this->log->log('startingCall', array('call' => $call));
             break;
 


@@ -131,6 +144,19 @@ class CallMonitor
         }
         return $number;
     }
         }
         return $number;
     }

+
+    /**
+     * Load details for a call, e.g. the name of the calling person
+     * or the area
+     *
+     * @return void
+     */
+    protected function loadCallDetails($call)
+    {
+        foreach ($this->detaillers as $detailler) {
+            $detailler->loadCallDetails($call);
+        }
+    }

 }
 
 ?>
 }
 
 ?>

diff --git a/src/callnotifier/CallMonitor/Detailler.php b/src/callnotifier/CallMonitor/Detailler.php
new file mode 100644 (file)
index 0000000..188e765
--- /dev/null
+++ b/src/callnotifier/CallMonitor/Detailler.php
@@ -0,0 +1,16 @@
+<?php
+namespace callnotifier;
+
+interface CallMonitor_Detailler
+{
+    /**
+     * Loads additional data into the call, e.g. name of the caller
+     *
+     * @param CallMonitor_Call $call Call to update
+     *
+     * @return void
+     */
+    public function loadCallDetails(CallMonitor_Call $call);
+}
+
+?>

diff --git a/src/callnotifier/CallMonitor/Detailler/LDAP.php b/src/callnotifier/CallMonitor/Detailler/LDAP.php
new file mode 100644 (file)
index 0000000..833fd46
--- /dev/null
+++ b/src/callnotifier/CallMonitor/Detailler/LDAP.php
@@ -0,0 +1,26 @@
+<?php
+namespace callnotifier;
+
+class CallMonitor_Detailler_LDAP implements CallMonitor_Detailler
+{
+    public function __construct()
+    {
+    }
+
+    public function loadCallDetails(CallMonitor_Call $call)
+    {
+        if ($call->type == CallMonitor_Call::INCOMING) {
+            $call->fromName = $this->loadName($call->from);
+        } else {
+            $call->toName = $this->loadName($call->to);
+        }
+    }
+
+    protected function loadName($number)
+    {
+        return 'foo';
+    }
+
+}
+
+?>

diff --git a/src/callnotifier/CallMonitor/Detailler/OpenGeoDb.php b/src/callnotifier/CallMonitor/Detailler/OpenGeoDb.php
new file mode 100644 (file)
index 0000000..1260438
--- /dev/null
+++ b/src/callnotifier/CallMonitor/Detailler/OpenGeoDb.php
@@ -0,0 +1,74 @@
+<?php
+namespace callnotifier;
+
+class CallMonitor_Detailler_OpenGeoDb implements CallMonitor_Detailler
+{
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = new \PDO(
+            'mysql:host=dojo;dbname=opengeodb',
+            'opengeodb-read',
+            'opengeodb',
+            array(
+                \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+                \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC
+            )
+        );
+    }
+
+    public function loadCallDetails(CallMonitor_Call $call)
+    {
+        if ($call->type == CallMonitor_Call::INCOMING) {
+            $call->fromLocation = $this->loadLocation($call->from);
+        } else {
+            $call->toLocation = $this->loadLocation($call->to);
+        }
+    }
+
+    protected function loadLocation($number)
+    {
+        //area codes in germany can be 3 to 6 numbers
+        //FIXME: what about international numbers?
+        for ($n = 3; $n <= 6; $n++) {
+            $areacode = substr($number, 0, $n);
+            $name = $this->getNameForAreaCode($areacode);
+            if ($name !== null) {
+                return $name;
+            }
+        }
+
+        return null;
+    }
+
+    protected function getNameForAreaCode($areacode)
+    {
+        $stm = $this->db->query(
+            'SELECT loc_id FROM geodb_textdata'
+            . ' WHERE text_type = "500400000"'//area code
+            . ' AND text_val = ' . $this->db->quote($areacode)
+        );
+        $res = $stm->fetch();
+        if ($res === false) {
+            //area code does not exist
+            return null;
+        }
+
+        $locId = $res['loc_id'];
+        $stm = $this->db->query(
+            'SELECT text_val FROM geodb_textdata'
+            . ' WHERE text_type = "500100000"'//name
+            . ' AND loc_id = ' . $this->db->quote($locId)
+        );
+        $res = $stm->fetch();
+        if ($res === false) {
+            return null;
+        }
+
+        return $res['text_val'];
+    }
+
+}
+
+?>