Changeset 209

Timestamp:

03/21/05 20:25:05 (7 years ago)

Author:

ronhartmann

Message:

Added functions to allow for trunk prioritization.

Trunks now have the outrt-001-Name, outrt-002-Name etc naming

Requires an update table for the extensions "context and application" fileds.

ALTER TABLE extensions modify context varchar(45) NOT NULL default 'default';
and
ALTER TABLE extensions modify application varchar(45) NOT NULL default ;

Existing routes will need to be renamed using rename button (until we get the update script finished) you can name the routes the same thing they were originally called.

Files:

• trunk/AMP/amp_conf/htdocs/admin/functions.php (modified) (5 diffs)
• trunk/AMP2-UseAmportal/amp_conf/var/www/html/admin/functions.php (modified) (5 diffs)

trunk/AMP/amp_conf/htdocs/admin/functions.php

@@ -690 +690 @@
-          die($result->getMessage()."<br><br>".$sql); 
-      }
+    setDefaultTrunk("1");
-    $unique_trunks[] = array('OUT_1','ZAP/g0');
-    addOutTrunk("1");
@@ -1276 +1277 @@
-  }
-  
+  
+  $routepriority = getroutenames();
+  $order=setroutepriorityvalue(count($routepriority));
+  $name = sprintf ("%s-%s",$order,$name);
-  $trunks = array_values($trunks); // probably already done, but it's important for our dialplan
+
-  
-  foreach ($patterns as $pattern) {
@@ -1387 +1393 @@
-function renameRoute($oldname, $newname) {
-  global $db;
+
+  $route_prefix=substr($oldname,0,4);
+  $newname=$route_prefix.$newname;
-  $sql = "SELECT context FROM extensions WHERE context = 'outrt-".$newname."'";
-  $results = $db->getAll($sql);
@@ -1399 +1408 @@
-    die($result->getMessage());
-  }
-
-
+        $mypriority=sprintf("%d",$route_prefix);
+, priority = '$mypriority' 
-  $result = $db->query($sql);
-  if(DB::IsError($result)) {
@@ -1413 +1422 @@
-  addroute($name, $patterns, $trunks);
-}
+
+function getroute($route) {
+  global $db;
+  $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND args LIKE 'dialout-trunk,%' ORDER BY priority ";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    die($results->getMessage());
+  }
+  
+  $trunks = array();
+  foreach ($results as $row) {
+    if (preg_match('/^dialout-trunk,(\d+)/', $row[0], $matches)) {
+      // check in_array -- even though we did distinct
+      // we still might get ${EXTEN} and ${EXTEN:1} if they used | to split a pattern
+      if (!in_array("OUT_".$matches[1], $trunks)) {
+        $trunks[] = "OUT_".$matches[1];
+      }
+    }
+  }
+  return $trunks;
+}
+function setroutepriorityvalue2($key)
+{
+  $my_lookup=array();
+  $x=0;
+  for ($j=97;$j<100;$j++)
+  {
+    for ($i=97;$i<123;$i++)
+    {
+      $my_lookup[$x++] = sprintf("%c%c",$j,$i);
+    }
+  }
+echo "my key is $key $my_lookup[$key]";
+  return ($my_lookup[$key]);
+}
+function setroutepriorityvalue($key)
+{
+  $key=$key+1;
+  if ($key<10)
+    $prefix = sprintf("00%d",$key);
+  else if ((9<$key)&&($key<100))
+    $prefix = sprintf("0%d",$key);
+  else if ($key>100)
+    $prefix = sprintf("%d",$key);
+  return ($prefix);
+}
+function setroutepriority($routepriority, $reporoutedirection, $reporoutekey)
+{
+  global $db;
+  $counter=-1;
+  foreach ($routepriority as $tresult) 
+  {
+    $counter++;
+    if (($counter==($reporoutekey-1)) && ($reporoutedirection=="up")) {
+      // swap this one with the one before (move up)
+      $temproute = $routepriority[$counter];
+      $routepriority[ $counter ] = $routepriority[ $counter+1 ];
+      $routepriority[ $counter+1 ] = $temproute;
+      
+    } else if (($counter==($reporoutekey)) && ($reporoutedirection=="down")) {
+      // swap this one with the one after (move down)
+      $temproute = $routepriority[ $counter+1 ];
+      $routepriority[ $counter+1 ] = $routepriority[ $counter ];
+      $routepriority[ $counter ] = $temproute;
+    }
+  }
+  unset($temptrunk);
+  $routepriority = array_values($routepriority); // resequence our numbers
+  $counter=0;
+  foreach ($routepriority as $tresult) 
+  {
+    $order=setroutepriorityvalue($counter++);
+    $sql = sprintf("Update extensions set context='outrt-%s-%s' WHERE context='outrt-%s'",$order,substr($tresult[0],4), $tresult[0]);
+    $result = $db->query($sql); 
+    if(DB::IsError($result)) {     
+      die($result->getMessage()); 
+    }
+  }
+  // Delete and readd the outbound-allroutes entries
+  $sql = "delete from  extensions WHERE context='outbound-allroutes'";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+          die($result->getMessage().$sql);
+  }
+  $sql = "SELECT DISTINCT context FROM extensions WHERE context like 'outrt-%' ORDER BY context";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    die($results->getMessage());
+  }
+
+  $priority_loops=1;  
+  foreach ($results as $row) {
+    $sql = "INSERT INTO extensions (context, extension, priority, application, args, descr, flags) VALUES ";
+    $sql .= "('outbound-allroutes', ";
+    $sql .= "'include', ";
+    $sql .= "'".$priority_loops++."', ";
+    $sql .= "'".$row[0]."', ";
+    $sql .= "'', ";
+    $sql .= "'', ";
+    $sql .= "'2')";
+  
+    //$sql = sprintf("Update extensions set application='outrt-%s-%s' WHERE context='outbound-allroutes' and  application='outrt-%s'",$order,substr($tresult[0],4), $tresult[0]);
+    $result = $db->query($sql); 
+    if(DB::IsError($result)) {     
+      die($result->getMessage(). $sql); 
+    }
+  }
+  $routepriority = getroutenames();
+  return ($routepriority);
+}
+
+ 
-
-

trunk/AMP2-UseAmportal/amp_conf/var/www/html/admin/functions.php

@@ -690 +690 @@
-          die($result->getMessage()."<br><br>".$sql); 
-      }
+    setDefaultTrunk("1");
-    $unique_trunks[] = array('OUT_1','ZAP/g0');
-    addOutTrunk("1");
@@ -1276 +1277 @@
-  }
-  
+  
+  $routepriority = getroutenames();
+  $order=setroutepriorityvalue(count($routepriority));
+  $name = sprintf ("%s-%s",$order,$name);
-  $trunks = array_values($trunks); // probably already done, but it's important for our dialplan
+
-  
-  foreach ($patterns as $pattern) {
@@ -1387 +1393 @@
-function renameRoute($oldname, $newname) {
-  global $db;
+
+  $route_prefix=substr($oldname,0,4);
+  $newname=$route_prefix.$newname;
-  $sql = "SELECT context FROM extensions WHERE context = 'outrt-".$newname."'";
-  $results = $db->getAll($sql);
@@ -1399 +1408 @@
-    die($result->getMessage());
-  }
-
-
+        $mypriority=sprintf("%d",$route_prefix);
+, priority = '$mypriority' 
-  $result = $db->query($sql);
-  if(DB::IsError($result)) {
@@ -1413 +1422 @@
-  addroute($name, $patterns, $trunks);
-}
+
+function getroute($route) {
+  global $db;
+  $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND args LIKE 'dialout-trunk,%' ORDER BY priority ";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    die($results->getMessage());
+  }
+  
+  $trunks = array();
+  foreach ($results as $row) {
+    if (preg_match('/^dialout-trunk,(\d+)/', $row[0], $matches)) {
+      // check in_array -- even though we did distinct
+      // we still might get ${EXTEN} and ${EXTEN:1} if they used | to split a pattern
+      if (!in_array("OUT_".$matches[1], $trunks)) {
+        $trunks[] = "OUT_".$matches[1];
+      }
+    }
+  }
+  return $trunks;
+}
+function setroutepriorityvalue2($key)
+{
+  $my_lookup=array();
+  $x=0;
+  for ($j=97;$j<100;$j++)
+  {
+    for ($i=97;$i<123;$i++)
+    {
+      $my_lookup[$x++] = sprintf("%c%c",$j,$i);
+    }
+  }
+echo "my key is $key $my_lookup[$key]";
+  return ($my_lookup[$key]);
+}
+function setroutepriorityvalue($key)
+{
+  $key=$key+1;
+  if ($key<10)
+    $prefix = sprintf("00%d",$key);
+  else if ((9<$key)&&($key<100))
+    $prefix = sprintf("0%d",$key);
+  else if ($key>100)
+    $prefix = sprintf("%d",$key);
+  return ($prefix);
+}
+function setroutepriority($routepriority, $reporoutedirection, $reporoutekey)
+{
+  global $db;
+  $counter=-1;
+  foreach ($routepriority as $tresult) 
+  {
+    $counter++;
+    if (($counter==($reporoutekey-1)) && ($reporoutedirection=="up")) {
+      // swap this one with the one before (move up)
+      $temproute = $routepriority[$counter];
+      $routepriority[ $counter ] = $routepriority[ $counter+1 ];
+      $routepriority[ $counter+1 ] = $temproute;
+      
+    } else if (($counter==($reporoutekey)) && ($reporoutedirection=="down")) {
+      // swap this one with the one after (move down)
+      $temproute = $routepriority[ $counter+1 ];
+      $routepriority[ $counter+1 ] = $routepriority[ $counter ];
+      $routepriority[ $counter ] = $temproute;
+    }
+  }
+  unset($temptrunk);
+  $routepriority = array_values($routepriority); // resequence our numbers
+  $counter=0;
+  foreach ($routepriority as $tresult) 
+  {
+    $order=setroutepriorityvalue($counter++);
+    $sql = sprintf("Update extensions set context='outrt-%s-%s' WHERE context='outrt-%s'",$order,substr($tresult[0],4), $tresult[0]);
+    $result = $db->query($sql); 
+    if(DB::IsError($result)) {     
+      die($result->getMessage()); 
+    }
+  }
+  // Delete and readd the outbound-allroutes entries
+  $sql = "delete from  extensions WHERE context='outbound-allroutes'";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+          die($result->getMessage().$sql);
+  }
+  $sql = "SELECT DISTINCT context FROM extensions WHERE context like 'outrt-%' ORDER BY context";
+  $results = $db->getAll($sql);
+  if(DB::IsError($results)) {
+    die($results->getMessage());
+  }
+
+  $priority_loops=1;  
+  foreach ($results as $row) {
+    $sql = "INSERT INTO extensions (context, extension, priority, application, args, descr, flags) VALUES ";
+    $sql .= "('outbound-allroutes', ";
+    $sql .= "'include', ";
+    $sql .= "'".$priority_loops++."', ";
+    $sql .= "'".$row[0]."', ";
+    $sql .= "'', ";
+    $sql .= "'', ";
+    $sql .= "'2')";
+  
+    //$sql = sprintf("Update extensions set application='outrt-%s-%s' WHERE context='outbound-allroutes' and  application='outrt-%s'",$order,substr($tresult[0],4), $tresult[0]);
+    $result = $db->query($sql); 
+    if(DB::IsError($result)) {     
+      die($result->getMessage(). $sql); 
+    }
+  }
+  $routepriority = getroutenames();
+  return ($routepriority);
+}
+
+ 
-
-