]> git.llucax.com Git - z.facultad/75.42/plaqui.git/commitdiff
projects / z.facultad / 75.42 / plaqui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9a265fb)
- Se limpian un poco las respuestas, ahora lo que van a ser respuestas reales,
authorLeandro Lucarella <llucax@gmail.com>
Tue, 18 Nov 2003 23:20:09 +0000 (23:20 +0000)
committerLeandro Lucarella <llucax@gmail.com>
Tue, 18 Nov 2003 23:20:09 +0000 (23:20 +0000)
  se manda en XML.
- Se implementa el esqueleto del comando /plant/set. Me falta conocer algunos
  detalles de que y como setear las cosas para terminarlo.

Server/include/plaqui/server/server.h patch | blob | history
Server/src/controlserver.cpp patch | blob | history
Server/src/server.cpp patch | blob | history

diff --git a/Server/include/plaqui/server/server.h b/Server/include/plaqui/server/server.h
index 21a1958e798dd6dc6973d8c65bd28e801059a6b5..b29548350bd3b87449a72295fe65b096195d23e3 100644 (file)
--- a/Server/include/plaqui/server/server.h
+++ b/Server/include/plaqui/server/server.h
@@ -117,6 +117,11 @@ namespace Server {
                         */
                        HTTPResponse* cmd_plant_get(const Command& command);
 
+                       /**
+                        * Maneja el comando plant/get.
+                        */
+                       HTTPResponse* cmd_plant_set(const Command& command);
+
                        /**
                         * Maneja el comando plant/stop.
                         */
diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 32d3306254d717919069c56f0f8cb6c68f743f58..23f89c40f0a0f53a561b5991658ebb5f13f64bcc 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -126,55 +126,6 @@ void ControlServer::real_run(void) {
 #endif // DEBUG
                // Manda el comando.
                command_received(command);
-               // FIXME - hacer respuesta XML.
-               // La respuesta hay que mandarla asincrónicamente porque no puedo
-               // responder hasta que la planta no se termine de actualizar, por
-               // ejemplo.
-               //stringstream response_xml;
-               //socket << "HTTP/1.0 200 OK" << endl;
-/*
-Date: Sun, 19 Oct 2003 15:11:14 GMT
-Server: Apache/1.3.28 (Debian GNU/Linux)
-Last-Modified: Mon, 28 Apr 2003 07:50:08 GMT
-Accept-Ranges: bytes
-*/
-/*
-               socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
-               response_xml << "<html>" << endl;
-               response_xml << "    <head>" << endl;
-               response_xml << "        <title>PlaQui v0.4</title>" << endl;
-               response_xml << "    </head>" << endl;
-               response_xml << "    <body>" << endl;
-               response_xml << "        <h1>PlaQui</h1>" << endl;
-               response_xml << "        <p>versión 0.4</p>" << endl;
-               response_xml << "        <h2>Comando</h2>" << endl;
-               response_xml << "        <ul>" << 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;
-               response_xml << "            <li>Nicolás Dimov.</li>" << endl;
-               response_xml << "            <li>Leandro Lucarella.</li>" << endl;
-               response_xml << "            <li>Ricardo Markiewicz.</li>" << endl;
-               response_xml << "        </ul>" << endl;
-               response_xml << "        <address>" << endl;
-               response_xml << "             Copyleft 2003 - bajo los " << endl;
-               response_xml << "             términos de la licencia GPL" << endl;
-               response_xml << "        </address>" << endl;
-               response_xml << "    </body>" << endl;
-               response_xml << "</html>" << endl;
-               socket << "Content-Length: " << response_xml.str().length() << endl;
-               socket << endl;
-               socket << response_xml.str() << flush;
-*/
        }
 }
 
diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 2f93c6d3ae7182916f904a8868c335fe2765e9fd..8f7692204cab0ff61d27dae60ba8f1281f3627f4 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -145,6 +145,8 @@ void Server::on_control_command_received(const Command& command,
                        response = cmd_plant_list();
                } else if (command.get_command() == "get") {
                        response = cmd_plant_get(command);
+               } else if (command.get_command() == "set") {
+                       response = cmd_plant_set(command);
                } else if (command.get_command() == "stop") {
                        response = cmd_plant_stop(command);
                } else {
@@ -169,37 +171,14 @@ void Server::on_control_command_received(const Command& command,
 HTTPResponse* Server::cmd_server_status(void) const {
        // FIXME
        stringstream response_xml;
-       response_xml << "<html>" << endl;
-       response_xml << "    <head>" << endl;
-       response_xml << "        <title>PlaQui v0.8</title>" << endl;
-       response_xml << "    </head>" << endl;
-       response_xml << "    <body>" << endl;
-       response_xml << "        <h1>PlaQui</h1>" << endl;
-       response_xml << "        <p>versión 0.8</p>" << endl;
-/*     response_xml << "        <h2>Comando</h2>" << endl;
-       response_xml << "        <ul>" << 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;
-       response_xml << "            <li>Nicolás Dimov.</li>" << endl;
-       response_xml << "            <li>Leandro Lucarella.</li>" << endl;
-       response_xml << "            <li>Ricardo Markiewicz.</li>" << endl;
-       response_xml << "        </ul>" << endl;
-       response_xml << "        <address>" << endl;
-       response_xml << "             Copyleft 2003 - bajo los " << endl;
-       response_xml << "             términos de la licencia GPL" << endl;
-       response_xml << "        </address>" << endl;
-       response_xml << "    </body>" << endl;
-       response_xml << "</html>" << endl;
+       response_xml << "<serverstatus>" << endl;
+       response_xml << "\t<version>0.9</version>" << endl;
+       response_xml << "\t<authors>" << endl;
+       response_xml << "\t\t<author>Nicolás Dimov</author>" << endl;
+       response_xml << "\t\t<author>Leandro Lucarella</author>" << endl;
+       response_xml << "\t\t<author>Ricardo Markiewicz</author>" << endl;
+       response_xml << "\t</authors>" << endl;
+       response_xml << "</serverstatus>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
@@ -207,29 +186,15 @@ HTTPResponse* Server::cmd_connection_list(void) {
        // FIXME
        TCPServer::ConnectionInfoList cil = get_connected();
        stringstream response_xml;
-       response_xml << "<html>" << endl;
-       response_xml << "    <head>" << endl;
-       response_xml << "        <title>PlaQui v0.8</title>" << endl;
-       response_xml << "    </head>" << endl;
-       response_xml << "    <body>" << endl;
-       response_xml << "        <h1>PlaQui</h1>" << endl;
-       response_xml << "        <p>versión 0.8</p>" << endl;
-       response_xml << "        <h2>Lista de conexiones:</h2>" << endl;
-       response_xml << "        <ul>" << endl;
+       response_xml << "<list type=\"connection\">" << endl;
        for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin();
                        i != cil.end(); i++) {
-               response_xml << "       <li>" << i->host
-                       << ":" << i->port << " [<a href=\"/connection/stop/"
-                       << i->host << "/" << i->port << "\">deconectar</a>]</li>"
-                       << endl;
+               response_xml << "\t<row>" << endl;
+               response_xml << "\t\t<cell>" << i->host << "</cell>" << endl;
+               response_xml << "\t\t<cell>" << i->port << "</cell>" << endl;
+               response_xml << "\t</row>" << endl;
        }
-       response_xml << "        </ul>" << endl;
-       response_xml << "        <address>" << endl;
-       response_xml << "             Copyleft 2003 - bajo los " << endl;
-       response_xml << "             términos de la licencia GPL" << endl;
-       response_xml << "        </address>" << endl;
-       response_xml << "    </body>" << endl;
-       response_xml << "</html>" << endl;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
@@ -253,15 +218,7 @@ HTTPResponse* Server::cmd_connection_stop(const Command& command) {
 HTTPResponse* Server::cmd_transmission_list(void) {
        // FIXME
        stringstream response_xml;
-       response_xml << "<html>" << endl;
-       response_xml << "    <head>" << endl;
-       response_xml << "        <title>PlaQui v0.8</title>" << endl;
-       response_xml << "    </head>" << endl;
-       response_xml << "    <body>" << endl;
-       response_xml << "        <h1>PlaQui</h1>" << endl;
-       response_xml << "        <p>versión 0.8</p>" << endl;
-       response_xml << "        <h2>Lista de transmisiones:</h2>" << endl;
-       response_xml << "        <ul>" << endl;
+       response_xml << "<list type=\"transmission\">" << endl;
 /*TODO plants_mutex.lock();
        for (PlantList::const_iterator i = plants.begin();
                        i != plants.end(); i++) {
@@ -272,13 +229,7 @@ HTTPResponse* Server::cmd_transmission_list(void) {
                        << "\">desconectar</a>]</li>" << endl;
        }
        transmissions_mutex.unlock();*/
-       response_xml << "        </ul>" << endl;
-       response_xml << "        <address>" << endl;
-       response_xml << "             Copyleft 2003 - bajo los " << endl;
-       response_xml << "             términos de la licencia GPL" << endl;
-       response_xml << "        </address>" << endl;
-       response_xml << "    </body>" << endl;
-       response_xml << "</html>" << endl;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
@@ -337,30 +288,16 @@ HTTPResponse* Server::cmd_transmission_stop(const Command& command) {
 HTTPResponse* Server::cmd_plant_list(void) {
        // FIXME
        stringstream response_xml;
-       response_xml << "<html>" << endl;
-       response_xml << "    <head>" << endl;
-       response_xml << "        <title>PlaQui v0.8</title>" << endl;
-       response_xml << "    </head>" << endl;
-       response_xml << "    <body>" << endl;
-       response_xml << "        <h1>PlaQui</h1>" << endl;
-       response_xml << "        <p>versión 0.8</p>" << endl;
-       response_xml << "        <h2>Lista de plantas:</h2>" << endl;
-       response_xml << "        <ul>" << endl;
+       response_xml << "<list type=\"plant\">" << endl;
        plants_mutex.lock();
        for (PlantList::const_iterator i = plants.begin();
                        i != plants.end(); i++) {
-               response_xml << "       <li>" << i->first
-                       << " [<a href=\"/plant/stop/" << i->first << "\">parar</a>]</li>"
-                       << endl;
+               response_xml << "\t<row>" << endl;
+               response_xml << "\t\t<cell>" << i->first << "</cell>" << endl;
+               response_xml << "\t</row>" << endl;
        }
        plants_mutex.unlock();
-       response_xml << "        </ul>" << endl;
-       response_xml << "        <address>" << endl;
-       response_xml << "             Copyleft 2003 - bajo los " << endl;
-       response_xml << "             términos de la licencia GPL" << endl;
-       response_xml << "        </address>" << endl;
-       response_xml << "    </body>" << endl;
-       response_xml << "</html>" << endl;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
@@ -370,20 +307,44 @@ HTTPResponse* Server::cmd_plant_get(const Command& command) {
                                "Faltan argumentos.");
        }
        Glib::Mutex::Lock lock(plants_mutex);
-       string name = command.get_args()[0];
-       if (plants.find(name) == plants.end()) {
+       string plant = command.get_args()[0];
+       if (plants.find(plant) == plants.end()) {
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
-                               string("No existe la planta ") + name);
+                               string("No existe la planta ") + plant);
        }
-       string xml = plants[name]->get_xml();
+       string xml = plants[plant]->get_xml();
        if (xml.length()) {
                return new HTTPResponse(HTTPMessage::OK, xml);
        } else {
                return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
-                               ("No se pudo obtener el XML de la planta ") + name);
+                               ("No se pudo obtener el XML de la planta ") + plant);
        }
 }
 
+HTTPResponse* Server::cmd_plant_set(const Command& command) {
+       const Command::Arguments& args = command.get_args();
+       if (args.size() < 4) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               "Faltan argumentos.");
+       }
+       string plant = args[0];
+       string element = args[1];
+       string key = args[2];
+       string value = args[3];
+       Glib::Mutex::Lock lock(plants_mutex);
+       PlantList::iterator p = plants.find(plant);
+       if (p == plants.end()) {
+               return new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("No existe la planta '") + plant + "'.");
+       }
+/*     if (!plants[plant]->set_element(host, port)) {
+               return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
+                               string("Error al crear la transmisión a de la planta '")
+                               + plant + "' a " + host + ":" + args[2] + ".");
+       }*/
+       return new HTTPResponse(HTTPMessage::OK);
+}
+
 HTTPResponse* Server::cmd_plant_stop(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
Simulador de planta química (TP Final de Taller I)