Se corrige un bug.

[z.facultad/75.42/plaqui.git] / Server / src / controlserver.cpp
diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp

index 144d236e2b967140c28aa4b05ad0da38b63909af..133f36eeccc9abb64992180256931253fdcee5a6 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -26,7 +26,8 @@
  //
  
  #include "plaqui/server/controlserver.h"
-#include "plaqui/server/httprequest.h"
+#include "plaqui/server/command.h"
+#include "plaqui/server/string.h"
  #include <cstring>
  #include <sstream>
  #ifdef DEBUG
@@ -58,8 +59,22 @@ void ControlServer::real_run(void) {
  #endif // DEBUG
         //char buf[BUFSIZ];
         while (!stop) {
-               HTTPRequest request;
-               socket >> request;
+               Command command;
+               try {
+                       socket >> command;
+               } catch (const char* e) {
+                       cerr << "    (" << __LINE__ << ") Error: " << e << endl;
+                       stop = true;
+                       continue;
+               } catch (string e) {
+                       cerr << "    (" << __LINE__ << ") Error: " << e << endl;
+                       stop = true;
+                       continue;
+               } catch (...) {
+                       cerr << "    (" << __LINE__ << ") Error desconocido!" << endl;
+                       stop = true;
+                       continue;
+               }
                 // TODO agregar las verificaciones de abajo a HTTPRequest y padres.
  /*
                 // Primera línea no vacía (que debe ser el request).
@@ -99,7 +114,10 @@ void ControlServer::real_run(void) {
                 // Command command = parse_command(request.uri);
                 //signal_command_received().emit(command);
  #ifdef DEBUG
-               cerr << "Request: " << request << endl;
+               cerr << "Comando: target = " << command.get_target()
+                       << " | command = " << command.get_command()
+                       << " | args = [" << String::join(command.get_args(), ", ") << "]"
+                       << endl;
                 //for (HTTPRequest::const_iterator i = request.begin();
                 //              i != request.end(); i++) {
                 //      cerr << "   " << i->first << ": " << i->second << endl;
@@ -124,14 +142,27 @@ Accept-Ranges: bytes
                 response_xml << "    </head>" << endl;
                 response_xml << "    <body>" << endl;
                 response_xml << "        <h1>PlaQui</h1>" << endl;
-               response_xml << "        <p>versión 0.2</p>" << endl;
-               response_xml << "        <h2>Pedido HTTP</h2>" << endl;
+               response_xml << "        <p>versión 0.4</p>" << endl;
+               response_xml << "        <h2>Comando</h2>" << endl;
                 response_xml << "        <ul>" << endl;
+/*             response_xml << "           <li><b>Versión:</b> " << request.version << endl;
+               response_xml << "           <li><b>Método:</b> " << (request.method ? "POST" : "GET") << endl;
+               response_xml << "           <li><b>URI:</b> " << request.uri << endl;
+               response_xml << "           <li><b>Query:</b> " << request.query << endl;
                 for (HTTPHeaders::const_iterator i = request.headers.begin();
                                 i != request.headers.end(); i++) {
                         response_xml << "           <li><b>" << i->first << ":</b> "
                                 << i->second << endl;
+               }*/
+               response_xml << "           <li><b>Target:</b> " << command.get_target() << endl;
+               response_xml << "           <li><b>Command:</b> " << command.get_command() << endl;
+               response_xml << "           <li><b>Argumentos:</b>" << endl;
+               response_xml << "               <ol>" << endl;
+               for (Command::Arguments::const_iterator i = command.get_args().begin();
+                               i != command.get_args().end(); i++) {
+                       response_xml << "                   <li>" << *i << "</li>" << endl;
                 }
+               response_xml << "               </ol>" << endl;
                 response_xml << "        </ul>" << endl;
                 response_xml << "        <h2>Desarrollado por</h2>" << endl;
                 response_xml << "        <ul>" << endl;