se borran las lineas al eliminar un item, esto no esta totalmente testeado

[z.facultad/75.42/plaqui.git] / Server / src / receiver.cpp

diff --git a/Server/src/receiver.cpp b/Server/src/receiver.cpp
index c381c7d6d104683c32e745d43bde76280099281e..8185727b8efd1c6da896df2054fd3dfbf348bf41 100644 (file)
--- a/Server/src/receiver.cpp
+++ b/Server/src/receiver.cpp
@@ -26,6 +26,7 @@
 //
 
 #include "plaqui/server/receiver.h"
+#include <sstream>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
@@ -36,35 +37,61 @@ namespace PlaQui {
 
 namespace Server {
 
+const string Receiver::FRAME_BEGIN("<plantstatus");
+
+const string Receiver::FRAME_END("</plantstatus>");
+
 Receiver::~Receiver(void) {
 #ifdef DEBUG
        cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-Receiver::Receiver(int port, string host): Connection(sockbuf::sock_dgram) {
+Receiver::Receiver(const Connection::Port& port, const string& host):
+               Connection(sockbuf::sock_dgram, host, port) {
 #ifdef DEBUG
        cerr << __FILE__ << ": port = " << port
                << " | host = " << host << endl;
 #endif // DEBUG
-       // FIXME - deberia ir en run().
-       socket->bind(port);
+       //socket->bind(port);
+       socket->bind(host.c_str(), port);
 }
 
+// XXX EL XML DEBE EMPEZAR Y FINALIZAR EN UNA LINEA SEPARADA.
 void Receiver::real_run(void) {
 #ifdef DEBUG
        cerr << __FILE__ << ": real_run." << endl;
 #endif // DEBUG
-       // FIXME - debería tirar una excepción?
-       if (!socket->is_open()) {
-               cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << endl;
-       } else {
-               cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << endl;
+       char buf[BUFSIZ];
+       bool in_frame = false;
+       stringstream ss;
+       while (!stop && socket.getline(buf, BUFSIZ)) {
+               string sbuf = buf;
+               if (in_frame) {
+                       string::size_type pos = sbuf.find(FRAME_END);
+                       if (pos == string::npos) { // No encuentra el fin
+                               ss << sbuf << endl;
+                       } else { // Encuentra el fin.
+                               // Agrego al mensaje actual hasta el final </plantstatus>.
+                               ss << sbuf.substr(0, pos + FRAME_END.length());
+                               frame_received(ss.str());
+                               ss.str("");
+                               in_frame = false;
+                       }
+               } else { // No esta en un frame.
+                       string::size_type pos = sbuf.find(FRAME_BEGIN);
+                       if (pos != string::npos) { // Encuentra el inicio
+                               ss << sbuf.substr(pos) << endl;
+                               in_frame = true;
+                       }
+               }
        }
 }
 
+Receiver::SignalFrameReceived& Receiver::signal_frame_received(void) {
+       return frame_received;
+}
+
 } // namespace Server
 
 } // namespace PlaQui