@@ -95,7 +95,7 @@ func StreamData(m string, s string, payload ...string) {
95
95
96
96
}
97
97
98
- func advancedSplit (path string ) []string {
98
+ func advancedSplit (path string , merge bool ) []string {
99
99
100
100
if strings .Contains (path , "=" ) && strings .Contains (path , "[" ) {
101
101
var newPath string
@@ -118,7 +118,15 @@ func advancedSplit(path string) []string {
118
118
newPath += string (w )
119
119
}
120
120
}
121
- return strings .Split (newPath , "£££" )
121
+ lp := strings .Split (newPath , "£££" )
122
+ if merge {
123
+ for i , v := range lp {
124
+ if strings .Contains (v , "=" ) {
125
+ lp [i ] = re1 .ReplaceAllString (v , "x" )
126
+ }
127
+ }
128
+ }
129
+ return lp
122
130
}
123
131
return strings .Split (path , "/" )
124
132
}
@@ -192,11 +200,8 @@ func parseXpath(xpath string, value string, merge bool) error {
192
200
193
201
key = make ([]string , 0 )
194
202
195
- if merge {
196
- xpath = re1 .ReplaceAllString (xpath , "x" )
197
- }
198
- StreamData (fmt .Sprintf ("XPATH Extracted: %s" , xpath ), "OK" )
199
- lpath := advancedSplit (xpath )
203
+ lpath := advancedSplit (xpath , merge )
204
+ StreamData (fmt .Sprintf ("XPATH Extracted: %s" , strings .Join (lpath , "/" )), "OK" )
200
205
201
206
parent = root
202
207
for i , v := range lpath {
0 commit comments