Added function ZakGFlowInstance::task_complete.

diff --git a/.gitignore b/.gitignore
index 98cdcbf796f4cc77c04b69c99c1c47a979186d64..18e7fe88a120bb864098a78e410447a575dae5d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,6 @@ Rules-quot
 *.exe
 *.csv
 *.bpmn
+!tests/*.bpmn
 tests/model
 tests/instance
\ No newline at end of file

diff --git a/src/instance.c b/src/instance.c
index e638d0d7973e1ae6cb27c8929d7a8f0421a18442..cdcdfb15e327097ebedfb16e5fd98df118290bde 100644 (file)
--- a/src/instance.c
+++ b/src/instance.c
@@ -114,7 +114,7 @@ zak_gflow_instance_next (ZakGFlowInstance *instance, const gchar *node_id, GNode
                        else if (xmlStrcmp (cur->name, (const xmlChar *)"task") == 0
                                         || xmlStrcmp (cur->name, (const xmlChar *)"userTask") == 0)
                                {
-                                       g_message ("%s", cur->name);
+                                       g_message ("%s: %s", cur->name, (gchar *)xmlGetProp (cur, (const xmlChar *)"name"));
                                }
                        else
                                {
@@ -189,6 +189,57 @@ GPtrArray
        return ret;
 }
 
+/**
+ * zak_gflow_instance_task_complete:
+ * @instance:
+ * @node_id:
+ *
+ */
+gboolean
+zak_gflow_instance_task_complete (ZakGFlowInstance *instance, const gchar *node_id)
+{
+       gboolean ret;
+
+       xmlNode *xnode;
+
+       GNode *node;
+
+       xmlNodeSet *xnodeset;
+
+       ZakGFlowInstancePrivate *priv = zak_gflow_instance_get_instance_private (instance);
+
+       ret = FALSE;
+
+       xnode = (xmlNode *)g_hash_table_lookup (priv->ht_nodes, node_id);
+       if (xnode != NULL)
+               {
+                       node = g_node_find (priv->nodes_history,
+                                                               G_POST_ORDER,
+                                                               G_TRAVERSE_LEAVES,
+                                                               xnode);
+                       if (node != NULL)
+                               {
+                                       /* move to next */
+                                       xnodeset = zak_gflow_commons_xml_search (priv->xpcontext, xnode, (const xmlChar *)"child::bpmn:outgoing");
+                                       if (xnodeset != NULL
+                                               && xnodeset->nodeNr > 0)
+                                               {
+                                                       zak_gflow_instance_next (instance, (const gchar *)xmlNodeGetContent (xnodeset->nodeTab[0]), node);
+                                               }
+                               }
+                       else
+                               {
+                                       g_warning ("The node <%s> isn't a waiting node", node_id);
+                               }
+               }
+       else
+               {
+                       g_warning ("Invalide node <%s>.", node_id);
+               }
+
+       return ret;
+}
+
 /* PRIVATE */
 static void
 zak_gflow_instance_set_property (GObject *object,

diff --git a/src/instance.h b/src/instance.h
index 36c460b5f838a9c4a3357a33050eac31c3c41cdb..7b373ecf54b575cb722225a29c638fe2e1d843cc 100644 (file)
--- a/src/instance.h
+++ b/src/instance.h
@@ -42,6 +42,8 @@ ZakGFlowInstance *zak_gflow_instance_new (xmlXPathContext *xpcontext, GHashTable
 
 GPtrArray *zak_gflow_instance_get_current_nodes (ZakGFlowInstance *instance);
 
+gboolean zak_gflow_instance_task_complete (ZakGFlowInstance *instance, const gchar *node_id);
+
 
 G_END_DECLS
 

diff --git a/tests/instance.c b/tests/instance.c
index f72be92246699b495103d04ebf4cdbccad0e4bcb..9ed613166610768e6e32aa1228501ccb4d8b1d05 100644 (file)
--- a/tests/instance.c
+++ b/tests/instance.c
@@ -38,8 +38,23 @@ main (int argc, char *argv[])
        else
                {
                        instance = zak_gflow_model_start (model, argv[2]);
+
                        ar = zak_gflow_instance_get_current_nodes (instance);
+                       for (i = 0; i < ar->len; i++)
+                               {
+                                       g_printf ("Currente node: %s\n", (gchar *)g_ptr_array_index (ar, i));
+                               }
 
+                       /* wrong node_id */
+                       zak_gflow_instance_task_complete (instance, "jon_doe");
+
+                       /* not waiting node_id */
+                       zak_gflow_instance_task_complete (instance, "StartEvent_1");
+
+                       /* right node_id */
+                       zak_gflow_instance_task_complete (instance, (gchar *)g_ptr_array_index (ar, 0));
+
+                       ar = zak_gflow_instance_get_current_nodes (instance);
                        for (i = 0; i < ar->len; i++)
                                {
                                        g_printf ("Currente node: %s\n", (gchar *)g_ptr_array_index (ar, i));