diff options
| -rw-r--r-- | src/MySock.cpp | 6 | ||||
| -rw-r--r-- | src/MySock.h | 1 | ||||
| -rw-r--r-- | src/Team Git Repository | 0 | ||||
| -rw-r--r-- | src/basic | 0 | ||||
| -rw-r--r-- | src/localtemp.cpp | 9 | ||||
| -rw-r--r-- | src/localtemp.h | 1 | ||||
| -rw-r--r-- | src/valid-user | 0 |
7 files changed, 10 insertions, 7 deletions
diff --git a/src/MySock.cpp b/src/MySock.cpp index 6f73517..d998d4c 100644 --- a/src/MySock.cpp +++ b/src/MySock.cpp @@ -126,11 +126,11 @@ MySock::MySock(string uri) } else if (protostr=="https") { - if(this->safe_url(uri)) + if(this->is_safe_url(uri)) { - this->https_url=url; + this->https_uri=uri; this->use_external_fetch=true; - this->connection; + this->connected=true; } } else diff --git a/src/MySock.h b/src/MySock.h index 4001429..a2066a5 100644 --- a/src/MySock.h +++ b/src/MySock.h @@ -61,6 +61,7 @@ private: string https_uri; void MakeConnection (string server, int port); + bool is_safe_url(const string &url); HTTP_Request *GetHTTPDataViaExternalFetch(); }; diff --git a/src/Team Git Repository b/src/Team Git Repository new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/Team Git Repository diff --git a/src/basic b/src/basic new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/basic diff --git a/src/localtemp.cpp b/src/localtemp.cpp index e6a5c2b..7f20dc7 100644 --- a/src/localtemp.cpp +++ b/src/localtemp.cpp @@ -127,12 +127,13 @@ void localtemp::get_ob_info(double precip10m) { mInfo.CB=false; mInfo.fog=undef_fog; // Not reported by Amedas + if (precip10m>0.0) { - if (this->celsius<=2) - mInfo.rain=snow; - else - mInfo.rain=rain; + if (this->celsius<=2) + mInfo.rain=snow; + else + mInfo.rain=rain; mInfo.sky=undef_sky; } else diff --git a/src/localtemp.h b/src/localtemp.h index b4bbe0e..2d20e52 100644 --- a/src/localtemp.h +++ b/src/localtemp.h @@ -14,6 +14,7 @@ class localtemp { public: enum ESky { + undef_sky, clear, // Fine weather (no precipitation reported) cloudy, // Reserved (not reported by Amedas) brkovc, // Reserved (not reported by Amedas) diff --git a/src/valid-user b/src/valid-user new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/valid-user |