commit 29ac4f9c65a261c7881ae055abf3737820ad2f8e
author Radek Krejci <rkrejci@cesnet.cz> Tue Apr 12 15:05:53 2016 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Tue Apr 12 15:05:53 2016 +0200
tree dbcf86fb08bc3f97db72370b405b2e942be09c4a
parent c7c35b11a79ae538e27ac8518bd3e67fedf36749

validation BUGFIX improve mandatory check error messages

better distinguish between toplevel and inner data when checking
for mandatory elements and printing error message. Sometimes, a
meaningless element path was printed.

src/tree_schema.c

diff --git a/src/tree_schema.c b/src/tree_schema.c
index 20bc96f..798839d 100644
--- a/src/tree_schema.c
+++ b/src/tree_schema.c
@@ -324,6 +324,9 @@
                 if (!diter) {
                     /* instance not found */
                     missing_parent = set->set.s[i];
+                    if (toplevel) {
+                        data = NULL;
+                    }
                     break;
                 }
                 data = diter;
@@ -342,8 +345,8 @@
 
     if (node->flags & LYS_MAND_TRUE) {
         if (missing_parent) {
-            LOGVAL(LYE_MISSELEM, LY_VLOG_LYD, data, missing_parent->name,
-                   (lys_parent(missing_parent) ? lys_parent(missing_parent)->name : lys_node_module(missing_parent)->name));
+            LOGVAL(LYE_MISSELEM, LY_VLOG_LYD, data, node->name,
+                   (lys_parent(node) ? lys_parent(node)->name : lys_node_module(node)->name));
             return EXIT_FAILURE;
         }
 
@@ -394,9 +397,9 @@
             /* 7.6.5, rule 3 (or 2) */
             /* 7.9.4, rule 2 */
             if (node->nodetype == LYS_CHOICE) {
-                LOGVAL(LYE_NOMANDCHOICE, LY_VLOG_LYD, data, node->name);
+                LOGVAL(LYE_NOMANDCHOICE, LY_VLOG_LYD, toplevel ? NULL : data, node->name);
             } else {
-                LOGVAL(LYE_MISSELEM, LY_VLOG_LYD, data, node->name,
+                LOGVAL(LYE_MISSELEM, LY_VLOG_LYD, toplevel ? NULL : data, node->name,
                    (lys_parent(node) ? lys_parent(node)->name : lys_node_module(node)->name));
             }
             break;
@@ -430,11 +433,11 @@
         }
 
         if (min && (minmax < min)) {
-            LOGVAL(LYE_NOMIN, LY_VLOG_LYD, data, node->name);
+            LOGVAL(LYE_NOMIN, LY_VLOG_LYD, toplevel ? NULL : data, node->name);
             return EXIT_FAILURE;
         }
         if (max && (minmax > max)) {
-            LOGVAL(LYE_NOMAX, LY_VLOG_LYD, data, node->name);
+            LOGVAL(LYE_NOMAX, LY_VLOG_LYD, toplevel ? NULL : data, node->name);
             return EXIT_FAILURE;
         }
     }