[Astpp-commit] SF.net SVN: astpp:[2328] trunk/freeswitch

[<dar...@us...>]

Revision: 2328
          http://astpp.svn.sourceforge.net/astpp/?rev=2328&view=rev
Author:   darrenkw
Date:     2011-01-11 03:19:05 +0000 (Tue, 11 Jan 2011)

Log Message:
-----------
Fixed a few issues.

Modified Paths:
--------------
    trunk/freeswitch/astpp-fs-cdr-xml.pl
    trunk/freeswitch/astpp-fs-xml.pl

Modified: trunk/freeswitch/astpp-fs-cdr-xml.pl
===================================================================
--- trunk/freeswitch/astpp-fs-cdr-xml.pl	2011-01-05 06:13:02 UTC (rev 2327)
+++ trunk/freeswitch/astpp-fs-cdr-xml.pl	2011-01-11 03:19:05 UTC (rev 2328)
@@ -16,12 +16,10 @@
 use DBI;
 use CGI;
 use CGI qw/:standard Vars/;
-use ASTPP;
+use ASTPP ':all';
 use URI::Escape;
 use strict;
-#use XML::Simple;
 use Data::Dumper;
-#use XML::Twig;
 use XML::LibXML;
 
 
@@ -145,7 +143,7 @@
 	$cdrinfo->{destination_number} = $cdrinfo->{callingcard_destination};
 }
 
-print STDERR Dumper $cdrinfo;
+print STDERR Dumper $cdrinfo if $config->{debug} == 1;
 
 my $tmp = "INSERT INTO " . $config->{freeswitch_cdr_table} . "(accountcode,src,dst,dcontext,clid,channel,dstchannel,lastapp,"
 	. "lastdata,calldate,answerdate,enddate,duration,billsec,disposition,amaflags,uniqueid,userfield,read_codec,"
@@ -204,22 +202,23 @@
 	. "'" . $cdrinfo->{progress_mediamsec} . "'"
 	. ")";
 
-print STDERR "\n" . $tmp . "\n";
+print STDERR "\n" . $tmp . "\n" if $config->{debug} == 1;
 $cdr_db->do($tmp);
 print "Wrote CDR\n";
 my (@chargelist);
 push @chargelist, $cdrinfo->{uuid};
 &processlist( $astpp_db, $cdr_db, $config, \@chargelist );
-print STDERR "VENDOR CHARGES: " . $config->{trackvendorcharges} . "\n";
+print STDERR "VENDOR CHARGES: " . $config->{trackvendorcharges} . "\n" if $config->{debug} == 1;
 &vendor_process_rating_fs( $astpp_db, $cdr_db, $config, "none",  $cdrinfo->{uuid},"" ) if $config->{trackvendorcharges} == 1;
 
-if ($cdrinfo->{callingcard_destination} && $cdrinfo->{direction} eq "outbound") {
+if ( $cdrinfo->{callingcard_destination} && $cdrinfo->{direction} eq "outbound") {
 	&process_callingcard_cdr;    
 }
 	
 sub process_callingcard_cdr() {
 	my ( $cardinfo, $brandinfo, $numberinfo, $pricelistinfo,$cc );
 	my $destination = $cdrinfo->{destination_number};
+	$cdrinfo->{billsec} = 0 if $cdrinfo->{hangup_cause} ne "NORMAL_CLEARING";
 	$destination =~ s/@.*//g;
         my $cardnumber = $cdrinfo->{callingcard};
         $cardinfo = &get_callingcard( $astpp_db, $cardnumber, $config );
@@ -237,9 +236,9 @@
 	$pricelistinfo = &get_pricelist( $astpp_db, $cardinfo->{pricelist} )
 	  if $cc == 1;
 
-                    print STDERR "THIS IS A CALLINGCARD CALL! \n";
-                    print STDERR "CARD: $cardinfo->{cardnumber} \n";
-                    print STDERR "CARD: $cardnumber \n";
+                    print STDERR "THIS IS A CALLINGCARD CALL! \n" if $config->{debug} == 1;
+                    print STDERR "CARD: $cardinfo->{cardnumber} \n" if $config->{debug} == 1;
+                    print STDERR "CARD: $cardnumber \n" if $config->{debug} == 1;
                     $numberinfo = &get_route(
                         $astpp_db, $config,
                         $destination,
@@ -290,7 +289,7 @@
                               ( ( $cardinfo->{min_length_pennies} * 100 ) +
                                   $charge );
                         }
-			print STDERR "CARDNUMBER: " . $cardinfo->{cardnumber};
+			print STDERR "CARDNUMBER: " . $cardinfo->{cardnumber} if $config->{debug} == 1;
                         &write_callingcard_cdr(
                             $astpp_db,
                             $config,
@@ -304,7 +303,8 @@
                         );
                         &callingcard_set_in_use($astpp_db,$cardinfo,0);
                         &callingcard_update_balance($astpp_db,$cardinfo,$charge);
-            }
+            	}
+                        &callingcard_set_in_use($astpp_db,$cardinfo,0);
                 }
 
 

Modified: trunk/freeswitch/astpp-fs-xml.pl
===================================================================
--- trunk/freeswitch/astpp-fs-xml.pl	2011-01-05 06:13:02 UTC (rev 2327)
+++ trunk/freeswitch/astpp-fs-xml.pl	2011-01-11 03:19:05 UTC (rev 2328)
@@ -16,7 +16,7 @@
 use DBI;
 use CGI;
 use CGI qw/:standard Vars/;
-use ASTPP;
+use ASTPP ':all';
 use XML::Simple;
 use Data::Dumper;
 use URI::Escape;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.