X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ffe5447aa2d71b5296cbdd36c48d5f9d59e249af..dea314b92324ad67455bb039e2078652ab0e5824:/Server/src/command.cpp?ds=sidebyside

diff --git a/Server/src/command.cpp b/Server/src/command.cpp
index 084cf79..5aa4700 100644
--- a/Server/src/command.cpp
+++ b/Server/src/command.cpp
@@ -28,6 +28,7 @@
 #include "plaqui/server/command.h"
 #include "plaqui/server/string.h"
 #include <algorithm>
+//#include <exception>
 #ifdef DEBUG
 #	include <iostream>
 #endif // DEBUG
@@ -40,22 +41,32 @@ namespace Server {
 
 Command::~Command(void) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": destructor." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": destructor." << endl;
 #endif // DEBUG
 }
 
-Command::Command(const string& target, const string& command):
-		target(target), command(command) {
+Command::Command(const string& _target, const string& _command) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": target = " << target << " | "
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": target = " << target << " | "
 			<< "command = " << command << endl;
 #endif // DEBUG
+	set_target(_target);
+	set_command(_command);
 }
 
 void Command::build(void) {
-	uri = string("/") + target + '/' + command + String::join(args, "/");
+	uri = string("/") + target;
+	if (command.length()) {
+		uri += '/' + command;
+		if (args.size()) {
+			uri += '/' + String::join(args, "/");
+		}
+	}
 #ifdef DEBUG
-	cerr << __FILE__ << ": build() = " << uri << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": build() = " << uri << endl;
 #endif // DEBUG
 }
 
@@ -64,7 +75,7 @@ void Command::set_target(const std::string& _target) {
 	build();
 }
 
-const std::string& Command::get_target(void) {
+const std::string& Command::get_target(void) const {
 	return target;
 }
 
@@ -73,7 +84,7 @@ void Command::set_command(const std::string& _command) {
 	build();
 }
 
-const std::string& Command::get_command(void) {
+const std::string& Command::get_command(void) const {
 	return command;
 }
 
@@ -82,7 +93,7 @@ void Command::set_args(const Command::Arguments& _args) {
 	build();
 }
 
-const Command::Arguments& Command::get_args(void) {
+const Command::Arguments& Command::get_args(void) const {
 	return args;
 }
 
@@ -91,9 +102,21 @@ void Command::add_arg(const std::string& arg) {
 	build();
 }
 
-istream& operator>>(istream& is, Command& command) {
+void Command::add_arg(const unsigned& arg) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": operator>>()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": add_arg(arg = " << arg << ") = "
+		<< String().from(arg) << endl;
+#endif // DEBUG
+	args.push_back(String().from(arg));
+	build();
+}
+
+istream& operator>>(istream& is, Command& command)
+		throw(HTTPError, sockerr, ios::failure) {
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": operator>>()" << endl;
 #endif // DEBUG
 	// Obtengo datos del Request HTTP.
 	is >> static_cast<HTTPRequest&>(command);
@@ -108,8 +131,8 @@ istream& operator>>(istream& is, Command& command) {
 	} else {
 		command.target = "";
 	}
-	if (command.args.size() > 1) {
-		command.command = command.args[1];
+	if (command.args.size() > 0) {
+		command.command = command.args[0];
 		command.args.erase(command.args.begin());
 	} else {
 		command.command = "";
@@ -117,9 +140,10 @@ istream& operator>>(istream& is, Command& command) {
 	return is;
 }
 
-ostream& operator<<(ostream& os, const Command& command) {
+ostream& operator<<(ostream& os, const Command& command) throw (sockerr) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": operator<<()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": operator<<()" << endl;
 #endif // DEBUG
 	// Manda el request HTTP con la URI que representa el comando.
 	os << static_cast<const HTTPRequest&>(command);