diff options
Diffstat (limited to 'src/messageparser.cc')
| -rw-r--r-- | src/messageparser.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/messageparser.cc b/src/messageparser.cc index d59cccc..75593f9 100644 --- a/src/messageparser.cc +++ b/src/messageparser.cc @@ -185,8 +185,8 @@ inline static void create_msg_list(MsgTokensList& msgTokensList, // DEBUG(msgparser, "%d\n", t.size()); - if(t[origin] == "observe") m.cmd = cmd::observe; - else if(t[origin] == "unobserve") m.cmd = cmd::unobserve; + if(t[origin] == "subscribe") m.cmd = cmd::subscribe; + else if(t[origin] == "unsubscribe") m.cmd = cmd::unsubscribe; else if(t[origin] == "login") m.cmd = cmd::login; else if(t[origin] == "logout") m.cmd = cmd::logout; else if(t[origin] == "create") m.cmd = cmd::create; @@ -197,26 +197,26 @@ inline static void create_msg_list(MsgTokensList& msgTokensList, switch(m.cmd) { - case cmd::observe: + case cmd::subscribe: { if(t.size() != origin+1+1) { DEBUG(msgparser, "Wrong number of parameters\n"); continue; } - m.observe.id = getId(sym, t[origin+1]);//atoi(t[origin+1].c_str()); + m.subscribe.id = getId(sym, t[origin+1]);//atoi(t[origin+1].c_str()); } break; - case cmd::unobserve: + case cmd::unsubscribe: { if(t.size() != origin+1+1) { DEBUG(msgparser, "Wrong number of parameters\n"); continue; } - m.unobserve.id = getId(sym, t[origin+1]);//atoi(t[origin+1].c_str()); - DEBUG(msgparser, "unobserve @ %d\n", m.unobserve.id); + m.unsubscribe.id = getId(sym, t[origin+1]);//atoi(t[origin+1].c_str()); + DEBUG(msgparser, "unsubscribe @ %d\n", m.unsubscribe.id); } break; @@ -294,7 +294,7 @@ inline static void create_msg_list(MsgTokensList& msgTokensList, continue; } m.update.id = getId(sym, t[origin+1]);//atoi(t[origin+1].c_str()); - m.update.name = t[origin+2]; + m.update.attribute = t[origin+2]; m.update.value = t[origin+3]; } break; @@ -348,7 +348,7 @@ std::string msg_tostring(message_t m) break; case cmd::update: asprintf(&buf, "update %d \"%s\" \"%s\";", - m.update.id, m.update.name.c_str(), m.update.value.c_str()); + m.update.id, m.update.attribute.c_str(), m.update.value.c_str()); break; default: break; @@ -378,7 +378,7 @@ message_t create_msg_update(task_t t, const std::string &attr) message_t m; m.cmd = cmd::update; m.update.id = t.id; - m.update.name = attr; + m.update.attribute = attr; m.update.value = t.attributes[attr]; return m; } |