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

Consider Filter from Fields in cdrc

Browse Source
This commit is contained in:
TeoV
2018-08-29 09:18:52 -04:00
committed by Dan Christian Bogos
parent 8cce0ce7f0
commit d9fa6bc4cc
7 changed files with 160 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
engine/cdr.go
View File

@@ -498,12 +498,6 @@ func (cdr *CDR) combimedCdrFieldVal(cfgCdrFld *config.FCTemplate, groupCDRs []*C
// Extracts the value specified by cfgHdr out of cdr, used for export values
func (cdr *CDR) exportFieldValue(cfgCdrFld *config.FCTemplate, filterS *FilterS) (retVal string, err error) {
if pass, err := filterS.Pass(cdr.Tenant,
cfgCdrFld.Filters, config.NewNavigableMap(cdr.AsMapStringIface())); err != nil {
return "", err
} else if !pass {
return "", utils.ErrFilterNotPassingNoCaps
}
for _, rsrFld := range cfgCdrFld.Value {
var cdrVal string
switch cfgCdrFld.ID {
@@ -597,6 +591,12 @@ func (cdr *CDR) formatField(cfgFld *config.FCTemplate, httpSkipTlsCheck bool,
func (cdr *CDR) AsExportRecord(exportFields []*config.FCTemplate,
httpSkipTlsCheck bool, groupedCDRs []*CDR, roundingDecs int, filterS *FilterS) (expRecord []string, err error) {
for _, cfgFld := range exportFields {
if pass, err := filterS.Pass(cdr.Tenant,
cfgFld.Filters, config.NewNavigableMap(cdr.AsMapStringIface())); err != nil {
return []string{}, err
} else if !pass {
continue
}
if roundingDecs != 0 {
clnFld := new(config.FCTemplate) // Clone so we can modify the rounding decimals without affecting the template
*clnFld = *cfgFld
@@ -604,9 +604,6 @@ func (cdr *CDR) AsExportRecord(exportFields []*config.FCTemplate,
cfgFld = clnFld
}
if fmtOut, err := cdr.formatField(cfgFld, httpSkipTlsCheck, groupedCDRs, filterS); err != nil {
if err == utils.ErrFilterNotPassingNoCaps {
continue // not exporting this field value
}
utils.Logger.Warning(fmt.Sprintf("<CDR> error: %s exporting field: %s, CDR: %s\n",
err.Error(), utils.ToJSON(cfgFld), utils.ToJSON(cdr)))
return nil, err