Changeset 46

Timestamp:

06/21/07 19:01:52 (1 year ago)

Author:

root

Message:

Add Monitoring to FOP actions by single clicking on the arrow

Files:

• trunk/ming-source/comunicator.pl (modified) (2 diffs)
• trunk/ming-source/operator_panel.pl (modified) (2 diffs)
• trunk/op_server.cfg (modified) (1 diff)
• trunk/op_server.pl (modified) (15 diffs)

trunk/ming-source/comunicator.pl

@@ -140 +140 @@
-                                _global.restrict = numeroboton;
-                _global.mybutton = numeroboton;
-                                var myresa = eval('_root.resaltado'+_global.restrict);
-                                myresa._visible = true;
-                                return;
-                        }
-
@@ -155 +152 @@
-
-                        if (_root.context == boton_contexto) {
-
+
+
+
+
+
+
+
-                        }
-                        // endif root.context

trunk/ming-source/operator_panel.pl

@@ -9405 +9405 @@
-                // Un solo click
-                if (clip._name.substring(0, 7) != "casilla") {
-
-
+
+
+
+
+
+
+
-                                        var statusclid = eval("rectangulo"+numeroclip+".statusprint"+numeroclip);
-                                        if (_root.context.length>0) {
-                                        boton_numero_con_contexto = numeroclip+"@"+context;
-                                    } else {
-                                        boton_numero_con_contexto = numeroclip;
-                                        }
-                                        if (_global.meetmemute[numeroclip]>0) {
-                                                logea("envio meetmemute");
@@ -9425 +9425 @@
-                                        }
-                                } else {
-
-
-
-
+
+
+
-                        } else {
-
-
+
+
+
+
-                } else {
-"
+ "+clip._name
-                }
-        }

trunk/op_server.cfg

@@ -230 +230 @@
-;attendant_failure_redirect_to = 6${EXTEN}@${CONTEXT}
-
+; It is possible to start monitoring a conversation
+; by single clicking on the arrow for a button
+; FOP will use a filename and format based on the
+; following two paramters:
+
+;monitor_filename = FOP-${CLIDNUM}-${LINK}-${UNIQUEID}
+;monitor_format = gsm
+
+
-; You can have panel contexts with their own
-; button layout and configuration. The following entry

trunk/op_server.pl

@@ -38 +38 @@
-my %datos          = ();
-my %chanvar        = ();
+my %monitoring     = ();
-my %passvar        = ();
-my %sesbot         = ();
@@ -570 +571 @@
-    }
-
+    if ( !defined $config->{GENERAL}{monitor_filename} ) {
+        $config->{GENERAL}{monitor_filename} = "\${UNIQUEID}";
+    }
+
+    if ( !defined $config->{GENERAL}{monitor_format} ) {
+        $config->{GENERAL}{monitor_format} = "wav";
+    }
+
-    if ( !defined $clid_privacy ) {
-        $clid_privacy = 0;
@@ -2070 +2079 @@
-    log_debug( "$heading borro cache_hit($indice_cache)", 128 ) if DEBUG;
-    delete $cache_hit{$indice_cache};
+    delete $monitoring{$canalsesion};
-    if ( keys(%cache_hit) ) {
-        for ( keys %cache_hit ) {
@@ -2891 +2901 @@
-    elsif ( $evento =~ /^OriginateFailure$/ )          { $evento = "originatefailure"; }
-    elsif ( $evento =~ /^ChannelReload$/ )             { $evento = "channelreload"; }
+    elsif ( $evento =~ /^response-/ )                  { $evento = "monitor"; }
-    else { log_debug( "$heading No event match ($evento)", 32 ); }
-
@@ -2909 +2920 @@
-    }
-
-
+
+
+
+
+
+
+
+
-
-        # Event: ChannelReload
@@ -4940 +4958 @@
-        $parked{"$server^$hash_temporal{'Channel'}"} = $parksl;
-        $evento = "";    #NEW
-        print "park PARK/$parksl|park|[$textid]$timeout|$hash_temporal{'Timeout'}-$server|$hash_temporal{'Channel'}\n";
-    }
-    elsif ( $evento eq "newcallerid" ) {
@@ -4966 +4983 @@
-
-    if ( $evento ne "" ) {
-
+, estadofinal $estado_final
-
-        # De acuerdo a los datos de la extension genera
@@ -6689 +6706 @@
-                                        || $bloque_final =~ /Message: Mailbox/
-                                        || $bloque_final =~ /SIP-CanReinvite/
+                                        || $bloque_final =~ /ActionID: monitor-/
-                                        || $bloque_final =~ /Message: Timeout/ )
-                                    {
@@ -6699 +6717 @@
-                                                $block_count++;
-                                                $bloque[$block_count]{Event} = "sippeerentrylong";
+                                            }
+                                            elsif ( $p =~ /ActionID: monitor-/ ) {
+                                                my ( undef, $quemonitor, $quecana ) = split( /-/, $p, 3 );
+                                                $block_count++;
+                                                $bloque[$block_count]{Event}   = "response-$quemonitor";
+                                                $bloque[$block_count]{Channel} = $quecana;
-                                            }
-                                            my $my_event = "";
@@ -6853 +6877 @@
-    my $res   = syswrite( $socket, $encriptadofinal, $largo );
-
-undef, undef, undef, 0.0.1
+ undef, undef, undef, 0.01 
-
-    if ( defined $res && $res > 0 ) {
@@ -7306 +7330 @@
-                    ($destino) = split( /\&/, $destino );
-                    log_debug( "$heading El boton de destino es $destino en el server $destin_server", 64 ) if DEBUG;
-                    print("$heading El boton de destino es $destino en el server $destin_server\n");
-                }
-            }
@@ -7412 +7435 @@
-            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                my $buton_number = $datosflash;
-                log_debug( "$heading Will try to hangup channel para el boton $buton_number", 16 ) if DEBUG;
@@ -7713 +7764 @@
-    }
-    $tab = substr( $tab, 0, -1 ) if DEBUG;
+}
+
+sub compute_monitoring_filename {
+    my $unique       = shift;
+    my $panelcontext = shift;
+    my $filename     = "";
+    my $format       = "";
+    my @return;
+    my %hasha;
+
+    if ( !defined( $config->{$panelcontext}{monitor_filename} ) ) {
+        $filename = $config->{GENERAL}{monitor_filename};
+    }
+    else {
+        $filename = $config->{$panelcontext}{monitor_filename};
+    }
+    if ( !defined( $config->{$panelcontext}{monitor_format} ) ) {
+        $format = $config->{GENERAL}{monitor_format};
+    }
+    else {
+        $format = $config->{$panelcontext}{monitor_format};
+    }
+
+    while ( my ( $key, $val ) = each( %{ $datos{$unique} } ) ) {
+        $key =~ tr/a-z/A-Z/;
+        if ( $key eq "CALLERID" ) {
+            $key = "CLID";
+        }
+        elsif ( $key eq "CALLERIDNUM" ) {
+            $key = "CLIDNUM";
+        }
+        elsif ( $key eq "CALLERIDNAME" ) {
+            $key = "CLIDNAME";
+        }
+        elsif ( $key eq "UNIQUEID" ) {
+            my ( $realunique, undef ) = split( /-/, $val, 2 );
+            $val = $realunique;
+        }
+        $hasha{$key} = $val;
+    }
+    $filename =~ s/\${CLIDNAME}/$hasha{CLIDNAME}/gi;
+    $filename =~ s/\${CLIDNUM}/$hasha{CLIDNUM}/gi;
+    $filename =~ s/\${CLID}/$hasha{CLID}/gi;
+    $filename =~ s/\${UNIQUEID}/$hasha{UNIQUEID}/gi;
+    $filename =~ s/\${CHANNEL}/$hasha{CHANNEL}/gi;
+    $filename =~ s/\${LINK}/$hasha{LINK}/gi;
+    $filename =~ s/\//-/gi;
+    push @return, $filename;
+    push @return, $format;
+    return @return;
-}
-
@@ -7964 +8065 @@
-            for $interno ( keys %botonpermanenttext ) {
-                if ( $botonpermanenttext{$interno} ne "" ) {
-                    print "permanente $interno -$botonpermanenttext{$interno}-\n";
-                    send_status_to_flash( $socket, "$interno|settext|$botonpermanenttext{$interno}", 0 );
-                }
@@ -8564 +8664 @@
-                    $match++;
-                }
-$val eq $server
+( $val eq $server || $server eq "-1" )
-                    $match++;
-                }