要約入力された値に関して取得し、mapに格納可能になる

ak0327 · Sep 3, 2023 · 63d9aa8 · 63d9aa8
1 parent dac23df
commit 63d9aa8
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 29 deletions.
diff --git a/srcs/includes/BaseKeyValueMap.hpp b/srcs/includes/BaseKeyValueMap.hpp
@@ -12,6 +12,8 @@ class	BaseKeyValueMap
 		BaseKeyValueMap(void);
 		BaseKeyValueMap(const BaseKeyValueMap &other);
 		virtual ~BaseKeyValueMap();
+
+		virtual	void show_value() = 0;
 };
 
 #endif
diff --git a/srcs/includes/HandlingString.hpp b/srcs/includes/HandlingString.hpp
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef HANDLINGSTRING_HPP
+#define HANDLINGSTRING_HPP
 
 #include <string>
 #include <iostream>
@@ -30,3 +31,5 @@ class HandlingString
 		static	std::string					obtain_beforeword(const std::string other, char delimiter);
 		static	std::string					obtain_afterword(const std::string other, char delimiter);
 };
+
+#endif
diff --git a/srcs/includes/HttpRequest.hpp b/srcs/includes/HttpRequest.hpp
@@ -31,8 +31,8 @@ class HttpRequest
 {
 	private:
 		RequestLine	_requestline;
-		std::map<std::string, void(*)()> inputvalue_functionmap;
-		std::map<std::string, BaseKeyValueMap> request_keyvalue_map;
+		std::map<std::string, void(HttpRequest::*)(const std::string&, const std::string&)> inputvalue_functionmap;
+		std::map<std::string, BaseKeyValueMap*> request_keyvalue_map;
 
 		HttpRequest();
 		HttpRequest(const HttpRequest &other);
@@ -41,12 +41,12 @@ class HttpRequest
 		std::string	obtain_request_key(const std::string value);
 		std::string	obtain_request_value(const std::string value);
 
-		TwoValueSet			ready_TwoValueSet(const std::string &value);
-		ValueArraySet		ready_ValueArraySet(const std::string &value);
-		ValueDateSet		ready_ValueDateSet(const std::string &value);
-		ValueMap			ready_ValueMap(const std::string &value);
-		ValueSet			ready_ValueSet(const std::string &value);
-		ValueWeightArraySet	ready_ValueWeightArraySet(const std::string &value);
+		TwoValueSet			*ready_TwoValueSet(const std::string &value);
+		ValueArraySet		*ready_ValueArraySet(const std::string &value);
+		ValueDateSet		*ready_ValueDateSet(const std::string &value);
+		ValueMap			*ready_ValueMap(const std::string &value);
+		ValueSet			*ready_ValueSet(const std::string &value);
+		ValueWeightArraySet	*ready_ValueWeightArraySet(const std::string &value);
 		void				ready_functionmap(void);
 
 	public:
@@ -75,7 +75,7 @@ class HttpRequest
 		void	set_allow(const std::string &key,const std::string &value);
 		void	set_alt_svc(const std::string &key,const std::string &value);
 		void	set_alt_used(const std::string &key,const std::string &value);
-		void	set_authorization(const std::string &value);
+		void	set_authorization(const std::string &key, const std::string &value);
 		// void	set//か全くわからない うまく分けられん
 		void	set_clear_site_data(const std::string &key,const std::string &value);
 		void	set_connection(const std::string &key,const std::string &value);
@@ -144,9 +144,7 @@ class HttpRequest
 		void	set_x_xss_protection(const std::string &key,const std::string &value);
 
 		//debug関数
-		void show_requestinfs(void) const;
+		void show_requestinfs(void);
 };
 
-#include "../HttpRequest/HttpRequest.cpp"
-
 #endif
diff --git a/srcs/includes/TwoValueSet.hpp b/srcs/includes/TwoValueSet.hpp
@@ -10,8 +10,6 @@ class TwoValueSet: public BaseKeyValueMap
 	private:
 		std::string _firstvalue;
 		std::string _secondValue;
-
-		TwoValueSet& operator=(const TwoValueSet &other);
 
 	public:
 		TwoValueSet();
@@ -23,7 +21,7 @@ class TwoValueSet: public BaseKeyValueMap
 		std::string get_firstvalue(void) const;
 		std::string get_secondvalue(void) const;
 
-		void	show_allvalue(void) const;
+		void show_value(void);
 };
 
 #endif
diff --git a/srcs/includes/ValueArraySet.hpp b/srcs/includes/ValueArraySet.hpp
@@ -15,13 +15,13 @@ class ValueArraySet: public BaseKeyValueMap
 	public:
 		ValueArraySet();
 		ValueArraySet(const ValueArraySet &other);
-		ValueArraySet(const std::vector<std::string> value_array);
+		ValueArraySet(const std::vector<std::string> &value_array);
 		ValueArraySet &operator=(const ValueArraySet &other);
 		~ValueArraySet();
 
 		std::vector<std::string>	get_value_array(void) const;
 
-		void						show_value_array_set(void);
+		void				show_value(void);
 };
 
 #endif
diff --git a/srcs/includes/ValueDateSet.hpp b/srcs/includes/ValueDateSet.hpp
@@ -2,6 +2,8 @@
 #define VALUEDATESET_HPP
 
 #include <string>
+#include <iostream>
+#include <sstream>
 
 #include "BaseKeyValueMap.hpp"
 
@@ -16,24 +18,22 @@ class ValueDateSet: public BaseKeyValueMap
 		std::string _minute;
 		std::string _second;
 
-		ValueDateSet();
-		ValueDateSet(const ValueDateSet &other);
-		ValueDateSet& operator=(const ValueDateSet &other);
-
 	public:
 		ValueDateSet();
 		ValueDateSet(const ValueDateSet &other);
 		ValueDateSet& operator=(const ValueDateSet &other);
 		ValueDateSet(const std::string &date_format);
 		~ValueDateSet();
 
-		std::string get_valuedateset_day_name();
-		std::string get_valuedateset_day();
-		std::string get_valuedateset_month();
-		std::string get_valuedateset_year();
-		std::string get_valuedateset_hour();
-		std::string get_valuedateset_minute();
-		std::string get_valuedateset_second();
+		std::string get_valuedateset_day_name() const;
+		std::string get_valuedateset_day() const;
+		std::string get_valuedateset_month() const;
+		std::string get_valuedateset_year() const;
+		std::string get_valuedateset_hour() const;
+		std::string get_valuedateset_minute() const;
+		std::string get_valuedateset_second() const;
+
+		void show_value();
 };
 
 #endif
diff --git a/srcs/includes/ValueMap.hpp b/srcs/includes/ValueMap.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <iostream>
 
 #include "BaseKeyValueMap.hpp"
 
@@ -25,6 +26,8 @@ class ValueMap: public BaseKeyValueMap
 
 		std::string							get_only_value(void) const;
 		std::map<std::string, std::string>	get_value_map(void) const;
+
+		void show_value();
 };
 
 #endif
diff --git a/srcs/includes/ValueSet.hpp b/srcs/includes/ValueSet.hpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+#include <iostream>
 
 #include "BaseKeyValueMap.hpp"
 
@@ -19,6 +20,8 @@ class ValueSet: public BaseKeyValueMap
 		~ValueSet();
 
 		std::string get_value_set(void) const;
+
+		void show_value();
 };
 
 #endif
diff --git a/srcs/includes/ValueWeightArraySet.hpp b/srcs/includes/ValueWeightArraySet.hpp
@@ -20,6 +20,8 @@ class ValueWeightArraySet: public BaseKeyValueMap
 		~ValueWeightArraySet();
 
 		std::map<std::string, double> get_valueweight_set(void) const;
+
+		void show_value();
 };
 
 #endif