Changeset 30

Timestamp:

04/24/07 01:55:18 (2 years ago)

Author:

root

Message:

Fix split contexto order. Replace nada with undef. Fix recompute_queues states

Files:

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

trunk/op_server.pl

@@ -1507 +1507 @@
-            my $contextoboton = $key;
-            if ( $contextoboton =~ m/\@/ ) {
-
+undef, 
-                $contextoboton =~ tr/a-z/A-Z/;
-            }
@@ -1525 +1525 @@
-            my $contextoboton = $key;
-            if ( $contextoboton =~ m/\@/ ) {
-
+undef, 
-                $contextoboton =~ tr/a-z/A-Z/;
-            }
@@ -1562 +1562 @@
-                my $contextoboton = $key;
-                if ( $contextoboton =~ m/\@/ ) {
-
+undef, 
-                    $contextoboton =~ tr/a-z/A-Z/;
-                }
@@ -1581 +1581 @@
-                my $contextoboton = $key;
-                if ( $contextoboton =~ m/\@/ ) {
-
+undef, 
-                    $contextoboton =~ tr/a-z/A-Z/;
-                }
@@ -1797 +1797 @@
-        }
-        log_debug( "$heading contexto $contexto", 32 ) if DEBUG;
-$nada
+undef
-        $sesion = $ses;
-    }
@@ -1946 +1946 @@
-    $canalglobal =~ s/IAX2\[(.*)@(.*)\]/IAX2\[$1\]/g;
-
-$nada
+undef
-    if ( !defined($contexto) ) { $contexto = ""; }
-
@@ -1993 +1993 @@
-    }
-
-$nada1
+undef
-    if ( !defined($contexto1) ) { $contexto1 = ""; }
-
@@ -2009 +2009 @@
-            my @linkbotones = find_panel_buttons( $canal1, $canalsesion, $server );
-            foreach my $cual (@linkbotones) {
-$nada2
+undef
-                if ( !defined($contexto2) ) { $contexto2 = ""; }
-                if ( $contexto1 eq $contexto2 ) {
@@ -2476 +2476 @@
-                $server     = $server_original;
-                $canalfinal = "";
-$nada
+undef
-                if ( !defined($contexto) ) { $contexto = ""; }
-                if ( $contexto ne "" ) { $contexto = "&" . $contexto; }
@@ -2564 +2564 @@
-            $canalfinal = "";
-
-            my $nada1      = "";
-            my $contextemp = "";
-            my %contextosencontrados;
-            for my $val (@canales) {
-$nada1
+undef
-                if ( !defined($contextemp) ) { $contextemp = ""; }
-                $contextosencontrados{"&$contextemp"} = 1;
@@ -3034 +3033 @@
-        #TalkTime: 557
-        #Reason: agent
-$nada
+undef
-        request_queue_status( $socket, $canal );
-        my @respuestas = set_queueobject( $server, $canal, "status", 1 );
@@ -3210 +3209 @@
-        my $dorigen  = "";
-        my $ddestino = "";
-        my $dnada    = "";
-        $remote_callerid{$key}      = $hash_temporal{"CallerID"};
-        $remote_callerid_name{$key} = $hash_temporal{"CallerIDName"};
@@ -3220 +3218 @@
-            # so we can map outgoing calls to Agent buttons
-            # It will only work after the agent receives at least one call
-$dnada
-$dnada
+undef
+undef
-            if ( exists( $channel_to_agent{"$server^$dorigen"} ) ) {
-                my $agente = $channel_to_agent{"$server^$dorigen"};
@@ -3264 +3262 @@
-        my $valor = "";
-        $estado_final = "astdb";
-my $nada
+undef
-        $canalid = $hash_temporal{"Channel"} . "-XXXX";
-        my $clave = $hash_temporal{"Family"};
@@ -3312 +3310 @@
-        # XXXX It will have to store this value internally in future version
-        # to avoid polling asterisk every time
-my $nada
+undef
-        $texto = $hash_temporal{"IP"};
-        my $serv = $hash_temporal{"Server"};
@@ -3328 +3326 @@
-        my $color = "";
-        my $state = "";
-my $nada
+undef
-        $color        = $hash_temporal{"Color"};
-        $state        = $hash_temporal{"State"};
@@ -3336 +3334 @@
-    }
-    elsif ( $evento eq "foppopup" ) {
-my $nada
+undef
-        my $url    = $hash_temporal{"URL"};
-        my $target = $hash_temporal{"Target"};
@@ -3347 +3345 @@
-    }
-    elsif ( $evento eq "refreshqueue" ) {
-my $nada
+undef
-
-        # Turns off led of the agent that generated the refresh
@@ -3397 +3395 @@
-            # so we populate some internal structures. If not, its a fake
-            # callbacklogin from the show agents cli command
-my $nada
+undef
-            $canal =~ tr/a-z/A-Z/;
-        }
@@ -3579 +3577 @@
-
-            # This catches a live real Agentlogin event
-my $nada
+undef
-            $canalreal =~ tr/a-z/A-Z/;
-            $channel_to_agent{"$server^$canalreal"}   = "Agent/$texto";
@@ -4038 +4036 @@
-    }
-    elsif ( $evento eq "meetmemute" || $evento eq "meetmeunmute" ) {
-$nada
+undef
-        $estado_final = $evento;
-        push @return, "$canal|$evento||$unico_id|$canalid";
@@ -4114 +4112 @@
-        my $originate        = "no";
-        my $mute_other_party = "no";
-        my $nada             = "";
-        my $contexto         = "";
-
@@ -4317 +4314 @@
-        }
-
-$nada1
+undef
-        push @return, "$canal1|unsetlink|$canal|$unico_id|$canalid";
-        $evento = "";
@@ -4553 +4550 @@
-        if ( $nuevo_nombre =~ /<ZOMBIE>/ ) {
-            log_debug( "$heading $nuevo_nombre, asterisk bug, sometimes misses the hangup, so we fake it", 64 ) if DEBUG;
-$nada
+undef
-            push @return, "$canalnuevo|corto||$unico_id|$nuevo_nombre";
-        }
@@ -4597 +4594 @@
-
-                    if ( defined($canalcambiado) ) {
-$nada
+undef
-                        push @return, "$canalito|$estado_final|$nuevo_nombre|$unico_id|$canalcambiado";
-$nada
+undef
-                        push @return, "$canalito|$estado_final|$canalcambiado|$unico_id|$nuevo_nombre";
-                        $canal = $canalito;
@@ -4777 +4774 @@
-        $estado_final = "meetmeuser";
-        $texto        = $hash_temporal{Usernum} . "," . $hash_temporal{Meetme};
-$nada1
+undef
-        push @return, "$hash_temporal{Meetme}|setlink|$hash_temporal{Channel}||$hash_temporal{Channel}";
-        push @return, "$chan1|setlink|$hash_temporal{Meetme}||$hash_temporal{Channel}";
@@ -4895 +4892 @@
-        $texto        = "&parked," . $hash_temporal{'Exten'} . "&";
-        $estado_final = "ocupado3";
-$nada
+undef
-        my $textid   = "";
-        my $timeout  = "";
@@ -5323 +5320 @@
-        }
-        @mensajes = procesa_bloque( $blaque, $socket, $astmanproxy_server );
+
-        foreach my $mensaje (@mensajes) {
-            if ( defined($mensaje) && $mensaje ne "" ) {
@@ -5489 +5487 @@
-                            && $quehace !~ /^unsetlink/ )
-                        {
-$nada
+undef
-                            if ( !defined($elcontexto) ) { $elcontexto = ""; }
-                            if ( $elcontexto ne "" ) {
@@ -5522 +5520 @@
-
-                        $interno = $buttons{"$server^$canal"};
-
-                        if ( !defined($interno) ) {
-                            $interno     = $buttons{"-1^$canal"};
@@ -5568 +5565 @@
-
-                            log_debug( "$heading IF quehace = SETLINK", 256 ) if DEBUG;
-$nada1
+undef
-                            if ( !defined($contexto1) ) { $contexto1 = ""; }
-                            my $listabotones = "";
@@ -5581 +5578 @@
-                            my @linkbotones = find_panel_buttons( $canal1, $dos, $server );
-                            foreach (@linkbotones) {
-$nada2
+undef
-                                if ( !defined($contexto2) ) { $contexto2 = ""; }
-                                if ( $contexto1 eq $contexto2 ) {
@@ -5728 +5725 @@
-                                            "$heading Y es distinto al ultimo estado $laststatus{$interno} ne $estadoboton{$interno}", 256 )
-                                          if DEBUG;
-
+ 
-
-                                    # Conserva el callerid anterior
@@ -5822 +5819 @@
-                                    }
-                                    $estadoboton{$interno} = "busy|${buttontext}";
-
-                                }
-                            }
@@ -6058 +6054 @@
-
-                                if ( defined( $cambiaron{$interno} ) && $cambiaron{$interno} == 1 ) {
-                                    log_debug( "$heading pushing respuestas $interno|$quehace2|$dos", 256 ) if DEBUG;
-
-                                    # Discard events that we dont want to send
@@ -6070 +6065 @@
-                                        if ( $quehace2 ne "" ) {
-                                            push @respuestas, "$interno|$quehace2|$dos";
-
-
-
+
+
-                                    }
-                                }
@@ -6088 +6082 @@
-                            if ( $quehace2 eq "settimer" ) {
-                                my $tiempo = $dos;
-nada
+timer_type
-                                if ( $tiempo =~ /\@/ ) {
-nada
+timer_type
-                                }
-nada
-nada
-nada = "\@" . $nada
+timer_type
+timer_type
+timer_type = "\@" . $timer_type
-                                }
-                                $botontimer{$interno} = time() - $tiempo;
-nada
+timer_type
-                            }
-
@@ -7015 +7009 @@
-    if ( $accion =~ /^contexto\d+/ ) {
-
-$nada
+undef
-
-        if ( defined($contextoenviado) ) {
@@ -7766 +7760 @@
-    my $canalid    = shift;
-    my $member     = "";
-    my $nada       = "";
-    my $showagents = 0;
-
@@ -7776 +7769 @@
-        }
-        else {
-$nada
+undef
-        }
-    }
@@ -8116 +8109 @@
-    my $interno    = "";
-    my $estado     = "";
-    my $nada       = "";
-    my $conference = 0;
-    my $usernum    = 0;
@@ -8865 +8857 @@
-                  $cola->{$id}{QUEUE} . "="
-                  . $cola->{$id}{POSITION}
-state|busy
+ocupado|[$clidtext]
-                  . $cola->{$id}{QUEUE} . "-"
-                  . $cola->{$id}{SERVER} . "|$id";
-state|busy
+ocupado|[$clidtext]
-                push @return_ocupado,
-                  $cola->{$id}{QUEUE} . "|settimer|0\@STOP|" . $cola->{$id}{QUEUE} . "-" . $cola->{$id}{SERVER} . "|$id";
-                push @return_ocupado,
-                  $cola->{$id}{QUEUE} . "="
-                  . $cola->{$id}{POSITION}
-                  . "|settextnopermanente|[$clidtext]|"
-                  . $cola->{$id}{QUEUE} . "-"
-                  . $cola->{$id}{SERVER} . "|$id";
-            }
-        }