diff --git a/scripts/importRatingTables.php b/scripts/importRatingTables.php index 2527ee1..0672369 100755 --- a/scripts/importRatingTables.php +++ b/scripts/importRatingTables.php @@ -1,32 +1,32 @@ #!/usr/bin/env php ImportCSVFiles(); if ($RatingTables->mustReload) { if (!reloadRatingEngineTables()) { print "Error: cannot connect to network rating engine\n"; } } diff --git a/scripts/normalize.php b/scripts/normalize.php index 957c31b..d0a0820 100755 --- a/scripts/normalize.php +++ b/scripts/normalize.php @@ -1,110 +1,110 @@ #!/usr/bin/env php db_class)) { $db_class = $CDRS->db_class[0]; } else { $db_class = $CDRS->db_class; } - if ($table) $CDRS->table=$table; + if ($table) $CDRS->table = $table; $log = sprintf("Normalize datasource %s, database %s, table %s\n", $k, $db_class, $CDRS->table); print $log; syslog(LOG_NOTICE, $log); $CDRS->NormalizeCDRS(); - $e=time(); - $d=$e-$b; + $e = time(); + $d = $e - $b; if ($CDRS->status['cdr_to_normalize']) { - $speed=0; + $speed = 0; if ($d) $speed = number_format($CDRS->status['cdr_to_normalize']/$d, 0, "", ""); $log = sprintf( " %d CDRs, %d normalized in %s s @ %s cps\n", $CDRS->status['cdr_to_normalize'], $CDRS->status['normalized'], $d, $speed ); print $log; syslog(LOG_NOTICE, $log); } if (!$table && preg_match("/^(\w+)\d{6}$/", $CDRS->table, $m)) { $lastMonthTable=$m[1].date('Ym', mktime(0, 0, 0, date("m")-1, "01", date("Y"))); $log = sprintf("Normalize datasource %s, database %s, table %s\n", $k, $db_class, $lastMonthTable); print $log; syslog(LOG_NOTICE, $log); - $b=time(); + $b = time(); $CDRS->table = $lastMonthTable; $CDRS->NormalizeCDRS(); if ($CDRS->status['cdr_to_normalize']) { - $e=time(); - $d=$e-$b; + $e = time(); + $d = $e - $b; - $speed=0; + $speed = 0; if ($d) $speed = number_format($CDRS->status['cdr_to_normalize']/$d, 0, "", ""); $log = sprintf( " %d CDRs, %d normalized in %s s @ %s cps\n", $CDRS->status['cdr_to_normalize'], $CDRS->status['normalized'], $d, $speed ); print $log; syslog(LOG_NOTICE, $log); } } } } keepAliveRatingEngine();