-Se arregla lo del id cuando se carga una planta

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

diff --git a/Server/src/plant.cpp b/Server/src/plant.cpp
index c56035cb6cd18aedbbfebc3168bd9a60399463f2..69ce671c511c442be112a5580b78d2c8ac7f160c 100644 (file)
--- a/Server/src/plant.cpp
+++ b/Server/src/plant.cpp
@@ -28,6 +28,9 @@
 #include "plaqui/server/plant.h"
 #include <glibmm/timer.h>
 #include <sigc++/slot.h>
 #include "plaqui/server/plant.h"
 #include <glibmm/timer.h>
 #include <sigc++/slot.h>

+#include <fstream>
+#include <iterator>
+#include <algorithm>

 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG


@@ -50,7 +53,7 @@ Plant::~Plant(void) {
        }
 }
 
        }
 }
 

-Plant::Plant(const string& filename): simulator(filename) {
+Plant::Plant(const string& filename): simulator(filename), filename(filename) {

 #ifdef DEBUG
        cerr << __FILE__ << ": constructor. filename = " << filename << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": constructor. filename = " << filename << endl;
 #endif // DEBUG


@@ -83,8 +86,7 @@ void Plant::real_run(void) {
        }
 }
 
        }
 }
 

-bool Plant::transmission_start(const string& host,
-               const Connection::Port& port) {
+bool Plant::transmission_start(string& host, Connection::Port& port) {

        Glib::Mutex::Lock lock(transmissions_mutex);
        for (TransmitterList::iterator i = transmissions.begin();
                        i != transmissions.end(); i++) {
        Glib::Mutex::Lock lock(transmissions_mutex);
        for (TransmitterList::iterator i = transmissions.begin();
                        i != transmissions.end(); i++) {


@@ -117,6 +119,19 @@ bool Plant::transmission_stop(const string& host,
        return false; // No la encontró.
 }
 
        return false; // No la encontró.
 }
 

+const string Plant::get_xml(void) const {
+       ostringstream oss;
+       try {
+               ifstream ifs(filename.c_str());
+               ifs >> noskipws;
+               copy(istream_iterator<char>(ifs), istream_iterator<char>(),
+                               ostream_iterator<char>(oss));
+       } catch (...) { // TODO hacerlo mas selectivo?
+               return "";
+       }
+       return oss.str();
+}
+

 /*
 bool Plant::transmission_exists(const string& host,
                const Connection::Port& port) {
 /*
 bool Plant::transmission_exists(const string& host,
                const Connection::Port& port) {