Changeset 18

Timestamp:

03/20/07 17:02:22 (2 years ago)

Author:

root

Message:

Add (experimental) DID buttons for matching FreePBX FROM_DID lines

Files:

• trunk/op_server.pl (modified) (7 diffs)

trunk/op_server.pl

@@ -2334 +2334 @@
-    my $heading       = "** FIND_PANEL_BUT";
-    my $calleridnum   = "noexiste";
+    my $didnum        = "noexiste";
-    my %trunk_matched = ();
-
@@ -2346 +2347 @@
-    my $uniqueid = find_uniqueid( $canalsesion, $server );
-    if ( $uniqueid ne "" ) {
-
-
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -2465 +2473 @@
-        # Attemp to match a button from cache
-        $indice_cache = $canalsesion . "-" . $canal . "-" . $server;
-
+|| $didnum ne "noexiste" 
-            log_debug( "$heading CACHE MISS $indice_cache", 32 ) if DEBUG;
-            for ( keys %buttons ) {
@@ -2505 +2513 @@
-                        if ( $canalfinal ne "" ) {
-                                log_debug( "$heading clid match trunk ( $_ )  $canal $contexto", 32 ) if DEBUG;
-$canal
+CLID/$calleridnum
-                            $canalfinal =~ s/(.*)\^(.*)/$2/g;
-                        }
@@ -2514 +2522 @@
-                    $canalfinal = "CLID/$calleridnum";
-                }
+                elsif ( $_ =~ /^$server\^DID\/\Q$didnum\E=/ ) {
+                                        print "did num match $didnum\n";
+                                        my ($ccanal, $ssesion) = separate_session_from_channel($canalsesion);
+                                        my $tcanal = "DID/".$didnum."-".$ssesion;
+                                        if ( !exists( $trunk_matched{"$server^DID/$didnum"} ) ) {
+                        $canalfinal = get_next_trunk_button( $tcanal, $contexto, $server, $tcanal );
+                        if ( $canalfinal ne "" ) {
+                                                        print "canalfinal $canalfinal\n";
+                                log_debug( "$heading did match trunk ( $_ )  $canal $contexto", 32 ) if DEBUG;
+                            $trunk_matched{"$server^DID/$didnum"} = 1;
+                            $canalfinal =~ s/(.*)\^(.*)/$2/g;
+                        }
+                    }
+                                }
+                elsif ( $_ =~ /^$server\^DID\/\Q$didnum\E\&?/ ) {
+                    log_debug( "$heading did match ( $_ )  $canal $contexto", 32 ) if DEBUG;
+                    $canalfinal = "DID/$didnum";
+                }
+
-
-                if ( $canalfinal ne "" ) {
@@ -5319 +5346 @@
-                if ( $quehace eq "" ) {
-                    log_debug( "$heading skipping $canal (empty quehace)", 32 ) if DEBUG;
-                                        print "skip empty\n";
-                    next;
-                }
@@ -5874 +5900 @@
-                                push @respuestas, "$interno|settext|$dos";
-                            }
+                            if ( $estadoboton{$interno} eq "" ) {
+                                push @respuestas, "$interno|state|busy";
+                                                                $estadoboton{$interno}="busy";
+                                                        }
-                        } elsif ( $quehace eq "settext" ) {
-                            if ( !defined( $group_count{$interno} ) ) {