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

Updated fctemplate to populate Tag if empty

Browse Source
This commit is contained in:
Trial97
2019-03-12 13:54:56 +02:00
committed by Dan Christian Bogos
parent dfda3ffe72
commit 8a8fa56797
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/config_test.go
View File

@@ -222,11 +222,11 @@ func TestCgrCfgCDRC(t *testing.T) {
PartialCacheExpiryAction: "*dump_to_file",
HeaderFields: make([]*FCTemplate, 0),
ContentFields: []*FCTemplate{
{FieldId: "ToR", Type: utils.META_COMPOSED,
{Tag: "ToR", FieldId: "ToR", Type: utils.META_COMPOSED,
Value: NewRSRParsersMustCompile("~7:s/^(voice|data|sms|mms|generic)$/*$1/", true, utils.INFIELD_SEP)},
{FieldId: "AnswerTime", Type: utils.META_COMPOSED,
{Tag: "AnswerTime", FieldId: "AnswerTime", Type: utils.META_COMPOSED,
Value: NewRSRParsersMustCompile("~1", true, utils.INFIELD_SEP)},
{FieldId: "Usage", Type: utils.META_COMPOSED,
{Tag: "Usage", FieldId: "Usage", Type: utils.META_COMPOSED,
Value: NewRSRParsersMustCompile("~9:s/^(\\d+)$/${1}s/", true, utils.INFIELD_SEP)},
},
TrailerFields: make([]*FCTemplate, 0),

6
config/configcdrc_test.go
View File

@@ -209,11 +209,11 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
PartialCacheExpiryAction: utils.MetaDumpToFile,
HeaderFields: make([]*FCTemplate, 0),
ContentFields: []*FCTemplate{
{FieldId: utils.ToR,
{Tag: utils.ToR, FieldId: utils.ToR,
Value: NewRSRParsersMustCompile("~7:s/^(voice|data|sms|mms|generic)$/*$1/", true, utils.INFIELD_SEP)},
{Tag: "", Type: "", FieldId: utils.AnswerTime,
{Tag: utils.AnswerTime, Type: "", FieldId: utils.AnswerTime,
Value: NewRSRParsersMustCompile("~1", true, utils.INFIELD_SEP)},
{FieldId: utils.Usage,
{Tag: utils.Usage, FieldId: utils.Usage,
Value: NewRSRParsersMustCompile("~9:s/^(\\d+)$/${1}s/", true, utils.INFIELD_SEP)},
},
TrailerFields: make([]*FCTemplate, 0),

7
config/fctemplate.go
View File

@@ -27,15 +27,16 @@ import (
func NewFCTemplateFromFCTemplateJsonCfg(jsnCfg *FcTemplateJsonCfg, separator string) (*FCTemplate, error) {
fcTmp := new(FCTemplate)
var err error
if jsnCfg.Tag != nil {
fcTmp.Tag = *jsnCfg.Tag
}
if jsnCfg.Type != nil {
fcTmp.Type = *jsnCfg.Type
}
if jsnCfg.Field_id != nil {
fcTmp.FieldId = *jsnCfg.Field_id
}
fcTmp.Tag = fcTmp.FieldId
if jsnCfg.Tag != nil {
fcTmp.Tag = *jsnCfg.Tag
}
if jsnCfg.Filters != nil {
fcTmp.Filters = make([]string, len(*jsnCfg.Filters))
for i, fltr := range *jsnCfg.Filters {