Merge pull request #46 from Telecominfraproject/dev-2.1

Fixing uploads dir
Telecominfraproject · Aug 26, 2021 · 8172b9c · 8172b9c
2 parents 5ae99dd + a35d3d7
commit 8172b9c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/build b/build
@@ -1 +1 @@
-32
+33
diff --git a/src/FileUploader.cpp b/src/FileUploader.cpp
@@ -42,7 +42,16 @@ namespace OpenWifi {
 
             Logger_.information(l);
 
-            Path_ = Daemon()->ConfigPath("ucentral.fileuploader.path","/tmp");
+			Poco::File UploadsDir(Daemon()->ConfigPath("ucentral.fileuploader.path","/tmp"));
+            Path_ = UploadsDir.path();
+            if(!UploadsDir.exists()) {
+            	try {
+            		UploadsDir.createDirectory();
+            	} catch (const Poco::Exception &E) {
+            		Logger_.log(E);
+					Path_ = "/tmp";
+            	}
+            }
 
             auto Sock{Svr.CreateSecureSocket(Logger_)};
 

diff --git a/src/RESTAPI_handler.cpp b/src/RESTAPI_handler.cpp
@@ -64,9 +64,9 @@ namespace OpenWifi {
 	}
 
 	void RESTAPIHandler::ParseParameters(Poco::Net::HTTPServerRequest &request) {
-
 		Poco::URI uri(request.getURI());
 		Parameters_ = uri.getQueryParameters();
+		InitQueryBlock();
 	}
 
 	static bool is_number(const std::string &s) {
@@ -111,6 +111,26 @@ namespace OpenWifi {
 		return Default;
 	}
 
+	bool RESTAPIHandler::HasParameter(const std::string &Name, std::string &Value) {
+	    for (const auto &i : Parameters_) {
+	        if (i.first == Name) {
+	            Value = i.second;
+	            return true;
+	        }
+	    }
+	    return false;
+	}
+
+	bool RESTAPIHandler::HasParameter(const std::string &Name, uint64_t & Value) {
+	    for (const auto &i : Parameters_) {
+	        if (i.first == Name) {
+	            Value = std::stoi(i.second);
+	            return true;
+	        }
+	    }
+	    return false;
+	}
+
 	const std::string &RESTAPIHandler::GetBinding(const std::string &Name, const std::string &Default) {
 		auto E = Bindings_.find(Poco::toLower(Name));
 		if (E == Bindings_.end())
@@ -365,6 +385,9 @@ namespace OpenWifi {
 	}
 
 	bool RESTAPIHandler::InitQueryBlock() {
+	    if(QueryBlockInitialized_)
+	        return true;
+	    QueryBlockInitialized_=true;
 		QB_.SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
 		QB_.StartDate = GetParameter(RESTAPI::Protocol::STARTDATE, 0);
 		QB_.EndDate = GetParameter(RESTAPI::Protocol::ENDDATE, 0);
@@ -377,7 +400,8 @@ namespace OpenWifi {
 		QB_.LastOnly = GetBoolParameter(RESTAPI::Protocol::LASTONLY,false);
 		QB_.Newest = GetBoolParameter(RESTAPI::Protocol::NEWEST,false);
 
-		if(QB_.Offset<1) return false;
+		if(QB_.Offset<1)
+		    QB_.Offset=1;
 		return true;
 	}
 

diff --git a/src/RESTAPI_handler.h b/src/RESTAPI_handler.h
@@ -146,6 +146,8 @@ namespace OpenWifi {
 		[[nodiscard]] static std::string GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default="");
 		[[nodiscard]] static bool GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default=false);
 		[[nodiscard]] static uint64_t GetWhen(const Poco::JSON::Object::Ptr &Obj);
+		bool HasParameter(const std::string &QueryParameter, std::string &Value);
+		bool HasParameter(const std::string &QueryParameter, uint64_t & Value);
 
 	  protected:
 		BindingMap 					Bindings_;
@@ -156,6 +158,7 @@ namespace OpenWifi {
 		std::vector<std::string> 	Methods_;
 		QueryBlock					QB_;
 		bool                        Internal_=false;
+		bool                        QueryBlockInitialized_=false;
 	};
 
 	class RESTAPI_UnknownRequestHandler : public RESTAPIHandler {