Se corrigen algunos errores. Tengo un problema con la sobrecarga del operator>> ...

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index 67ec270a12c3cfa55f2e424305cb5d4c81135b83..cef6d057a1273b91385b7278cce77553dd61c95d 100644 (file)
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -31,34 +31,38 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::HTTPHeaders::~HTTPHeaders(void) {
+using namespace std;
+using namespace PlaQui::Server;
+
+HTTPHeaders::~HTTPHeaders(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-istream& operator>>(std::istream& is, PlaQui::Server::httpheaders& h) {
+istream& operator>>(istream& is, HTTPHeaders& h) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator>>()" << std::endl;
+       cerr << __FILE__ << ": operator>>()" << endl;

 #endif // DEBUG
        char buf[BUFSIZ];
        is.getline(buf, BUFSIZ);
 #endif // DEBUG
        char buf[BUFSIZ];
        is.getline(buf, BUFSIZ);

-       std::string sbuf = buf;
-       std::string::size_type pos = sbuf.find(":");
-       if (pos == std::string::npos) {
+       string sbuf = buf;
+       string::size_type pos = sbuf.find(":");
+       if (pos == string::npos) {

                // FIXME poner mejores excepciones.
                throw "Wrong header";
        }
                // FIXME poner mejores excepciones.
                throw "Wrong header";
        }

-       (*this)[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+       h[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);

        return is;
 }
 
        return is;
 }
 

-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPHeaders& h) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+       cerr << __FILE__ << ": operator<<()" << endl;

 #endif // DEBUG
 #endif // DEBUG

-       for (HTTPMessage::const_iterator i = begin(); i != end(); ++i) {
-               os << i->first << ": " << i->second << "\r\l";
+       for (HTTPHeaders::const_iterator i = h.begin();
+                       i != h.end(); ++i) {
+               os << i->first << ": " << i->second << "\r\n";

        }
        return os;
 }
        }
        return os;
 }

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 2d3a18bca1f5bc09836efbdfc9058cad8b18431e..737f6365dd0d94debd33e5be2ffb96ec9948e108 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -26,37 +26,41 @@
 //
 
 #include "plaqui/server/httpmessage.h"
 //
 
 #include "plaqui/server/httpmessage.h"

+#include <sstream>

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

-PlaQui::Server::HTTPMessage::~HTTPMessage(void) {
+using namespace std;
+using namespace PlaQui::Server;
+
+HTTPMessage::~HTTPMessage(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-               http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& version):
+               version(version) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+       cerr << __FILE__ << ": version = " << version << endl;

 #endif // DEBUG
 }
 
 /*
 #endif // DEBUG
 }
 
 /*

-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
-               const std::string& http_version):
+HTTPMessage::HTTPMessage(const string& _body,
+               const string& http_version):

                http_version(http_version) {
 #ifdef DEBUG
                http_version(http_version) {
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << std::endl;
+       cerr << __FILE__ << ": http_version = " << http_version
+               << " | body = " << body << endl;

 #endif // DEBUG
        set_body(_body);
 }
 */
 
 #endif // DEBUG
        set_body(_body);
 }
 */
 

-void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
+void HTTPMessage::set_body(const string& _body) {

        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir
        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir


@@ -65,30 +69,30 @@ void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
        }
 }
 
        }
 }
 

-const std::string& PlaQui::Server::HTTPMessage::get_body(void) {
+const string& HTTPMessage::get_body(void) const {

        return body;
 }
 
        return body;
 }
 

-istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
+istream& operator>>(istream& is, HTTPMessage& m) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator>>()" << std::endl;
+       cerr << __FILE__ << ": operator>>()" << endl;

 #endif // DEBUG
        char buf[BUFSIZ];
        bool is_header = true;
        stringstream body_ss;
        while (is.getline(buf, BUFSIZ)) {
 #endif // DEBUG
        char buf[BUFSIZ];
        bool is_header = true;
        stringstream body_ss;
        while (is.getline(buf, BUFSIZ)) {

-               std::string sbuf = buf;
+               string sbuf = buf;

                if (sbuf.length())
                        if (is_header) {
                                istringstream(buf) >> m.headers;
                        } else {
                if (sbuf.length())
                        if (is_header) {
                                istringstream(buf) >> m.headers;
                        } else {

-                               body_ss << buf << std::endl;
+                               body_ss << buf << endl;

                        }
                } else {
                        if (is_header) {
                                is_header = false;
                        } else {
                        }
                } else {
                        if (is_header) {
                                is_header = false;
                        } else {

-                               body_ss << buf << std::endl;
+                               body_ss << buf << endl;

                        }
                }
        }
                        }
                }
        }


@@ -97,11 +101,11 @@ istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
        return is;
 }
 
        return is;
 }
 

-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, HTTPMessage) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+       cerr << __FILE__ << ": operator<<()" << endl;

 #endif // DEBUG
 #endif // DEBUG

-       return os << headers << "\r\l" // Fin de cabeceras
+       return os << headers << "\r\n" // Fin de cabeceras

                << body;
 }
 
                << body;
 }