use config for once node

diff --git a/libecoli/ecoli_node_once.c b/libecoli/ecoli_node_once.c
index 63098783dbaeb03a5eed9f0b93d910bfeb77a6f3..989c710d5f22c2afdbce342ba51b916c084df038 100644 (file)
--- a/libecoli/ecoli_node_once.c
+++ b/libecoli/ecoli_node_once.c
@@ -19,6 +19,7 @@
 #include <ecoli_node_str.h>
 #include <ecoli_node_or.h>
 #include <ecoli_node_many.h>
+#include <ecoli_config.h>
 #include <ecoli_node_once.h>
 
 EC_LOG_TYPE_REGISTER(node_once);
@@ -115,12 +116,49 @@ ec_node_once_get_child(const struct ec_node *gen_node, size_t i,
                return -1;
 
        *child = node->child;
-       *refs = 1;
+       *refs = 2;
        return 0;
 }
 
+static const struct ec_config_schema ec_node_once_schema[] = {
+       {
+               .key = "child",
+               .desc = "The child node.",
+               .type = EC_CONFIG_TYPE_NODE,
+       },
+       {
+               .type = EC_CONFIG_TYPE_NONE,
+       },
+};
+
+static int ec_node_once_set_config(struct ec_node *gen_node,
+                               const struct ec_config *config)
+{
+       struct ec_node_once *node = (struct ec_node_once *)gen_node;
+       const struct ec_config *child;
+
+       child = ec_config_dict_get(config, "child");
+       if (child == NULL)
+               goto fail;
+       if (ec_config_get_type(child) != EC_CONFIG_TYPE_NODE) {
+               errno = EINVAL;
+               goto fail;
+       }
+
+       if (node->child != NULL)
+               ec_node_free(node->child);
+       node->child = ec_node_clone(child->node);
+
+       return 0;
+
+fail:
+       return -1;
+}
+
 static struct ec_node_type ec_node_once_type = {
        .name = "once",
+       .schema = ec_node_once_schema,
+       .set_config = ec_node_once_set_config,
        .parse = ec_node_once_parse,
        .complete = ec_node_once_complete,
        .size = sizeof(struct ec_node_once),
@@ -131,23 +169,39 @@ static struct ec_node_type ec_node_once_type = {
 
 EC_NODE_TYPE_REGISTER(ec_node_once_type);
 
-int ec_node_once_set(struct ec_node *gen_node, struct ec_node *child)
+int
+ec_node_once_set_child(struct ec_node *gen_node, struct ec_node *child)
 {
-       struct ec_node_once *node = (struct ec_node_once *)gen_node;
+       const struct ec_config *cur_config = NULL;
+       struct ec_config *config = NULL;
+       int ret;
 
-       if (gen_node == NULL || child == NULL) {
-               errno = EINVAL;
+       if (ec_node_check_type(gen_node, &ec_node_once_type) < 0)
                goto fail;
-       }
 
-       if (ec_node_check_type(gen_node, &ec_node_once_type) < 0)
+       cur_config = ec_node_get_config(gen_node);
+       if (cur_config == NULL)
+               config = ec_config_dict();
+       else
+               config = ec_config_dup(cur_config);
+       if (config == NULL)
                goto fail;
 
-       node->child = child;
+       if (ec_config_dict_set(config, "child", ec_config_node(child)) < 0) {
+               child = NULL; /* freed */
+               goto fail;
+       }
+       child = NULL; /* freed */
+
+       ret = ec_node_set_config(gen_node, config);
+       config = NULL; /* freed */
+       if (ret < 0)
+               goto fail;
 
        return 0;
 
 fail:
+       ec_config_free(config);
        ec_node_free(child);
        return -1;
 }
@@ -163,7 +217,7 @@ struct ec_node *ec_node_once(const char *id, struct ec_node *child)
        if (gen_node == NULL)
                goto fail;
 
-       ec_node_once_set(gen_node, child);
+       ec_node_once_set_child(gen_node, child);
        child = NULL;
 
        return gen_node;

diff --git a/libecoli/ecoli_node_once.h b/libecoli/ecoli_node_once.h
index a610a83d11a1b935ad8ccd9311cac8da74c66772..690a10c9371b69b6e0837345c18f79ac2aacfbad 100644 (file)
--- a/libecoli/ecoli_node_once.h
+++ b/libecoli/ecoli_node_once.h
@@ -23,7 +23,7 @@
 /* on error, child is *not* freed */
 struct ec_node *ec_node_once(const char *id, struct ec_node *child);
 
-/* on error, child is *not* freed */
-int ec_node_once_set(struct ec_node *node, struct ec_node *child);
+/* on error, child is freed */
+int ec_node_once_set_child(struct ec_node *node, struct ec_node *child);
 
 #endif