Pocos cambios a la vista del "usuario":

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 2d3a18bca1f5bc09836efbdfc9058cad8b18431e..af2875ecfcb441e2c48202033be7db999c135189 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -25,83 +25,117 @@
 // $Id$
 //
 
 // $Id$
 //
 

+#include "plaqui/server/string.h"

 #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) {
-#ifdef DEBUG
-       std::cerr << __FILE__ << ": destructor." << std::endl;
-#endif // DEBUG
-}
+using namespace std;

 
 

-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-               http_version(http_version) {
+namespace PlaQui {
+       
+namespace Server {
+
+HTTPMessage::~HTTPMessage(void) {

 #ifdef DEBUG
 #ifdef DEBUG

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

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

-/*
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
-               const std::string& http_version):
-               http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& _body, const string& _version):
+               version(_version) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << std::endl;
+       cerr << __FILE__ << ": version = " << version << " | body.length = "
+               << _body.length() << 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

-               ss << body.length();
+               ss << (body.length());
+               headers["Accept-Ranges"] = "bytes";

                headers["Content-Length"] = ss.str();
        }
 }
 
                headers["Content-Length"] = ss.str();
        }
 }
 

-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;
 #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)) {
        while (is.getline(buf, BUFSIZ)) {

-               std::string sbuf = buf;
-               if (sbuf.length())
+               String sbuf(buf);
+               sbuf.trim();
+               if (sbuf.length()) {

                        if (is_header) {
                        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) {
                } 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;
                                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;
 }
 
        return is;
 }
 

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

 #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
-               << body;
+       return os << m.headers << "\n\r" // Fin de cabeceras
+               << m.body;

 }
 
 }
 

+string HTTPMessage::reason(unsigned code) {
+       switch (code) {
+               // TODO completar los códigos.
+               case OK:
+                       return "OK";
+               case BAD_REQUEST:
+                       return "Bad Request";
+               case LENGTH_REQUIRED:
+                       return "Length Required";
+               case INTERNAL_SERVER_ERROR:
+                       return "Internal Server Error";
+               case NOT_IMPLEMENTED:
+                       return "Not Implemented";
+               case HTTP_VERSION_NOT_SUPPORTED:
+                       return "HTTP Version Not Supported";
+               default:
+                       return "";
+       }
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+