Added SecondChance algorithm to allow you to retry importing nodes th…

…at could not be imported because they did not find their parents. This may be the case if we have a node type of Object which has its own parent node type of Variable. For example, this could be a HasHistoricalConfiguration reference type. Also, the status about how many nodes we have imported shows numbers that include nodes that were not imported due to some error.

backends/stdout/examples/main.c

@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 
     for (int i = 0; i < NL_NODECLASS_COUNT; i++)
     {
-        NodesetLoader_forEachNode(loader, (NL_NodeClass)i, NULL, (NodesetLoader_forEachNode_Func)dumpNode);
+        NodesetLoader_forEachNode(loader, (NL_NodeClass)i, NULL, NULL, (NodesetLoader_forEachNode_Func)dumpNode);
     }
 
     NodesetLoader_delete(loader);

include/NodesetLoader/NodesetLoader.h

@@ -264,10 +264,10 @@ LOADER_EXPORT void NodesetLoader_delete(NodesetLoader *loader);
 LOADER_EXPORT const NL_BiDirectionalReference *
 NodesetLoader_getBidirectionalRefs(const NodesetLoader *loader);
 LOADER_EXPORT bool NodesetLoader_sort(NodesetLoader *loader);
-typedef void (*NodesetLoader_forEachNode_Func)(void *context, NL_Node *node);
+typedef void (*NodesetLoader_forEachNode_Func)(void *context, NL_Node *node, void *extension);
 LOADER_EXPORT size_t
 NodesetLoader_forEachNode(NodesetLoader *loader, NL_NodeClass nodeClass,
-                          void *context, NodesetLoader_forEachNode_Func fn);
+                          void *context, void *extension, NodesetLoader_forEachNode_Func fn);
 LOADER_EXPORT bool NodesetLoader_isInstanceNode (const NL_Node *baseNode);
 #ifdef __cplusplus
 }

src/Nodeset.c

@@ -632,12 +632,13 @@ void Nodeset_InverseNameFinish(const Nodeset *nodeset, NL_Node *node,
 }
 
 size_t Nodeset_forEachNode(Nodeset *nodeset, NL_NodeClass nodeClass,
-                           void *context, NodesetLoader_forEachNode_Func fn)
+                           void *context, void *extension,
+                           NodesetLoader_forEachNode_Func fn)
 {
     NodeContainer *c = nodeset->nodes[nodeClass];
     for (NL_Node **node = c->nodes; node != c->nodes + c->size; node++)
     {
-        fn(context, *node);
+        fn(context, *node, extension);
     }
     return c->size;
 }

src/Nodeset.h

@@ -71,5 +71,5 @@ void Nodeset_InverseNameFinish(const Nodeset *nodeset, NL_Node *node, char *text
 const NL_BiDirectionalReference *
 Nodeset_getBiDirectionalRefs(const Nodeset *nodeset);
 size_t Nodeset_forEachNode(Nodeset *nodeset, NL_NodeClass nodeClass,
-                           void *context, NodesetLoader_forEachNode_Func fn);
+                           void *context, void *extension, NodesetLoader_forEachNode_Func fn);
 #endif

src/NodesetLoader.c

@@ -567,8 +567,8 @@ NodesetLoader_getBidirectionalRefs(const NodesetLoader *loader)
 }
 
 size_t NodesetLoader_forEachNode(NodesetLoader *loader, NL_NodeClass nodeClass,
-                               void *context,
+                               void *context, void *extension,
                                NodesetLoader_forEachNode_Func fn)
 {
-    return Nodeset_forEachNode(loader->nodeset, nodeClass, context, fn);
+    return Nodeset_forEachNode(loader->nodeset, nodeClass, context, extension, fn);
 }

tests/parser.c

@@ -39,7 +39,7 @@ START_TEST(Server_ImportBasicNodeClassTest)
 
     for (int i = 0; i < NL_NODECLASS_COUNT; i++)
     {
-        NodesetLoader_forEachNode(loader, (NL_NodeClass)i, &nodeCount,
+        NodesetLoader_forEachNode(loader, (NL_NodeClass)i, &nodeCount, NULL,
                                   (NodesetLoader_forEachNode_Func)addNode);
     }