diff options
| author | Comment <tim@gray.(none)> | 2014-02-10 22:13:37 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2014-02-10 22:13:37 +0000 |
| commit | bb010735862fe1ccde0c573063c31b6240b350c0 (patch) | |
| tree | 016b970b2a2fe685a2d69d97d629e1ae277e056e | |
| parent | a1318769138379192cd0d381877808e928cffe44 (diff) | |
NT session on to linker errors
| -rw-r--r-- | NT/src/rendercontext.cpp | 7 | ||||
| -rw-r--r-- | NT/src/rendercontext.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/NT/src/rendercontext.cpp b/NT/src/rendercontext.cpp index 28e722d..77a7701 100644 --- a/NT/src/rendercontext.cpp +++ b/NT/src/rendercontext.cpp @@ -214,7 +214,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H string graph_filename=graph_path+command.body; string graph_body=""; if (Poco::File(graph_filename).exists()) {; - add_queue(Session_task(command.uid,LOAD_GRAPH,graph_filename)); + add_queue(Session_task(command.uid,LOAD_GRAPH_FILE,graph_filename)); status=HTTPResponse::HTTP_OK; logger.information("Loading graph from file: "+command.body); XML.addValue("status","Loading graph from file: "+command.body); @@ -232,8 +232,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H readable=false; } if (readable) { - graph_body=command.body; - add_queue(Session_task(command.uid,LOAD_GRAPH)); + add_queue(Session_task(command.uid,LOAD_GRAPH_STRING,command.body)); status=HTTPResponse::HTTP_OK; logger.information("Loading graph from body request"); XML.addValue("status","Loading graph from body request"); @@ -260,6 +259,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H status=HTTPResponse::HTTP_OK; } } + /* if (command.commands[1]=="signal") { if (command.method=="GET") { //generate xml from 1st signal output if (state==IDLE) { @@ -499,4 +499,5 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H XML.addValue("error","Bad request"); } } + */ } diff --git a/NT/src/rendercontext.h b/NT/src/rendercontext.h index 72c589e..1fd6727 100644 --- a/NT/src/rendercontext.h +++ b/NT/src/rendercontext.h @@ -53,7 +53,7 @@ namespace Rotor { }; class Session_task { public: - Session_task(const string &_uid="",int _task=0):uid(_uid),task(_task) {}; + Session_task(const string &_uid="",int _task=0,const string &_message=""):uid(_uid),task(_task),message(_message) {}; string uid; int task; string message; |