Changeset 20

Timestamp:

03/20/07 18:58:22 (2 years ago)

Author:

root

Message:

Fix Did/Trunk free routine and remove debug lines

Files:

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

trunk/op_server.pl

@@ -1936 +1936 @@
-    my $heading = "** ERASE_INSTANCE_TRUNK";
-
+    my $solocanal = $canalid;
+    $solocanal =~ s/[^\w]//g;
+
-    $canalidsinserver = $canalid;
-    $canalid          = "$server^$canalid";
@@ -1964 +1967 @@
-    log_debug( "$heading looking for $canalid on instancias to erase it", 128 ) if DEBUG;
-
+    my $trymatch = $canalid;
+
+    if ( $canal =~ m/^DID|^CLID/ ) {
+        $canal =~ s/(.*)=(.*)/$1/g;
+        $trymatch = $server . "^" . $canal . "-" . $solocanal;
+    }
-    foreach my $key1 ( sort ( keys(%instancias) ) ) {
-        foreach my $key2 ( sort ( keys( %{ $instancias{$key1} } ) ) ) {
-canalid
+trymatch
-                delete $instancias{$key1}{$key2};
-
-
-
-
+
+
+
+
+
-}
-
@@ -2095 +2105 @@
-
-        if ( $canal =~ /=/ ) {
-
-            # If its a trunk button, erase instances
-            erase_instances_for_trunk_buttons( $canalsesion, $canal, $server );
@@ -2350 +2359 @@
-            $calleridnum = $datos{$uniqueid}{CallerID};
-        }
-defined( $datos{$uniqueid}{Extension} ) && 
-
-
-    ) 
+  defined( $datos{$uniqueid}{Extension} )
+
+
+
-            $didnum = $datos{$uniqueid}{"Extension"};
-                        print "set did $didnum\n";
-        }
-    }
@@ -2507 +2515 @@
-                }
-                elsif ( $_ =~ /^$server\^CLID\/\Q$calleridnum\E=/ ) {
-                                       
-                                       
-                                       my $tcanal = "CLID/".$calleridnum."-".
-                                       
+                    
+                    
+                    my $tcanal = "CLID/" . $calleridnum . "-" . 
+                    
-                        $canalfinal = get_next_trunk_button( $tcanal, $contexto, $server, $tcanal );
-                        if ( $canalfinal ne "" ) {
-           
+        
-                            $trunk_matched{"$server^CLID/$calleridnum"} = 1;
-                            $canalfinal =~ s/(.*)\^(.*)/$2/g;
-                        }
-                    }
-                               
+                
-                elsif ( $_ =~ /^$server\^CLID\/\Q$calleridnum\E\&?/ ) {
-                    log_debug( "$heading clid match ( $_ )  $canal $contexto", 32 ) if DEBUG;
@@ -2524 +2532 @@
-                }
-                elsif ( $_ =~ /^$server\^DID\/\Q$didnum\E=/ ) {
-
-
-
-
-
+
+
+
+
-                        $canalfinal = get_next_trunk_button( $tcanal, $contexto, $server, $tcanal );
-                        if ( $canalfinal ne "" ) {
-
-
+
-                            $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 "" ) {
@@ -4774 +4779 @@
-    elsif ( $evento eq "newexten" ) {
-
-        print "newexten\n";
-
-        # If its a new extension without state and priority 1, defaults to 'Up' and set setlid
-        if ( !defined( $datos{$unico_id}{'State'} ) && $hash_temporal{Priority} == 1 ) {
@@ -4781 +4784 @@
-            log_debug( "$heading POPULATES datos($unico_id){ State } = Up", 128 ) if DEBUG;
-            ( $canal, $sesion ) = separate_session_from_channel( $hash_temporal{Channel} );
-
-
-
-
-
-
-
+
+
+
+
-        }
-
@@ -4811 +4811 @@
-            log_debug( "Save " . $hash_temporal{Channel} . " as pending", 16 ) if DEBUG;
-        }
-
-
-    }
@@ -5045 +5044 @@
-
-        if ( $state eq "Ring" ) {
-            print "RING $canalid $texto\n";
-            $texto                      = $canalid;
-            $estado_final               = "ring";
@@ -5267 +5265 @@
-    # Remove &context from $canal
-    $canal =~ s/(.*)&(.*)/$1/g;
-
-    #   if( $canal =~ m/^CLID/ ) {
-    #                   my $extr = $extension_transfer{"$server^$canal"};
-    #           $extr =~ s/\d+\^(.*)/$1/g;
-    #           $canal = "Local/$extr";
-    #   }
-
-    log_debug( "** LOCAL_CHANNELS devuelvo $server canal $canal", 32 ) if DEBUG;
@@ -5357 +5349 @@
-                log_debug( "$heading canalid:  $canalid",  32 ) if DEBUG;
-
-        
+
-                my $real_canal    = $canalid;
-                my $canalidzombie = $canalid;    # Removes whitespace from CHANNEL-ID
@@ -5386 +5378 @@
-                my $cuantos  = @canaleja;
-
-                               
+                
-
-                if ( $quehace eq "corto" || $quehace eq "info" ) {
@@ -5414 +5406 @@
-                    }
-
-
+
+
-
-                    # Remove the agent from the agents_on_queue hash
@@ -5520 +5513 @@
-
-                    if ( $canal eq "" ) {
-
+
+
-                        log_debug( "$heading There is no command defined", 32 ) if DEBUG;
-
-
+
+
-
-                        $interno = $buttons{"$server^$canal"};
@@ -5545 +5540 @@
-                        }
-
-                                               
-                                               
+                        
+                        
-
-                        if ( $quehace eq 'corto' || $quehace eq 'info' ) {
-
-                            my @linked = erase_all_sessions_from_channel( $canalid, $canal, $server );
+
-                            push @linked, $canal;
-                            my $btnorinum = "";
@@ -5568 +5563 @@
-                            log_debug( "$heading REMOVING datos { $uniqueid }", 32 ) if DEBUG;
-
-
+
+
-
-                            log_debug( "$heading IF quehace = SETLINK", 32 ) if DEBUG;
@@ -5607 +5603 @@
-                            log_debug( "$heading ENDIF quehace = SETLINK",    32 ) if DEBUG;
-
-
+
+
-                            log_debug( "$heading IF quehace = UNSETLINK", 32 ) if DEBUG;
-                            my @final = ();
@@ -5618 +5615 @@
-                            log_debug( "$heading ENDIF quehace = UNSETLINK", 32 ) if DEBUG;
-
-
+
+
-
-                            delete $botonvoicemail{$interno};
@@ -5634 +5632 @@
-                        }
-
-                                               
+                        
-                        if ( $interno eq "" ) {
-                            log_debug( "$heading MISSING buttons($server^$canal), skipping...", 32 ) if DEBUG;
@@ -5822 +5820 @@
-
-                        log_debug( "$heading Continuo proceso...", 32 ) if DEBUG;
-
+
-                        if ( $quehace =~ /changelabel/ ) {
-                            log_debug( "$heading quehace = changelabel", 32 ) if DEBUG;
@@ -5863 +5861 @@
-                            }
-
-
+
+
-
-                            log_debug( "$heading quehace = park", 32 ) if DEBUG;
@@ -5871 +5870 @@
-                            $timeout = time() + $timeout;
-                            $botonpark{$interno} = "$texto|$timeout";
-
+
+
-                            $botonmeetme{$interno} = $dos;
-
+
+
-                            $botonqueue{$interno} = $dos;
-
+
+
-                            $botonqueue_count{$interno} = $dos;
-
+
+
-                            my $mcola = $quehace;
-                            $mcola =~ s/^info//g;
@@ -5898 +5901 @@
-                            }
-
-
+
+
-                            if ( !defined( $group_count{$interno} ) ) {
-                                push @respuestas, "$interno|settext|$dos";
@@ -5904 +5908 @@
-                            if ( $estadoboton{$interno} eq "" ) {
-                                push @respuestas, "$interno|state|busy";
-
-
-
+
+
+
+
-                            if ( !defined( $group_count{$interno} ) ) {
-                                $botonpermanenttext{$interno} = $dos;
@@ -5912 +5917 @@
-                                push @respuestas, "$interno|settext|$dos";
-                            }
-
+
+
-                            $botonledcolor{$interno} = $dos;
-
+
+
-                            $botonalpha{$interno} = $dos;
-                            push @respuestas, "$interno|setalpha|$dos";
-
+
+
-                            push @respuestas, "$interno|flip|$dos";
-
+
+
-                            if (   $dos ne "."
-                                && $dos ne "original"
@@ -5927 +5936 @@
-                                push @respuestas, "$interno|setlabel|$dos";
-                            }
-
+
+
-                            $botonvoicemail{$interno} = $dos;
-
+
+
-                            $botonvoicemailcount{$interno} = $dos;
-
+
+
-
-                            # This block is for the voicemail client
@@ -5937 +5949 @@
-                            $canalsincontexto =~ s/(.*)&(.*)/$1/g;
-                            push @mensajefinal, "$canalsincontexto\@$canalsincontexto|$quehace|$dos";
-
+
+
-
-                            # This block is for the voicemail client, popups
@@ -6046 +6059 @@
-                                    if ( $quehace2 ne "" ) {
-                                        push @respuestas, "$interno|$quehace2|$dos";
-
+
+
-                                    }
-                                }