Changeset 1019

Timestamp:

09/15/08 09:07:13 (4 months ago)

Author:

areski

Message:

optimization CDR

Files:

• trunk/admin/Public/form_data/FG_var_def_ratecard.inc (modified) (2 diffs)
• trunk/AGI/a2billing.php (modified) (1 diff)
• trunk/common/lib/Class.A2Billing.php (modified) (5 diffs)
• trunk/common/lib/Class.RateEngine.php (modified) (5 diffs)
• trunk/common/lib/interface/constants.php (modified) (2 diffs)

trunk/admin/Public/form_data/FG_var_def_ratecard.inc

@@ -173 +173 @@
-   "" , "", "", "", "" , "A2B_entity_prefix.php?popup_select=1&", ", 'prefix','width=550,height=340,top=20,left=100,scrollbars=1'", gettext("A) Add destination prefixes, ie '441' for UK Landlines.<br>B) Use 'defaultprefix' to setup a rate for all destinations where a specific rate is not provided.<br>C) if you ADD a rate, NOT an EDIT, you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed.<br>D) Asterisk extensions style + POSIX regex syntaxes are supported. '_447[7-9]XXXXXXXX' matches 12-digit UK mobiles. '_X{0,3}(112|999|911)' matches any 0-3 digits followed an emergency number. '_' can be used to add length, and raise the priority."));
-
+
+$HD_Form -> AddEditElement(gettext("Prefix_Destination"),
+   "id_cc_prefix",
+   '$value',    
+   "SELECT",    
+   "", "", "",  
+   "sql",               
+   "cc_prefix", 
+   "destination, id, prefixe",          
+   "", "", "%3 (%1)", "", gettext("This will later replace the field Destination, select here the prefix Destination corresponding to your prefix rate."));
+   
+
-$HD_Form -> AddEditElement(gettext("DESTINATION"),
-   "destination",
@@ -516 +528 @@
-if (ADVANCED_MODE) {
-        // This Variable store the argument for the SQL query
-
+id_cc_prefix, 
-}else{
-        // This Variable store the argument for the SQL query
-
+id_cc_prefix, 
-}
-

trunk/AGI/a2billing.php

@@ -31 +31 @@
-include (dirname(__FILE__)."/lib/phpagi/phpagi-asmanager.php");
-include (dirname(__FILE__)."/lib/Misc.php");
+include (dirname(__FILE__)."/lib/interface/constants.php");
-
-$charge_callback=0;

trunk/common/lib/Class.A2Billing.php

@@ -178 +178 @@
-        */
-        var $CC_TESTING;
-
+
+
+
+
-
-        /* CONSTRUCTOR */
-
-        function A2Billing()
-        {
-                $this -> agiconfig['debug'] = true;
-                //$this -> DBHandle = $DBHandle;
+                
+                $this -> dialstatus_rev_list = Constants::getDialStatus_Revert_List();
-        }
-
-
-        /* Init */
-
-        function Reinit()
-        {
@@ -1080 +1083 @@
-
-                        if (($dialstatus  == "CHANUNAVAIL") || ($dialstatus  == "CONGESTION"))  continue;
-
+
+
+
+
+
+
-                        if ($answeredtime > 0){
-                                $this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[CC_RATE_ENGINE_UPDATESYSTEM: usedratecard K=$K - (answeredtime=$answeredtime :: dialstatus=$dialstatus :: cost=$cost)]");
-sessionid,card_id,nasipaddress,starttime,
-
+ sessionid, card_id, nasipaddress, starttime, 
+id
-                                        "('".$this->uniqueid."', '".$this->channel."',  '".$this->id_card."', '".$this->hostname."',";
-                                if ($this->config['database']['dbtype'] == "postgres"){
@@ -1091 +1099 @@
-                                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                                }
-dialstatus
+terminatecauseid
-                                
-                                $result = $this -> instance_table -> SQLExec ($this->DBHandle, $QUERY, 0);
@@ -1227 +1235 @@
-
-                                                $this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: FOLLOWME=$callcount - (answeredtime=$answeredtime :: dialstatus=$dialstatus :: cost=$cost)]");
-
-
-
+
+
+
+
+
+
+
+
-                                                        "('".$this->uniqueid."', '".$this->channel."',  '".$this->id_card."', '".$this->hostname."',";
-                                                if ($this->config['database']['dbtype'] == "postgres"){
@@ -1236 +1249 @@
-                                                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                                                }
-dialstatus
+terminatecauseid
-                                                
-                                                $result = $this -> instance_table -> SQLExec ($this->DBHandle, $QUERY, 0);

trunk/common/lib/Class.RateEngine.php

@@ -38 +38 @@
-        var $usedtrunk                  = 0;
-        var $freetimetocall_used= 0;
+        
+        // List of dialstatus
+        var $dialstatus_rev_list;
+        
-
-        /* CONSTRUCTOR */
-        function RateEngine ()
-        {
-
+
-        }
-
@@ -55 +59 @@
-                $this -> lastcost = '';
-                $this -> lastbuycost = '';
+                
-        }
-
@@ -1033 +1038 @@
-                else $calltype = 0;
-                
+                if (strlen($this -> dialstatus_rev_list[$dialstatus])>0)
+                        $terminatecauseid = $this -> dialstatus_rev_list[$dialstatus];
+                else
+                        $terminatecauseid = 0;
+                
-                $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, ".
-
+id
-                        " id_trunk, src, sipiax, buyrate, buycost, id_card_package_offer, dnid, id_cc_prefix) VALUES ('".$A2B->uniqueid."', '".$A2B->channel."', '".
-                        $A2B->id_card."', '".$A2B->hostname."', ";
@@ -1044 +1054 @@
-                }
-
-dialstatus
+terminatecauseid
-                                        " '$id_tariffgroup', '$id_tariffplan', '$id_ratecard', '".$this -> usedtrunk."', '".$A2B->CallerID."', '$calltype', ".
-                                        "'$buyrateapply', '$buycost', '$id_card_package_offer', '".$A2B->dnid."', '".$calldestination."')";
@@ -1370 +1380 @@
-};
-
-?>

trunk/common/lib/interface/constants.php

@@ -181 +181 @@
-        public static function getDialStatusList(){
-                $dialstatus_list = array();
-ED
+
-                $dialstatus_list["2"] = array( gettext("BUSY")                  , "2");
-                $dialstatus_list["3"] = array( gettext("NOANSWER")              , "3");
@@ -191 +191 @@
-                $dialstatus_list["9"] = array( gettext("INVALIDARGS")   , "9");
-                return $dialstatus_list;
+        }
+        
+        public static function getDialStatus_Revert_List(){
+                $dialstatus_rev_list = array();
+                $dialstatus_rev_list["ANSWER"]          = 1;
+                $dialstatus_rev_list["BUSY"]            = 2;
+                $dialstatus_rev_list["NOANSWER"]        = 3;
+                $dialstatus_rev_list["CANCEL"]          = 4;
+                $dialstatus_rev_list["CONGESTION"]      = 5;
+                $dialstatus_rev_list["CHANUNAVAIL"] = 6;
+                $dialstatus_rev_list["DONTCALL"]        = 7;
+                $dialstatus_rev_list["TORTURE"]         = 8;
+                $dialstatus_rev_list["INVALIDARGS"] = 9;
+                return $dialstatus_rev_list;
-        }
-