King_DuckZ/duckscraper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update libtidy and curlcpp.

Browse source
This commit is contained in:
King_DuckZ 2015-09-28 15:30:09 +02:00
parent 44992458ac
commit 4f85fa01a9
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -38,7 +38,7 @@ add_executable(${PROJECT_NAME}
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
lib-tidy tidy-share
${PUGIXML_LIBRARIES} ${PUGIXML_LIBRARIES}
curlcpp curlcpp
) )

2
lib/curlcpp

@ -1 +1 @@
Subproject commit 05bad3db527ee3c76730d42104ddaaa8a6376a3f Subproject commit 194fdb0ced92a993a60cd0810610845a12023e82

2
lib/tidy

@ -1 +1 @@
Subproject commit 2e383c602957245ff4bc566d1760b525924234cb Subproject commit fa43957b6d2afd62c12ab507794f9053ea08557b

18
src/htmlretrieve.cpp
View file

@ -2,7 +2,7 @@
#include "duckscraperConfig.h" #include "duckscraperConfig.h"
#include <ciso646> #include <ciso646>
#include <tidy.h> #include <tidy.h>
#include <buffio.h> #include <tidybuffio.h>
#include <sstream> #include <sstream>
#include <curl_easy.h> #include <curl_easy.h>
#include <cstring> #include <cstring>
@ -83,15 +83,19 @@ namespace duck {
} //unnamed namespace } //unnamed namespace
std::string getCleanHtml (const std::string& parSource, const std::string& parUserAgent, bool parSslVerifyPeer, bool parSslVerifyHost) { std::string getCleanHtml (const std::string& parSource, const std::string& parUserAgent, bool parSslVerifyPeer, bool parSslVerifyHost) {
using curl::curl_easy;
using curl::curl_pair;
std::ostringstream oss; std::ostringstream oss;
curl::curl_easy easy(oss); curl_writer wr(oss);
easy.add(curl::curl_pair<CURLoption, std::string>(CURLOPT_URL, parSource)); curl_easy easy(wr);
easy.add(curl_pair<CURLoption, std::string>(CURLOPT_URL, parSource));
if (isHttps(parSource)) { if (isHttps(parSource)) {
easy.add(curl::curl_pair<CURLoption, bool>(CURLOPT_SSL_VERIFYPEER, parSslVerifyPeer)); easy.add(curl_pair<CURLoption, bool>(CURLOPT_SSL_VERIFYPEER, parSslVerifyPeer));
easy.add(curl::curl_pair<CURLoption, bool>(CURLOPT_SSL_VERIFYHOST, parSslVerifyHost)); easy.add(curl_pair<CURLoption, bool>(CURLOPT_SSL_VERIFYHOST, parSslVerifyHost));
} }
easy.add(curl::curl_pair<CURLoption, std::string>(CURLOPT_USERAGENT, parUserAgent)); easy.add(curl_pair<CURLoption, std::string>(CURLOPT_USERAGENT, parUserAgent));
easy.add(curl::curl_pair<CURLoption, long>(CURLOPT_FOLLOWLOCATION, 1L)); easy.add(curl_pair<CURLoption, long>(CURLOPT_FOLLOWLOCATION, 1L));
//try { //try {
easy.perform(); easy.perform();