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

Clone fldPath and and work with clone; cached fldPath as it came

Browse Source
This commit is contained in:
TeoV
2018-11-16 09:44:16 -05:00
committed by Dan Christian Bogos
parent 1b1966b46f
commit 8299a672c1
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
agents/libhttpagent.go
View File

@@ -133,14 +133,23 @@ func (hU *httpXmlDP) FieldAsInterface(fldPath []string) (data interface{}, err e
if len(fldPath) == 0 {
return nil, fmt.Errorf("Empty path")
}
if data, err = hU.cache.FieldAsInterface(fldPath); err == nil ||
err != utils.ErrNotFound { // item found in cache
return
}
err = nil // cancel previous err
var slctrStr string
for i := range fldPath {
if sIdx := strings.Index(fldPath[i], "["); sIdx != -1 {
slctrStr = fldPath[i][sIdx:]
workPath := make([]string, len(fldPath))
for i, val := range fldPath {
workPath[i] = val
}
for i := range workPath {
if sIdx := strings.Index(workPath[i], "["); sIdx != -1 {
slctrStr = workPath[i][sIdx:]
if slctrStr[len(slctrStr)-1:] != "]" {
return nil, fmt.Errorf("filter rule <%s> needs to end in ]", slctrStr)
}
fldPath[i] = fldPath[i][:sIdx]
workPath[i] = workPath[i][:sIdx]
if slctrStr[1:2] != "@" {
i, err := strconv.Atoi(slctrStr[1 : len(slctrStr)-1])
if err != nil {
@@ -148,17 +157,12 @@ func (hU *httpXmlDP) FieldAsInterface(fldPath []string) (data interface{}, err e
}
slctrStr = "[" + strconv.Itoa(i+1) + "]"
}
fldPath[i] = fldPath[i] + slctrStr
workPath[i] = workPath[i] + slctrStr
}
}
if data, err = hU.cache.FieldAsInterface(fldPath); err == nil ||
err != utils.ErrNotFound { // item found in cache
return
}
err = nil // cancel previous err
//convert fldPath to HierarchyPath
path := utils.HierarchyPath(fldPath)
elmnt := xmlquery.FindOne(hU.xmlDoc, path.AsString("/", false))
//convert workPath to HierarchyPath
hrPath := utils.HierarchyPath(workPath)
elmnt := xmlquery.FindOne(hU.xmlDoc, hrPath.AsString("/", false))
if elmnt == nil {
return
}