uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Shifting GetAllRatedCdrs into filtered GetRatedCdrs to prepare it for exporter

Browse Source
This commit is contained in:
DanB
2013-11-10 09:01:35 +01:00
parent ec6de7e901
commit 25db02a6fb
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/storage_interface.go
View File

@@ -83,7 +83,7 @@ type CdrStorage interface {
Storage
SetCdr(utils.CDR) error
SetRatedCdr(utils.CDR, *CallCost, string) error
GetAllRatedCdr() ([]utils.CDR, error)
GetRatedCdrs(time.Time, time.Time) ([]utils.CDR, error)
}
type LogStorage interface {

10
engine/storage_sql.go
View File

@@ -885,9 +885,17 @@ func (self *SQLStorage) SetRatedCdr(cdr utils.CDR, cc *CallCost, extraInfo strin
return
}
func (self *SQLStorage) GetAllRatedCdr() ([]utils.CDR, error) {
// Return a slice of rated CDRs from storDb using optional timeStart and timeEnd as filters.
func (self *SQLStorage) GetRatedCdrs(timeStart, timeEnd time.Time) ([]utils.CDR, error) {
var cdrs []utils.CDR
q := fmt.Sprintf("SELECT %s.cgrid,accid,cdrhost,reqtype,direction,tenant,tor,account,%s.subject,destination,answer_timestamp,duration,extra_fields,cost FROM %s LEFT JOIN %s ON %s.cgrid=%s.cgrid LEFT JOIN %s ON %s.cgrid=%s.cgrid", utils.TBL_CDRS_PRIMARY, utils.TBL_CDRS_PRIMARY, utils.TBL_CDRS_PRIMARY, utils.TBL_CDRS_EXTRA, utils.TBL_CDRS_PRIMARY, utils.TBL_CDRS_EXTRA, utils.TBL_RATED_CDRS, utils.TBL_CDRS_PRIMARY, utils.TBL_RATED_CDRS)
if !timeStart.IsZero() && !timeEnd.IsZero() {
q += fmt.Sprintf(" WHERE answer_timestamp>=%d AND answer_timestamp<%d", timeStart.Unix(), timeEnd.Unix())
} else if !timeStart.IsZero() {
q += fmt.Sprintf(" WHERE answer_timestamp>=%d", timeStart.Unix())
} else if !timeEnd.IsZero() {
q += fmt.Sprintf(" WHERE answer_timestamp<%d", timeEnd.Unix())
}
rows, err := self.Db.Query(q)
if err != nil {
return nil, err