diff options
Diffstat (limited to 'src/messagehandler.cc')
| -rw-r--r-- | src/messagehandler.cc | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/messagehandler.cc b/src/messagehandler.cc index 5ccf3bf..5467df9 100644 --- a/src/messagehandler.cc +++ b/src/messagehandler.cc @@ -29,8 +29,8 @@ #include "hugin.hpp" -// Defines global task_manager object -#include "taskmanager.h" +// Defines global node_manager object +#include "nodemanager.h" #include "messageparser.h" @@ -70,14 +70,14 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) INFO(messagehandler, "Handling create command\n"); try { - taskid_t id = m.create.id; - m.nodes = task_manager.createTask(m.create.parentid, &id); + nodeid_t id = m.create.id; + m.nodes = node_manager.createNode(m.create.parentid, &id); m.create.id = id; outmsgs.push_back(m); } catch (std::exception& e) { - DEBUG(messagehandler, "Error creating task\n"); + DEBUG(messagehandler, "Error creating node\n"); } } break; @@ -87,14 +87,14 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) INFO(messagehandler, "Handling remove command\n"); try { - TaskIdList ids = task_manager.subTasks(m.remove.id); - TaskIdList::reverse_iterator id = ids.rbegin(); + NodeIdList ids = node_manager.subNodes(m.remove.id); + NodeIdList::reverse_iterator id = ids.rbegin(); while(id != ids.rend()) { - task_t task = task_manager.task(*id); + node_t node = node_manager.node(*id); - message_t m = create_msg_remove(task); - m.nodes = task_manager.removeTask(task.id); + message_t m = create_msg_remove(node); + m.nodes = node_manager.removeNode(node.id); outmsgs.push_back(m); id++; @@ -102,7 +102,7 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) } catch (std::exception& e) { - DEBUG(messagehandler, "Error remove task\n"); + DEBUG(messagehandler, "Error remove node\n"); } } break; @@ -112,25 +112,25 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) INFO(messagehandler, "Handling move command\n"); try { - task_t removetask = task_manager.task(m.move.id); - TaskIdListPair tilpair = - task_manager.moveTask(m.move.id, m.move.parentid); - task_t createtask = task_manager.task(m.move.id); - -// TaskIdList commonAncestors; -// TaskIdList removeAncestors; -// TaskIdList createAncestors; + node_t removenode = node_manager.node(m.move.id); + NodeIdListPair tilpair = + node_manager.moveNode(m.move.id, m.move.parentid); + node_t createnode = node_manager.node(m.move.id); + +// NodeIdList commonAncestors; +// NodeIdList removeAncestors; +// NodeIdList createAncestors; // // // find command ancestors and fill ancestors for remove command -// for(TaskIdList::iterator it_remove = tilpair.first.begin(); +// for(NodeIdList::iterator it_remove = tilpair.first.begin(); // it_remove != tilpair.first.end(); it_remove++) // { -// taskid_t removeid = *it; +// nodeid_t removeid = *it; // bool common = false; -// for(TaskIdList::iterator it_create = tilpair.second.begin(); +// for(NodeIdList::iterator it_create = tilpair.second.begin(); // it_create = != tilpair.second.end(); it_create++) // { -// taskid_t createid = *id; +// nodeid_t createid = *id; // if(removeid == createid) // { // commandAncestors.push_back(removeid); @@ -144,10 +144,10 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) // } // // // fill ancestors for create command -// for(TaskIdList::iterator it_create = tilpair.second.begin(); +// for(NodeIdList::iterator it_create = tilpair.second.begin(); // it_create = != tilpair.second.end(); it_create++) // { -// taskid_t createid = *id; +// nodeid_t createid = *id; // if(removeid == createid) // { // commandAncestors.push_back(removeid); @@ -155,9 +155,9 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) // } // } - message_t removemsg = create_msg_remove(removetask); + message_t removemsg = create_msg_remove(removenode); removemsg.nodes = tilpair.first; - message_t createmsg = create_msg_create(createtask); + message_t createmsg = create_msg_create(createnode); createmsg.nodes = tilpair.second; outmsgs.push_back(removemsg); @@ -165,7 +165,7 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) } catch (std::exception& e) { - DEBUG(messagehandler, "Error moving task\n"); + DEBUG(messagehandler, "Error moving node\n"); } } break; @@ -188,13 +188,13 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) INFO(messagehandler, "Handling update command\n"); try { - m.nodes = task_manager.updateTask(m.update.id, + m.nodes = node_manager.updateNode(m.update.id, m.update.attribute, m.update.value); outmsgs.push_back(m); } catch (std::exception& e) { - DEBUG(messagehandler, "Error updating task\n"); + DEBUG(messagehandler, "Error updating node\n"); } } break; @@ -207,7 +207,7 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) WARN(messagehandler, "!!! Unknown command %d\n", m.cmd); break; } - task_manager.tree.toStdOut(); + node_manager.tree.toStdOut(); DEBUG(messagehandler, "%d affected nodes registered\n", (int)m.nodes.size()); } |