diff --git a/config/slicedp.go b/config/slicedp.go index ee538f4ac..3ab7793a4 100644 --- a/config/slicedp.go +++ b/config/slicedp.go @@ -22,23 +22,20 @@ import ( "fmt" "net" "strconv" - "strings" "github.com/cgrates/cgrates/utils" ) // NewSliceDP constructs a DataProvider -func NewSliceDP(record []string, pathPrfx string) (dP DataProvider) { - dP = &SliceDP{req: record, cache: NewNavigableMap(nil), pathPrfx: pathPrfx} +func NewSliceDP(record []string) (dP DataProvider) { + dP = &SliceDP{req: record, cache: NewNavigableMap(nil)} return } // SliceDP implements engine.DataProvider so we can pass it to filters type SliceDP struct { - req []string - cache *NavigableMap - pathPrfx string // if this comes in path it will be ignored - // pathPrfx should be reviewed once the cdrc is removed + req []string + cache *NavigableMap } // String is part of engine.DataProvider interface @@ -52,13 +49,10 @@ func (cP *SliceDP) FieldAsInterface(fldPath []string) (data interface{}, err err if len(fldPath) == 0 { return } + if len(fldPath) != 1 { + return nil, fmt.Errorf("Invalid fieldPath %+v", fldPath) + } idx := fldPath[0] - if len(fldPath) == 2 { - idx = fldPath[1] - } - if cP.pathPrfx != utils.EmptyString && (fldPath[0] != cP.pathPrfx || len(fldPath) < 2) { - return "", utils.ErrPrefixNotFound(strings.Join(fldPath, utils.NestingSep)) - } if data, err = cP.cache.FieldAsInterface(fldPath); err == nil || err != utils.ErrNotFound { // item found in cache return diff --git a/ers/filecsv.go b/ers/filecsv.go index 8dcaf21f4..608914aac 100644 --- a/ers/filecsv.go +++ b/ers/filecsv.go @@ -143,7 +143,7 @@ func (rdr *CSVFileER) processFile(fPath, fName string) (err error) { } rowNr++ // increment the rowNr after checking if it's not the end of file agReq := agents.NewAgentRequest( - config.NewSliceDP(record, utils.EmptyString), reqVars, + config.NewSliceDP(record), reqVars, nil, nil, rdr.Config().Tenant, rdr.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(rdr.Config().Timezone, diff --git a/ers/flatstore.go b/ers/flatstore.go index 19781dd81..f0905151a 100644 --- a/ers/flatstore.go +++ b/ers/flatstore.go @@ -182,7 +182,7 @@ func (rdr *FlatstoreER) processFile(fPath, fName string) (err error) { } rowNr++ // increment the rowNr after checking if it's not the end of file agReq := agents.NewAgentRequest( - config.NewSliceDP(record, utils.EmptyString), reqVars, + config.NewSliceDP(record), reqVars, nil, nil, rdr.Config().Tenant, rdr.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(rdr.Config().Timezone, diff --git a/ers/partial_csv.go b/ers/partial_csv.go index 992fdc4cd..f784e6bee 100644 --- a/ers/partial_csv.go +++ b/ers/partial_csv.go @@ -158,7 +158,7 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) { } rowNr++ // increment the rowNr after checking if it's not the end of file agReq := agents.NewAgentRequest( - config.NewSliceDP(record, utils.EmptyString), reqVars, + config.NewSliceDP(record), reqVars, nil, nil, rdr.Config().Tenant, rdr.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(rdr.Config().Timezone,