Merge branch 'devel'

Author: michalvasko

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_MACOSX_RPATH TRUE)
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
 set(LIBYANG_MINOR_VERSION 13)
-set(LIBYANG_MICRO_VERSION 58)
+set(LIBYANG_MICRO_VERSION 59)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 configure_file(${PROJECT_SOURCE_DIR}/src/libyang.h.in ${PROJECT_SOURCE_DIR}/src/libyang.h)

src/common.h

@@ -224,6 +224,7 @@ typedef enum {
     LYE_NOLEAFREF,
     LYE_NOMANDCHOICE,
 
+    LYE_XPATH_INSNODE,
     LYE_XPATH_INTOK,
     LYE_XPATH_EOF,
     LYE_XPATH_INOP_1,

src/libyang.h.in

@@ -1723,6 +1723,7 @@ typedef enum {
     LYVE_NOLEAFREF,    /**< leaf pointed to by leafref does not exist (data) */
     LYVE_NOMANDCHOICE, /**< no mandatory choice case branch exists (data) */
 
+    LYVE_XPATH_INSNODE,/**< schema node not found */
     LYVE_XPATH_INTOK,  /**< unexpected XPath token */
     LYVE_XPATH_EOF,    /**< unexpected end of an XPath expression */
     LYVE_XPATH_INOP,   /**< invalid XPath operation operands */

src/log.c

@@ -302,6 +302,7 @@ const char *ly_errs[] = {
 /* LYE_NOLEAFREF */    "Leafref \"%s\" of value \"%s\" points to a non-existing leaf.",
 /* LYE_NOMANDCHOICE */ "Mandatory choice \"%s\" missing a case branch.",
 
+/* LYE_XPATH_INSNODE */"Schema node \"%.*s\" not found (%.*s) with context node \"%s\".",
 /* LYE_XPATH_INTOK */  "Unexpected XPath token %s (%.15s).",
 /* LYE_XPATH_EOF */    "Unexpected XPath expression end.",
 /* LYE_XPATH_INOP_1 */ "Cannot apply XPath operation %s on %s.",
@@ -396,6 +397,7 @@ static const LY_VECODE ecode2vecode[] = {
     LYVE_NOLEAFREF,    /* LYE_NOLEAFREF */
     LYVE_NOMANDCHOICE, /* LYE_NOMANDCHOICE */
 
+    LYVE_XPATH_INSNODE,/* LYE_XPATH_INSNODE */
     LYVE_XPATH_INTOK,  /* LYE_XPATH_INTOK */
     LYVE_XPATH_EOF,    /* LYE_XPATH_EOF */
     LYVE_XPATH_INOP,   /* LYE_XPATH_INOP_1 */

src/xpath.c

@@ -6374,7 +6374,7 @@ eval_node_test(struct lyxp_expr *exp, uint16_t *exp_idx, struct lyd_node *cur_no
                                              exp->tok_len[*exp_idx], options);
                 }
             } else {
-                if (set && (options & LYXP_SNODE_ALL)) {
+                if (set && (set->type == LYXP_SET_SNODE_SET)) {
                     rc = moveto_snode(set, (struct lys_node *)cur_node, &exp->expr[exp->expr_pos[*exp_idx]],
                                       exp->tok_len[*exp_idx], options);
                 } else {
@@ -6390,11 +6390,20 @@ eval_node_test(struct lyxp_expr *exp, uint16_t *exp_idx, struct lyd_node *cur_no
                     }
                 }
                 if (i == -1) {
-                    path = lys_path((struct lys_node *)cur_node);
-                    LOGWRN("Schema node \"%.*s\" not found (%.*s) with context node \"%s\".",
-                           exp->tok_len[*exp_idx], &exp->expr[exp->expr_pos[*exp_idx]],
-                           exp->expr_pos[*exp_idx] + exp->tok_len[*exp_idx], exp->expr, path);
-                    free(path);
+                    if (options & LYXP_SNODE_ALL) {
+                        path = lys_path((struct lys_node *)cur_node);
+                        LOGWRN("Schema node \"%.*s\" not found (%.*s) with context node \"%s\".",
+                               exp->tok_len[*exp_idx], &exp->expr[exp->expr_pos[*exp_idx]],
+                               exp->expr_pos[*exp_idx] + exp->tok_len[*exp_idx], exp->expr, path);
+                        free(path);
+                    } else {
+                        path = lyd_path(cur_node);
+                        LOGVAL(LYE_XPATH_INSNODE, LY_VLOG_NONE, NULL,
+                               exp->tok_len[*exp_idx], &exp->expr[exp->expr_pos[*exp_idx]],
+                               exp->expr_pos[*exp_idx] + exp->tok_len[*exp_idx], exp->expr, path);
+                        free(path);
+                        return -1;
+                    }
                 }
             }
         }