Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2012-06-06 05:09:33 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:39:30 +0300
commit74a22a60ada2362bc76d7053b52a80346b8590e5 (patch)
tree82f4d0664e5f4c13fcf6dcb85d847f9cd15db8fc /platform/http_request.cpp
parent98efcc314a8b5f1345a58615843f905c4135a39c (diff)
[downloader] Fix issue when url download failed. Use default server urls.
Diffstat (limited to 'platform/http_request.cpp')
-rw-r--r--platform/http_request.cpp33
1 files changed, 5 insertions, 28 deletions
diff --git a/platform/http_request.cpp b/platform/http_request.cpp
index 2ce8fdb720..dd68ee3bf7 100644
--- a/platform/http_request.cpp
+++ b/platform/http_request.cpp
@@ -8,16 +8,12 @@
#include "../base/thread.hpp"
#endif
-#include "../base/std_serialization.hpp"
-#include "../base/logging.hpp"
-
-#include "../coding/file_writer_stream.hpp"
-#include "../coding/file_reader_stream.hpp"
#include "../coding/internal/file_data.hpp"
+#include "../coding/file_writer.hpp"
-#include "../std/scoped_ptr.hpp"
+#include "../base/logging.hpp"
-#include "../3party/jansson/myjansson.hpp"
+#include "../std/scoped_ptr.hpp"
#ifdef OMIM_OS_IPHONE
@@ -169,6 +165,8 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
if (m_onProgress)
m_onProgress(*this);
}
+ else
+ LOG(LWARNING, (m_filePath, "HttpRequest error:", httpCode));
ChunksDownloadStrategy::ResultT const result = StartThreads();
@@ -281,25 +279,4 @@ HttpRequest * HttpRequest::GetFile(vector<string> const & urls, string const & f
return new FileHttpRequest(urls, filePath, fileSize, onFinish, onProgress, chunkSize, doCleanProgressFiles);
}
-bool ParseServerList(string const & jsonStr, vector<string> & outUrls)
-{
- outUrls.clear();
- try
- {
- my::Json root(jsonStr.c_str());
- for (size_t i = 0; i < json_array_size(root); ++i)
- {
- char const * url = json_string_value(json_array_get(root, i));
- if (url)
- outUrls.push_back(url);
- }
- }
- catch (std::exception const & e)
- {
- LOG(LERROR, ("Can't parse server list json", e.what(), jsonStr));
- }
- return !outUrls.empty();
-}
-
-
} // namespace downloader