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 63)
+set(LIBYANG_MICRO_VERSION 64)
 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/resolve.c

@@ -2580,8 +2580,8 @@ resolve_partial_json_data_nodeid(const char *nodeid, const char *llist_value, st
                         }
                     }
 
-                    /* make value canonical */
-                    if ((llist->value_type & LY_TYPE_IDENT)
+                    /* make value canonical (remove module name prefix) unless it was specified with it */
+                    if (!strchr(llist_value, ':') && (llist->value_type & LY_TYPE_IDENT)
                             && !strncmp(llist->value_str, lyd_node_module(sibling)->name, strlen(lyd_node_module(sibling)->name))
                             && (llist->value_str[strlen(lyd_node_module(sibling)->name)] == ':')) {
                         data_val = llist->value_str + strlen(lyd_node_module(sibling)->name) + 1;