commit fba75366260035c6594197714ce401b8f0fdb6eb
author aPiecek <piecek@cesnet.cz> Thu Oct 07 12:39:48 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Oct 11 14:26:01 2021 +0200
tree 6bde70c0fb325adb390b7a3ad65fb5897a8d11aa
parent df23eeeb7fcc2e5ceb4de33e6a06823924b6ceda

xpath FEATURE XPath variable implementation added

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index bf48acc..3409180 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -4409,7 +4409,7 @@
 }
 
 API LY_ERR
-lyd_find_xpath(const struct lyd_node *ctx_node, const char *xpath, struct ly_set **set)
+lyd_find_xpath2(const struct lyd_node *ctx_node, const char *xpath, const struct lyxp_var *vars, struct ly_set **set)
 {
     LY_ERR ret = LY_SUCCESS;
     struct lyxp_set xp_set = {0};
@@ -4425,7 +4425,7 @@
     LY_CHECK_GOTO(ret, cleanup);
 
     /* evaluate expression */
-    ret = lyxp_eval(LYD_CTX(ctx_node), exp, NULL, LY_VALUE_JSON, NULL, ctx_node, ctx_node, &xp_set, LYXP_IGNORE_WHEN);
+    ret = lyxp_eval(LYD_CTX(ctx_node), exp, NULL, LY_VALUE_JSON, NULL, ctx_node, ctx_node, vars, &xp_set, LYXP_IGNORE_WHEN);
     LY_CHECK_GOTO(ret, cleanup);
 
     /* allocate return set */
@@ -4458,7 +4458,13 @@
 }
 
 API LY_ERR
-lyd_eval_xpath(const struct lyd_node *ctx_node, const char *xpath, ly_bool *result)
+lyd_find_xpath(const struct lyd_node *ctx_node, const char *xpath, struct ly_set **set)
+{
+    return lyd_find_xpath2(ctx_node, xpath, NULL, set);
+}
+
+API LY_ERR
+lyd_eval_xpath2(const struct lyd_node *ctx_node, const char *xpath, const struct lyxp_var *vars, ly_bool *result)
 {
     LY_ERR ret = LY_SUCCESS;
     struct lyxp_set xp_set = {0};
@@ -4471,7 +4477,7 @@
     LY_CHECK_GOTO(ret, cleanup);
 
     /* evaluate expression */
-    ret = lyxp_eval(LYD_CTX(ctx_node), exp, NULL, LY_VALUE_JSON, NULL, ctx_node, ctx_node, &xp_set, LYXP_IGNORE_WHEN);
+    ret = lyxp_eval(LYD_CTX(ctx_node), exp, NULL, LY_VALUE_JSON, NULL, ctx_node, ctx_node, vars, &xp_set, LYXP_IGNORE_WHEN);
     LY_CHECK_GOTO(ret, cleanup);
 
     /* transform into boolean */
@@ -4488,6 +4494,12 @@
 }
 
 API LY_ERR
+lyd_eval_xpath(const struct lyd_node *ctx_node, const char *xpath, ly_bool *result)
+{
+    return lyd_eval_xpath2(ctx_node, xpath, NULL, result);
+}
+
+API LY_ERR
 lyd_find_path(const struct lyd_node *ctx_node, const char *path, ly_bool output, struct lyd_node **match)
 {
     LY_ERR ret = LY_SUCCESS;