Changeset 9

Timestamp:

03/16/07 11:14:47 (2 years ago)

Author:

root

Message:

If/elseif refactoring plus fixing newexten duplication in procesabloque

Files:

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

trunk/op_server.pl

@@ -2907 +2907 @@
-        }
-        $evento = "";
-
-    }
-    elsif ( $evento eq "originatefailure" ) {
@@ -2990 +2989 @@
-        $evento = "";
-
-    }
-    elsif ( $evento eq "newexten" ) {
-
-        if ( exists( $pending_uniqueid_attendant{ $hash_temporal{Uniqueid} } ) ) {
-
-            # This was from an originatesuccess for attendant transfers
-            # so remove the hash element and add it to attendant_pending hash
-            # that is used for look for hangups and perform redirects
-
-            $attendant_pending{ $hash_temporal{Channel} } = $pending_uniqueid_attendant{ $hash_temporal{Uniqueid} };
-            delete $pending_uniqueid_attendant{ $hash_temporal{Uniqueid} };
-            log_debug( "Save " . $hash_temporal{Channel} . " as pending", 16 ) if DEBUG;
-        }
-    }
-    elsif ( $evento eq "agentcomplete" ) {
@@ -3021 +3007 @@
-            push @return, $_;
-        }
-
-    }
-    elsif ( $evento eq "PeerlistComplete" ) {
@@ -3053 +3038 @@
-        $autosip_detail{"autosipentry-$cnt_autosip"} = 1;
-        send_reload_to_flash();
-
-    }
-    elsif ( $evento eq "sippeerentrylong" ) {
@@ -3149 +3133 @@
-            $autosip{"$server^$peer"}{server} = $server;
-        }
-
-    }
-    elsif ( $evento eq "agentcalled" ) {
@@ -3167 +3150 @@
-        push @return, "$canal|$estado_final|$texto|$canalid-$server|$canalid";
-        $evento = "";
-
-    }
-    elsif ( $evento eq "agentconnect" ) {
@@ -3188 +3170 @@
-
-        $evento = "";
-
-    }
-    elsif ( $evento eq "dial" ) {
@@ -3283 +3264 @@
-        $evento = "";
-    }
-
-
+
-        $estado_final = "timeout";
-        $texto        = $timeout;
@@ -3294 +3274 @@
-        $evento = "";
-    }
-
-
+
-
-        # Sends the IP address of the peer to the flash client
@@ -3313 +3292 @@
-        }
-    }
-
-
+
-        my $color = "";
-        my $state = "";
@@ -3324 +3302 @@
-        $evento = "";
-    }
-
-
+
-        ( $canal, my $nada ) = separate_session_from_channel( $hash_temporal{"Channel"} );
-        my $url    = $hash_temporal{"URL"};
@@ -3336 +3313 @@
-        $evento = "";
-    }
-
-
+
-        ( $canal, my $nada ) = separate_session_from_channel( $hash_temporal{"Channel"} );
-
@@ -3348 +3324 @@
-        $evento = "";
-    }
-
-
+
-        my $canal      = "";
-        my $canallocal = "";
@@ -3466 +3441 @@
-        $evento = "";
-    }
-
-
+
-        my $canal   = $hash_temporal{Location};
-        my $canalid = $canal . "-XXXX";
@@ -3516 +3490 @@
-
-    }
-
-
+
-        my $colar      = $hash_temporal{Queue};
-        my $canal      = $hash_temporal{Location};
@@ -3534 +3507 @@
-        $evento = "";
-    }
-
-
+
-
-        my $colar      = $hash_temporal{Queue};
@@ -3566 +3538 @@
-
-    }
-
-
+
-
-        my $labeltext = ".";
@@ -3719 +3690 @@
-        }
-    }
-
-
+
-
-        $canal = "Agent/" . $hash_temporal{Agent};
@@ -3827 +3797 @@
-
-    }
-
-
+
-
-        if ( defined( $max_queue_waiting_time_for{"$hash_temporal{Queue}-$hash_temporal{Server}"} ) ) {
@@ -3852 +3821 @@
-        $fakecounter++;
-    }
-
-
+
-        for my $cola_server ( keys %max_queue_waiting_time_for ) {
-            my ( $cola, $server ) = ( $cola_server =~ m/(.*)-(.*)/ );
@@ -3870 +3838 @@
-        }
-    }
-
-
+
-
-        my $canalag = $hash_temporal{"Location"};
@@ -4020 +3987 @@
-        $evento = "";
-    }
-
-
+
-        $canal   = $hash_temporal{Queue};
-        $canalid = $canal . "-XXXX";
@@ -4038 +4004 @@
-        $evento = "";
-    }
-
-
+
-        my ( $canal, $nada ) = separate_session_from_channel($canalid);
-        $estado_final = $evento;
@@ -4045 +4010 @@
-        $evento = "";
-    }
-
-
+
-        $canal = $hash_temporal{Queue};
-        $canal =~ tr/a-z/A-Z/;
@@ -4071 +4035 @@
-        $evento = "";
-    }
-
-
+
-        my $qclidnum  = "";
-        my $qclidname = "";
@@ -4115 +4078 @@
-
-    }
-
-
+
-        my $originate        = "no";
-        my $mute_other_party = "no";
@@ -4300 +4262 @@
-        push @return, "$canalfin|meetmeuser|$hash_temporal{Usernum},$hash_temporal{Meetme}|YYYY-$server|$hash_temporal{Channel}";
-    }
-
-
+
-        $canal = $hash_temporal{Meetme};
-        $canal =~ tr/a-z/A-Z/;
@@ -4331 +4292 @@
-        push @return, "$canalfin|corto||$hash_temporal{Uniqueid}-$server|$canaleja";
-    }
-
-
+
-        $canal = "QUEUE/" . $hash_temporal{"Queue"};
-        $canal =~ tr/a-z/A-Z/;
@@ -4351 +4311 @@
-        print_sesbot(2);
-    }
-
-
+
-        my @canalesvoicemail = ();
-
@@ -4389 +4348 @@
-        $evento = "";
-    }
-
-
+
-        my $uniqueid1 = $hash_temporal{"Uniqueid1"};
-        my $uniqueid2 = $hash_temporal{"Uniqueid2"};
@@ -4486 +4444 @@
-        $evento = "";    #NEW
-    }
-
-
+
-        my $uniqueid1 = $hash_temporal{Uniqueid1};
-        my $uniqueid2 = $hash_temporal{Uniqueid2};
@@ -4531 +4488 @@
-        $evento = "";    #NEW
-    }
-
-
+
-        my $nuevo_nombre = "";
-        my $viejo_nombre = "";
@@ -4622 +4578 @@
-        }
-        $evento = "";    #NEW
-
+
+
-        my $tiempo = 0;
-        $canal = $hash_temporal{Peer};
@@ -4651 +4608 @@
-        push @return, "$canal|$estado_final|$texto|$unico_id|$canalid";
-        $evento = "";
-
+
+
-        $canal = $hash_temporal{"Exten"};
-        $canal =~ s/(\d+)/SCCP\/$1/g;
@@ -4665 +4623 @@
-        push @return, "$canal|$estado_final|$texto|$unico_id|$canalid";
-        $evento = "";
-
+
+
-        $evento = "";
-
+
+
-
-        # When done with the status retrieval, generate events to send to
@@ -4760 +4720 @@
-
-        $evento = "";    #NEW (estaba comentado)
-
+
+
-        my @bot1 = ();
-        my $bot2 = 0;
@@ -4768 +4729 @@
-        push @return, "$hash_temporal{Meetme}|setlink|$hash_temporal{Channel}||$hash_temporal{Channel}";
-        push @return, "$chan1|setlink|$hash_temporal{Meetme}||$hash_temporal{Channel}";
-
-
-
-
-
+
+
+
+
+
+
+
-        # 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 ) {
-            $datos{$unico_id}{'State'} = "Up";
-            log_debug( "$heading POPULATES datos($unico_id){ State } = Up", 128 ) if DEBUG;
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        # If its a parked channel, set the PARK button to 'Down'
@@ -4795 +4759 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Look for attendant_pending and perform a redirect of the
@@ -4854 +4831 @@
-            log_debug( "$heading NO EXISTE parked{$server^$canalid}", 128 ) if DEBUG;
-        }
-
+
+
-        my $channel1 = $hash_temporal{"Channel"};
-
@@ -4866 +4844 @@
-            push @return, "$canal1|ocupado5||$unidchan|$channel1";
-        }
-
+
+
-        $texto        = "&parked," . $hash_temporal{'Exten'} . "&";
-        $estado_final = "ocupado3";
@@ -4887 +4866 @@
-        $parked{"$server^$hash_temporal{'Channel'}"} = $hash_temporal{'Exten'};
-        $evento = "";    #NEW
-
+
+
-        $estado_final = "setstatus";
-        $state        = "Newcallerid";
@@ -4910 +4890 @@
-    # Dont check for $evento bellow this line!
-
-       
+    
-
-    if ( $evento ne "" ) {
@@ -5331 +5311 @@
-                }
-
- 
- 
- 
- 
- 
+
+
+
+
+
-
-                #                if ( !defined($canal) )   { $canal   = ""; }
@@ -5699 +5679 @@
-                                    }
-
-                                                                       
+                                    
-                                    if ( defined( $preestadoboton{$interno} ) ) {
-                                        $estadoboton{$interno} = $preestadoboton{$interno};
@@ -5897 +5877 @@
-                            if ( !defined( $group_count{$interno} ) ) {
-                                $botonpermanenttext{$interno} = $dos;
-                                                               
+                                
-                                push @respuestas, "$interno|settext|$dos";
-                            }
@@ -6131 +6111 @@
-                                    }
-                                    else {
-
-
-
-
-
+
+
+
+
+
+
-                                        $botonclid{$interno} = "";
-
+
-                                    }
-
@@ -7939 +7920 @@
-        if ( keys(%botonpermanenttext) ) {
-            for $interno ( keys %botonpermanenttext ) {
-                                print "permanente $interno -$botonpermanenttext{$interno}-\n";
-                if ( $botonpermanenttext{$interno} ne "" ) {
+                    print "permanente $interno -$botonpermanenttext{$interno}-\n";
-                    send_status_to_flash( $socket, "$interno|settext|$botonpermanenttext{$interno}", 0 );
-                }