X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1b53a979e1de9034a9755955ea22cd40ed138f23..142292d716f0240f0cd50b8c17daa284d782cec8:/Server/src/httpmessage.cpp?ds=inline

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 2d3a18b..cfdd894 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -25,38 +25,46 @@
 // $Id$
 //
 
+#include "plaqui/server/string.h"
 #include "plaqui/server/httpmessage.h"
+#include <sstream>
 #include <cstdlib>
 #ifdef DEBUG
 #	include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::HTTPMessage::~HTTPMessage(void) {
+using namespace std;
+
+namespace PlaQui {
+	
+namespace Server {
+
+HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": destructor." << std::endl;
+	cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-		http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& version):
+		version(version) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+	cerr << __FILE__ << ": version = " << version << endl;
 #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
-	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);
 }
 */
 
-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
@@ -65,43 +73,58 @@ 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;
 }
 
-istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
+istream& operator>>(istream& is, HTTPMessage& m) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator>>()" << std::endl;
+	cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
 	char buf[BUFSIZ];
 	bool is_header = true;
-	stringstream body_ss;
+	// TODO body
+	// Para hacer que reciba bien el body hay que chequear la cabecera
+	// Content-length, si queda tiempo lo haré...
+	//stringstream body_ss;
 	while (is.getline(buf, BUFSIZ)) {
-		std::string sbuf = buf;
-		if (sbuf.length())
+		String sbuf(buf);
+		sbuf.trim();
+		if (sbuf.length()) {
 			if (is_header) {
-				istringstream(buf) >> m.headers;
-			} else {
-				body_ss << buf << std::endl;
-			}
+				stringstream ss;
+				ss << sbuf;
+				ss >> m.headers;
+			}// else { TODO body
+			//	body_ss << sbuf << endl;
+			//}
 		} else {
 			if (is_header) {
+				// TODO body
+				// Ver si tiene un Content-Length para saber si esperamos body.
+				// Si no esperamos body, no hay que hacer otro is.getline()
+				// porque se queda esperando forever.
 				is_header = false;
-			} else {
-				body_ss << buf << std::endl;
-			}
+				break;
+			}// else { TODO body
+			//	body_ss << sbuf << endl;
+			//}
 		}
 	}
-	// TODO si el body es un serializable, deberia auto deserializarse.
-	body = body_ss.str();
+	// TODO body
+	//m.body = body_ss.str();
 	return is;
 }
 
-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator<<()" << std::endl;
+	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	return os << headers << "\r\l" // Fin de cabeceras
-		<< body;
+	return os << m.headers << "\n\r" // Fin de cabeceras
+		<< m.body;
 }
 
+} // namespace Server
+
+} // namespace PlaQui
+