Changeset 8

Timestamp:

03/15/07 21:46:57 (2 years ago)

Author:

root

Message:

Refactoring if-elseif, setting clid on newexten prio 1 for showing dialed number. Changing settext to setclid

Files:

• trunk/ming-source/operator_panel.pl (modified) (1 diff)
• trunk/op_server.pl (modified) (22 diffs)

trunk/ming-source/operator_panel.pl

@@ -7724 +7724 @@
-                                        inicio_timer[boton_numero] = 0;
-
-
-
-
+//
+//
+//
-                                                statusclid.text = "";  
-
+//
-
-                                        flechita.gotoAndStop(3);

trunk/op_server.pl

@@ -4473 +4473 @@
-                $sclidname1 = $saved_clidname{"$server^$channel2"};
-                my $clid_with_format = format_clid( $clid1, $sclidname1, $clid_format );
-text
+clid
-            }
-            if ( $clid2 ne "" && $channel1 ne "" ) {
-                $sclidname2 = $saved_clidname{"$server^$channel1"};
-                my $clid_with_format = format_clid( $clid2, $sclidname2, $clid_format );
-text
+clid
-            }
-        }
@@ -4553 +4553 @@
-        }
-
-        # Directamente borra la sesion que se debe renombrar
-        #if ( ( $nuevo_nombre !~ /</ ) && ( $viejo_nombre !~ /</ ) ) {
-        my @final = ();
-
@@ -4624 +4622 @@
-        }
-        $evento = "";    #NEW
-
-
-
+
-        my $tiempo = 0;
-        $canal = $hash_temporal{Peer};
@@ -4655 +4651 @@
-        push @return, "$canal|$estado_final|$texto|$unico_id|$canalid";
-        $evento = "";
-
-
-
+
-        $canal = $hash_temporal{"Exten"};
-        $canal =~ s/(\d+)/SCCP\/$1/g;
@@ -4671 +4665 @@
-        push @return, "$canal|$estado_final|$texto|$unico_id|$canalid";
-        $evento = "";
-
-
-
+
-        $evento = "";
-
-
-
+
-
-        # When done with the status retrieval, generate events to send to
@@ -4770 +4760 @@
-
-        $evento = "";    #NEW (estaba comentado)
-
-
-
+
-        my @bot1 = ();
-        my $bot2 = 0;
-        $estado_final = "meetmeuser";
-"Usernum"} . "," . $hash_temporal{"Meetme"
-'Channel'
-'Meetme'}|setlink|$hash_temporal{'Channel'}||$hash_temporal{'Channel'
-'Meetme'}||$hash_temporal{'Channel'
-#NEW
-
-
-
-
-, defaults to 'Up'
-fill_datos
+Usernum} . "," . $hash_temporal{Meetme
+Channel
+Meetme}|setlink|$hash_temporal{Channel}||$hash_temporal{Channel
+Meetme}||$hash_temporal{Channel
+
+
+
+
+
+ and priority 1, defaults to 'Up' and set setlid
+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'
@@ -4801 +4794 @@
-            log_debug( "$heading NO EXISTE parked{$server^$canalid}", 128 ) if DEBUG;
-        }
-
-
-
+
+
-
-        # Look for attendant_pending and perform a redirect of the
@@ -4862 +4854 @@
-            log_debug( "$heading NO EXISTE parked{$server^$canalid}", 128 ) if DEBUG;
-        }
-
-
-
+
-        my $channel1 = $hash_temporal{"Channel"};
-
@@ -4876 +4866 @@
-            push @return, "$canal1|ocupado5||$unidchan|$channel1";
-        }
-
-
-
+
-        $texto        = "&parked," . $hash_temporal{'Exten'} . "&";
-        $estado_final = "ocupado3";
@@ -4899 +4887 @@
-        $parked{"$server^$hash_temporal{'Channel'}"} = $hash_temporal{'Exten'};
-        $evento = "";    #NEW
-
-
-
+
-        $estado_final = "setstatus";
-        $state        = "Newcallerid";
@@ -4924 +4910 @@
-    # Dont check for $evento bellow this line!
-
+        print "AFTER IF ELSE IF evento = $evento\n";
+
-    if ( $evento ne "" ) {
-        log_debug( "$heading Event $evento, canal '$canal'", 32 ) if DEBUG;
@@ -4977 +4965 @@
-                $exten = $datos{$unico_id}{'Extension'};
-            }
-
-            #if ( exists( $datos{$unico_id}{'State'} ) ) {
-            #    log_debug( "$heading EXISTE datos($unico_id){state}", 32 ) if DEBUG;
-            #    $state = $datos{$unico_id}{'State'};
-            #}
-
-            if ( exists( $datos{$unico_id}{'Callerid'} ) ) {
@@ -5348 +5331 @@
-                }
-
-1
-1
-
-
-1
+32
+32
+ 
+ 
+32
-
-                #                if ( !defined($canal) )   { $canal   = ""; }
@@ -5485 +5468 @@
-                            && $quehace !~ /^state/
-                            && $quehace !~ /^settext/
+                            && $quehace !~ /^setclid/
-                            && $quehace !~ /^setlabel/
-                            && $quehace !~ /^setlink/
@@ -5603 +5587 @@
-                        }
-                        elsif ( $quehace eq "unsetlink" ) {
-
-                            log_debug( "$heading IF quehace = UNSETLINK", 32 ) if DEBUG;
-                            my @final = ();
@@ -5709 +5692 @@
-                                        push @respuestas, "$interno|state|busy";
-
-                                        # Problems with callerid being cleared while a call is connected
-                                        # from a queue using Local channels, so commnet these out
-                                        #push @respuestas, "$interno|settext|";
-                                        #push @respuestas, "$interno|setstatus|";
-                                        $laststatus{$interno} = "busy|${buttontext}";
-
@@ -5719 +5698 @@
-                                          if DEBUG;
-                                    }
+
+                                                                        # Conserva el callerid anterior
-                                    if ( defined( $preestadoboton{$interno} ) ) {
-                                        $estadoboton{$interno} = $preestadoboton{$interno};
@@ -5908 +5889 @@
-
-                        }
+                        elsif ( $quehace eq "setclid" ) {
+                            if ( !defined( $group_count{$interno} ) ) {
+                                push @respuestas, "$interno|settext|$dos";
+                            }
+                        }
-                        elsif ( $quehace eq "settext" ) {
-                            if ( !defined( $group_count{$interno} ) ) {
-                                $botonpermanenttext{$interno} = $dos;
+                                                                print "vino settext a digest permanent $interno = -$dos-\n";
-                                push @respuestas, "$interno|settext|$dos";
-                            }
@@ -6049 +6036 @@
-                                # "isagent". "agentlogoff"
-                                # everything else is pushed
-text
+clid
-                                    log_debug( "$heading skip settext because groupcount is set", 32 ) if DEBUG;
-                                }
@@ -6096 +6083 @@
-                            if ( $quehace2 eq "ring" ) {
-                                push @mensajefinal, "$interno|state|busy";
-
-                                #push @mensajefinal, "$interno|settext|$dos";
-                            }
-                            if ( $quehace2 =~ /corto/ ) {
@@ -6146 +6131 @@
-                                    }
-                                    else {
+                                                                                if ( defined( $botonpermanenttext{$interno} ) ) {
+                                                push @mensajefinal, "$interno|settext|$botonpermanenttext{$interno}";
+                                                                                        print "corto! permanent $interno = -$dos-\n";
+                                                        #$botonpermanenttext{$interno} = $dos;
+                                                                                } 
-                                        $botonclid{$interno} = "";
+                                                                                
-                                    }
-
@@ -7948 +7939 @@
-        if ( keys(%botonpermanenttext) ) {
-            for $interno ( keys %botonpermanenttext ) {
+                                print "permanente $interno -$botonpermanenttext{$interno}-\n";
-                if ( $botonpermanenttext{$interno} ne "" ) {
-                    send_status_to_flash( $socket, "$interno|settext|$botonpermanenttext{$interno}", 0 );