parse number types and numbering plans

diff --git a/src/callnotifier/EDSS1/Parameter/6C.php b/src/callnotifier/EDSS1/Parameter/6C.php
index 2acdebdbe47b7382a6f400953c21a8207d432826..cba45606d08728871e18119804f0482da646f13b 100644 (file)
--- a/src/callnotifier/EDSS1/Parameter/6C.php
+++ b/src/callnotifier/EDSS1/Parameter/6C.php
@@ -5,6 +5,7 @@ namespace callnotifier;
  * Information element: Calling party number
  */
 class EDSS1_Parameter_6C extends EDSS1_Parameter
+    implements EDSS1_Parameter_INumber
 {
     public $title = 'Calling party number';
 
@@ -17,6 +18,9 @@ class EDSS1_Parameter_6C extends EDSS1_Parameter
     public function setData($data)
     {
         parent::setData($data);
+        $this->numberType    = (ord($data{0}) & 112) >> 4;
+        $this->numberingPlan = (ord($data{0}) & 15);
+        //data{1} is presentation/screening indicator
         $this->number = substr($data, 2);
     }
 }

diff --git a/src/callnotifier/EDSS1/Parameter/70.php b/src/callnotifier/EDSS1/Parameter/70.php
index 0127d43a61d985a66890ca80f10ee7949a1064b8..679e2ebcc95ad61d94fac9d54262d4b6dc00776a 100644 (file)
--- a/src/callnotifier/EDSS1/Parameter/70.php
+++ b/src/callnotifier/EDSS1/Parameter/70.php
@@ -5,6 +5,7 @@ namespace callnotifier;
  * Information element: Called party number
  */
 class EDSS1_Parameter_70 extends EDSS1_Parameter
+    implements EDSS1_Parameter_INumber
 {
     public $title = 'Called party number';
 
@@ -15,6 +16,8 @@ class EDSS1_Parameter_70 extends EDSS1_Parameter
     public function setData($data)
     {
         parent::setData($data);
+        $this->numberType    = (ord($data{0}) & 112) >> 4;
+        $this->numberingPlan = (ord($data{0}) & 15);
         $this->number = substr($data, 1);
     }
 

diff --git a/src/callnotifier/EDSS1/Parameter/INumber.php b/src/callnotifier/EDSS1/Parameter/INumber.php
new file mode 100644 (file)
index 0000000..d53594e
--- /dev/null
+++ b/src/callnotifier/EDSS1/Parameter/INumber.php
@@ -0,0 +1,10 @@
+<?php
+namespace callnotifier;
+
+/**
+ * Parameter that has a number
+ */
+interface EDSS1_Parameter_INumber
+{
+}
+?>
\ No newline at end of file

diff --git a/src/callnotifier/EDSS1/Parameter/Names.php b/src/callnotifier/EDSS1/Parameter/Names.php
new file mode 100644 (file)
index 0000000..cb6caef
--- /dev/null
+++ b/src/callnotifier/EDSS1/Parameter/Names.php
@@ -0,0 +1,31 @@
+<?php
+namespace callnotifier;
+
+/**
+ * Static parameters to resolve names of types
+ */
+class EDSS1_Parameter_Names extends EDSS1_Parameter
+{
+    static $numberTypes = array(
+        0 => 'Unknown',
+        1 => 'International number',
+        2 => 'National number',
+        3 => 'Network specific number',
+        4 => 'Subscriber number',
+        5 => 'Abbreviated number',
+        6 => 'Reserved',
+    );
+
+    static $numberingPlans = array(
+         0 => 'Unknown',
+         1 => 'ISDN/Telephony',
+         3 => 'Data',
+         4 => 'Telex',
+         8 => 'National standard',
+         9 => 'Private',
+        15 => 'Reserved',
+    );
+
+}
+
+?>

diff --git a/src/callnotifier/Logger/Echo.php b/src/callnotifier/Logger/Echo.php
index 688eaafaead81fa5be6a7e5e58a119ffc025db28..c37e7b693f07287cf2ea47df839d8325a08555b3 100644 (file)
--- a/src/callnotifier/Logger/Echo.php
+++ b/src/callnotifier/Logger/Echo.php
@@ -62,6 +62,13 @@ class Logger_Echo implements Logger
                        : ''
                     )
                 );
+                if ($param instanceof EDSS1_Parameter_INumber) {
+                    echo sprintf(
+                        "    Number type: %s, plan: %s\n",
+                        EDSS1_Parameter_Names::$numberTypes[$param->numberType],
+                        EDSS1_Parameter_Names::$numberingPlans[$param->numberingPlan]
+                    );
+                }
             }
         } else {
             echo $this->blue . $type . $this->end . ': '