- Se agrega el metodo Model::Simulator::set_open() para abrir y cerrar bombas y

  exclusas.
- Se actualiza el server para usarlo y se implementa el comando /plant/set/.
- Se limpia un poco mas las respuestas, ahora son todas (?) XML aunque no
  definitivas.

diff --git a/Model/configure.in b/Model/configure.in
index 05d0532a265d6b4e6e0a0c51999d973f40af5691..f5454e5dacb684156de6f5e99d33de854e2f4d7f 100644 (file)
--- a/Model/configure.in
+++ b/Model/configure.in
@@ -10,7 +10,7 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 
 PKG_CHECK_MODULES(PACKAGE, 
-               xml2 >= 0.15.0 )
+               libxml-2.0 >= 0.15.0 )
 
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)

diff --git a/Model/include/simulator.h b/Model/include/simulator.h
index cd68c051ae4caf51dfc65a48147ed79de81edc4e..3713776245b620f7018e4e5a5758881aab7c39cf 100644 (file)
--- a/Model/include/simulator.h
+++ b/Model/include/simulator.h
@@ -50,7 +50,7 @@ public:
        /// Tipos de elementos
        enum {PUMP, UNION, SPLITTER, CONDUCT, EXCLUSA, TANK, DRAINAGE};
 
-       bool pump_deactivate(const std::string &name);
+       bool set_open(const std::string &name, bool open = true);
 protected:
        // Los mantengo en listas separadas para ahorrar
        // CPU y no tener que usar dinamic_cast

diff --git a/Model/src/simulator.cpp b/Model/src/simulator.cpp
index 2d763fe58482409cf098408488e77d69efdd3279..3aeacd667c25c3af77b8fce1853f51e7c6dbe673 100644 (file)
--- a/Model/src/simulator.cpp
+++ b/Model/src/simulator.cpp
@@ -158,17 +158,27 @@ IConector *Simulator::find(const std::string &name)
        return NULL;
 }
 
-bool Simulator::pump_deactivate(const std::string &name)
+bool Simulator::set_open(const std::string &name, bool open)
 {
        // Busco el elemento, usando RTTI :-(
-       Pump *pump = dynamic_cast<Pump *>(find(name));
-
-       if (!pump) {
-               // Ups!, "name" no era un Pump!!!
+       IConector *tmp = find(name);
+       Pump *p;
+       Exclusa *e;
+       if ((p = dynamic_cast<Pump*>(tmp))) {
+               if (open) {
+                       p->activate();
+               } else {
+                       p->deactivate();
+               }
+       } else if ((e = dynamic_cast<Exclusa*>(tmp))) {
+               if (open) {
+                       e->open();
+               } else {
+                       e->close();
+               }
+       } else {
                return false;
        }
-       pump->deactivate();
-       return true;
 }
 
 void Simulator::loadBomba(xmlNodePtr nodo)

diff --git a/Server/include/plaqui/server/plant.h b/Server/include/plaqui/server/plant.h
index c6e64a6c5fcc7442ddef79531773257d57b6414b..89ee76fc85285422a5bde41f665f1467fb2da53b 100644 (file)
--- a/Server/include/plaqui/server/plant.h
+++ b/Server/include/plaqui/server/plant.h
@@ -62,6 +62,9 @@ namespace Server {
                        /// Simulador usado para calcular el estado de la planta.
                        Model::Simulator simulator;
 
+                       /// Mutex para el simulador.
+                       Glib::Mutex simulator_mutex;
+
                        /// Nombre del archivo donde esta el XML de la planta.
                        std::string filename;
 
@@ -105,6 +108,20 @@ namespace Server {
                        bool transmission_stop(const string& host,
                                        const Connection::Port& port);
 
+                       /**
+                        * Abre (o cierra) un elemento de la planta.
+                        *
+                        * Sólo la bomba y la exclusa pueden ser abiertos y cerrados.
+                        *
+                        * \param element Nombre del elemento a abrir o cerrar.
+                        * \param open    true si se quiere abrir el elemento, false si se
+                        *                lo quiere cerrar.
+                        *
+                        * \return true si se abrió o cerró el elemento, false si no existía
+                        *         o si no era una bomba o exclusa.
+                        */
+                       bool set_open(const std::string& element, bool open = true);
+
                        /**
                         * Obtiene el XML de la planta.
                         */

diff --git a/Server/src/plant.cpp b/Server/src/plant.cpp
index 69ce671c511c442be112a5580b78d2c8ac7f160c..e46e692671fb7dc864a909e7862b4f338794ee49 100644 (file)
--- a/Server/src/plant.cpp
+++ b/Server/src/plant.cpp
@@ -76,12 +76,15 @@ void Plant::real_run(void) {
        cerr << __FILE__ << ": real_run." << endl;
 #endif // DEBUG
        while (!stop) {
+               simulator_mutex.lock();
                simulator.simulate();
-               Glib::Mutex::Lock lock(transmissions_mutex);
+               simulator_mutex.unlock();
+               transmissions_mutex.lock();
                for (TransmitterList::iterator i = transmissions.begin();
                                i != transmissions.end(); i++) {
                        (*i)->send(simulator.get_state_as_xml());
                }
+               transmissions_mutex.unlock();
                Glib::usleep(1000000);
        }
 }
@@ -119,6 +122,11 @@ bool Plant::transmission_stop(const string& host,
        return false; // No la encontró.
 }
 
+bool Plant::set_open(const std::string& element, bool open) {
+       Glib::Mutex::Lock lock(simulator_mutex);
+       return simulator.set_open(element, open);
+}
+
 const string Plant::get_xml(void) const {
        ostringstream oss;
        try {

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 8f7692204cab0ff61d27dae60ba8f1281f3627f4..4247d9124297fda8dfbc22326379983da3ae8ee7 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -115,10 +115,10 @@ void Server::on_control_command_received(const Command& command,
                } else if (command.get_command() == "stop") {
                        finish();
                        response = new HTTPResponse(HTTPMessage::OK,
-                                       "El server se apagará en instantes...");
+                                       "<response desc=\"El server se apagará en instantes...\" />");
                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
-                                       "Invalid command for 'server' taget!");
+                                       "<response desc=\"Invalid command for 'server' taget!\" />");
                }
        } else if (command.get_target() == "connection") {
                if (command.get_command() == "list") {
@@ -127,7 +127,7 @@ void Server::on_control_command_received(const Command& command,
                        response = cmd_connection_stop(command);
                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
-                                       "Invalid command for 'connection' taget!");
+                                       "<response desc=\"Invalid command for 'connection' taget!\" />");
                }
        } else if (command.get_target() == "transmission") {
                if (command.get_command() == "list") {
@@ -138,7 +138,7 @@ void Server::on_control_command_received(const Command& command,
                        response = cmd_transmission_stop(command);
                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
-                                       "Invalid command for 'transmission' taget!");
+                                       "<response desc=\"Invalid command for 'transmission' taget!\" />");
                }
        } else if (command.get_target() == "plant") {
                if (command.get_command() == "list") {
@@ -151,10 +151,11 @@ void Server::on_control_command_received(const Command& command,
                        response = cmd_plant_stop(command);
                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
-                                       "Invalid command for 'plant' taget!");
+                                       "<response desc=\"Invalid command for 'plant' taget!\" />");
                }
        } else {
-               response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!");
+               response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               "<response desc=\"Invalid taget!\" />");
        }
        // FIXME
        response->headers["Content-Type"] = "text/xml; charset=iso-8859-1";
@@ -170,32 +171,32 @@ void Server::on_control_command_received(const Command& command,
 
 HTTPResponse* Server::cmd_server_status(void) const {
        // FIXME
-       stringstream response_xml;
-       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());
+       stringstream xml;
+       xml << "<serverstatus>" << endl;
+       xml << "\t<version>0.9</version>" << endl;
+       xml << "\t<authors>" << endl;
+       xml << "\t\t<author>Nicolás Dimov</author>" << endl;
+       xml << "\t\t<author>Leandro Lucarella</author>" << endl;
+       xml << "\t\t<author>Ricardo Markiewicz</author>" << endl;
+       xml << "\t</authors>" << endl;
+       xml << "</serverstatus>" << endl;
+       return new HTTPResponse(HTTPMessage::OK, xml.str());
 }
 
 HTTPResponse* Server::cmd_connection_list(void) {
        // FIXME
        TCPServer::ConnectionInfoList cil = get_connected();
-       stringstream response_xml;
-       response_xml << "<list type=\"connection\">" << endl;
+       stringstream xml;
+       xml << "<list type=\"connection\">" << endl;
        for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin();
                        i != cil.end(); i++) {
-               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;
+               xml << "\t<row>" << endl;
+               xml << "\t\t<cell>" << i->host << "</cell>" << endl;
+               xml << "\t\t<cell>" << i->port << "</cell>" << endl;
+               xml << "\t</row>" << endl;
        }
-       response_xml << "</list>" << endl;
-       return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+       xml << "</list>" << endl;
+       return new HTTPResponse(HTTPMessage::OK, xml.str());
 }
 
 HTTPResponse* Server::cmd_connection_stop(const Command& command) {
@@ -203,60 +204,60 @@ HTTPResponse* Server::cmd_connection_stop(const Command& command) {
        Connection::Port port;
        if (args.size() < 2) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
-                               "Faltan argumentos.");
-       } else if (disconnect(args[0], String(args[1]).to(port))) {
+                               "<response desc=\"Faltan argumentos.\" />");
+       } else if (disconnect(args[0], to(args[1], port))) {
                return new HTTPResponse(HTTPMessage::OK,
-                               string("La conexión a ") + args[0] + ":" + args[1]
-                               + " se cerrará en instantes...");
+                               string("<response desc=\"La conexión a ") + args[0] + ":" + args[1]
+                               + " se cerrará en instantes...\" />");
        } else {
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
-                               string("No existe una conexión a ") + args[0]
-                               + ":" + args[1]);
+                               string("<response desc=\"No existe una conexión a ") + args[0]
+                               + ":" + args[1] + "\" />");
        }
 }
 
 HTTPResponse* Server::cmd_transmission_list(void) {
        // FIXME
-       stringstream response_xml;
-       response_xml << "<list type=\"transmission\">" << endl;
+       stringstream xml;
+       xml << "<list type=\"transmission\">" << endl;
 /*TODO plants_mutex.lock();
        for (PlantList::const_iterator i = plants.begin();
                        i != plants.end(); i++) {
                trans
-               response_xml << "       <li>" << (*i)->get_host() << ":"
+               xml << "       <li>" << (*i)->get_host() << ":"
                        << (*i)->get_port() << " [<a href=\"/transmission/stop/"
                        << (*i)->get_host() << "/" << (*i)->get_port()
                        << "\">desconectar</a>]</li>" << endl;
        }
        transmissions_mutex.unlock();*/
-       response_xml << "</list>" << endl;
-       return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+       xml << "</list>" << endl;
+       return new HTTPResponse(HTTPMessage::OK, xml.str());
 }
 
 HTTPResponse* Server::cmd_transmission_start(const Command& command) {
        const Command::Arguments& args = command.get_args();
        if (args.size() < 3) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
-                               "Faltan argumentos.");
+                               "<response desc=\"Faltan argumentos.\" />");
        } else {
                string plant = args[0];
                string host = args[1];
-               Connection::Port port = String(args[2]).to(port);
+               Connection::Port port = to(args[2], port);
                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 + "'.");
+                                       string("<response desc=\"No existe la planta '") + plant + "'.\" />");
                // TODO - agregar chequeo de que la transmision a ese host:port no
                //        exista para otra planta?
                } else if (plants[plant]->transmission_start(host, port)) {
                        return new HTTPResponse(HTTPMessage::OK,
-                                       string("Se empieza a transmitir la planta '") + plant
-                                       + "' a " + host + ":" + String().from(port) + ".");
+                                       string("<response desc=\"Se empieza a transmitir la planta '") + plant
+                                       + "' a " + host + ":" + String().from(port) + ".\" />");
                } else {
                        return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
-                                       string("Error al crear la transmisión a de la planta '")
-                                       + plant + "' a " + host + ":" + args[2] + ".");
+                                       string("<response desc=\"Error al crear la transmisión a de la planta '")
+                                       + plant + "' a " + host + ":" + args[2] + ".\" />");
                }
        }
 }
@@ -265,59 +266,59 @@ HTTPResponse* Server::cmd_transmission_stop(const Command& command) {
        const Command::Arguments& args = command.get_args();
        if (args.size() < 2) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
-                               "Faltan argumentos.");
+                               "<response desc=\"Faltan argumentos.\" />");
        } else {
                const string& host = args[0];
-               Connection::Port port = String(args[1]).to(port);
+               Connection::Port port = to(args[1], port);
                for (PlantList::iterator i = plants.begin(); i != plants.end(); i++) {
                        // TODO - agregar chequeo para saber si existe una conexion (para
                        // tirar error de que no hay conexion o de que no se pudo
                        // desconectar.
                        if (i->second->transmission_stop(host, port)) {
                                return new HTTPResponse(HTTPMessage::OK,
-                                               string("Se finaliza la transmisión de la planta '")
-                                               + i->first + "' a " + host + ":" + args[1] + ".");
+                                               string("<response desc=\"Se finaliza la transmisión de la planta '")
+                                               + i->first + "' a " + host + ":" + args[1] + ".\" />");
                        }
                }
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
-                               string("No se puede finalizar la transmisión a ")
-                               + host + ":" + args[1] + ".");
+                               string("<response desc=\"No se puede finalizar la transmisión a ")
+                               + host + ":" + args[1] + ".\" />");
        }
 }
 
 HTTPResponse* Server::cmd_plant_list(void) {
        // FIXME
-       stringstream response_xml;
-       response_xml << "<list type=\"plant\">" << endl;
+       stringstream xml;
+       xml << "<list type=\"plant\">" << endl;
        plants_mutex.lock();
        for (PlantList::const_iterator i = plants.begin();
                        i != plants.end(); i++) {
-               response_xml << "\t<row>" << endl;
-               response_xml << "\t\t<cell>" << i->first << "</cell>" << endl;
-               response_xml << "\t</row>" << endl;
+               xml << "\t<row>" << endl;
+               xml << "\t\t<cell>" << i->first << "</cell>" << endl;
+               xml << "\t</row>" << endl;
        }
        plants_mutex.unlock();
-       response_xml << "</list>" << endl;
-       return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+       xml << "</list>" << endl;
+       return new HTTPResponse(HTTPMessage::OK, xml.str());
 }
 
 HTTPResponse* Server::cmd_plant_get(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
-                               "Faltan argumentos.");
+                               "<response desc=\"Faltan argumentos.\" />");
        }
        Glib::Mutex::Lock lock(plants_mutex);
        string plant = command.get_args()[0];
        if (plants.find(plant) == plants.end()) {
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
-                               string("No existe la planta ") + plant);
+                               string("<response desc=\"No existe la planta ") + plant + "\" />");
        }
        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 ") + plant);
+                               ("<response desc=\"No se pudo obtener el XML de la planta ") + plant + "\" />");
        }
 }
 
@@ -325,41 +326,50 @@ 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.");
+                               "<response desc=\"Faltan argumentos.\" />");
        }
        string plant = args[0];
        string element = args[1];
        string key = args[2];
+       if (key != "open") {
+               return new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("<response desc=\"La clave '") + key + "' es inválida.\" />");
+       }
        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 + "'.");
+                               string("<response desc=\"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);
+       bool open = true;
+       if ((value == "false") || (value == "0") || (value == "off")
+                       || (value == "no")) {
+               open = false;
+       }
+       if (!plants[plant]->set_open(element, open)) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               string("<response desc=\"No se pudo cambiar el estado del elemento '") + element + "'.\" />");
+       }
+       return new HTTPResponse(HTTPMessage::OK,
+                       string("<response desc=\"Se cambió el estado del elemento '") + element + "'.\" />");
 }
 
 HTTPResponse* Server::cmd_plant_stop(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
-                               "Faltan argumentos.");
+                               "<response desc=\"Faltan argumentos.\" />");
        }
        Glib::Mutex::Lock lock(plants_mutex);
        const string name = command.get_args()[0];
        if (plants.find(name) == plants.end()) {
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
-                               string("No existe la planta ") + name);
+                               string("<response desc=\"No existe la planta ") + name + "\" />");
        }
        // TODO Ver si al frenar la planta se destruye (no deberia!!!)
        plants[name]->finish();
        return new HTTPResponse(HTTPMessage::OK,
-                       string("La planta '") + name + "' se cerrará en instantes...");
+                       string("<response desc=\"La planta '") + name + "' se cerrará en instantes...\" />");
 }
 
 } // namespace Server