summaryrefslogtreecommitdiff
path: root/src/messagehandler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/messagehandler.cc')
-rw-r--r--src/messagehandler.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/messagehandler.cc b/src/messagehandler.cc
index 0d536c3..2333838 100644
--- a/src/messagehandler.cc
+++ b/src/messagehandler.cc
@@ -71,7 +71,8 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi)
try
{
nodeid_t id = m.create.id;
- m.nodes = node_manager.createNode(m.create.parentid, &id);
+ m.nodes = node_manager.createNode(m.create.parentid, &id,
+ m.create.insertbeforeid);
m.create.id = id;
outmsgs.push_back(m);
}
@@ -114,7 +115,7 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi)
{
node_t removenode = node_manager.node(m.move.id);
NodeIdListPair tilpair =
- node_manager.moveNode(m.move.id, m.move.parentid);
+ node_manager.moveNode(m.move.id, m.move.parentid, m.move.insertbeforeid);
node_t createnode = node_manager.node(m.move.id);
// NodeIdList commonAncestors;
@@ -157,7 +158,8 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi)
message_t removemsg = create_msg_remove(removenode);
removemsg.nodes = tilpair.first;
- message_t createmsg = create_msg_create(createnode);
+ message_t createmsg = create_msg_create(createnode,
+ m.move.insertbeforeid);
createmsg.nodes = tilpair.second;
outmsgs.push_back(removemsg);
@@ -180,7 +182,7 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi)
case cmd::unsubscribe:
//connection_handler.unsubscribe(wsi, m.subscribe.id);
outmsgs.push_back(m);
- DEBUG(handler, "unsubscribe: %d\n", m.unsubscribe.id);
+ DEBUG(handler, "unsubscribe: %d\n", (int)m.unsubscribe.id);
break;
case cmd::update:
@@ -189,7 +191,8 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi)
try
{
m.nodes = node_manager.updateNode(m.update.id,
- m.update.attribute, m.update.value);
+ m.update.attribute,
+ m.update.value);
outmsgs.push_back(m);
}
catch (std::exception& e)