From 870c3dd4f055437ed3f31c29f84d7f3636a2eb6f Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 26 May 2016 06:36:50 +0000 Subject: [PATCH] git-svn-id: svn://192.168.0.12/source@267 8346c931-da38-4b9b-9d4c-e48b93cbd075 --- CrawlerList/sdaumcafemanage.cpp | 2 +- CrawlerList/snaverblogaccuracymanager.cpp | 38 +++++++++++++++++------ CrawlerList/snaverblogmanage.cpp | 15 ++++----- CrawlerList/snavernewsmanage.cpp | 2 +- 4 files changed, 38 insertions(+), 19 deletions(-) diff --git a/CrawlerList/sdaumcafemanage.cpp b/CrawlerList/sdaumcafemanage.cpp index 1749853..889e358 100644 --- a/CrawlerList/sdaumcafemanage.cpp +++ b/CrawlerList/sdaumcafemanage.cpp @@ -84,7 +84,7 @@ bool SDaumCafeManage::Update() case E_PROCESS_LIST_FINISH_WAIT: case E_PROCESS_URL_FINISH_WAIT: m_nWait++; - if (m_nWait >= 300) + if (m_nWait >= 180) { //for(int i = 0; i < C_PROCESS_MAX ; i++) { diff --git a/CrawlerList/snaverblogaccuracymanager.cpp b/CrawlerList/snaverblogaccuracymanager.cpp index 72fbbda..a0e950d 100644 --- a/CrawlerList/snaverblogaccuracymanager.cpp +++ b/CrawlerList/snaverblogaccuracymanager.cpp @@ -34,9 +34,13 @@ QString SNaverBlogAccuracyManage::makeGetListQuery(QString _str,QDate _date) str += strDate + "to" + strDate +"&ie=utf8&start="; str += QString::number(m_ncList); */ + + //http://cafeblog.search.naver.com/search.naver?where=post&sm=tab_pge&query=%EC%9E%84%EC%8B%A0+%7C+%ED%83%9C%EA%B5%90&st=sim&date_option=6&date_from=20050520&date_to=20160218&dup_remove=1&post_blogurl=&post_blogurl_without=&srchby=all&nso=so%3Add%2Cp%3Afrom20050520to20160218&ie=utf8&start=71 + //https://search.naver.com/search.naver?where=post&sm=tab_pge&query=%EC%84%B1%ED%98%95&st=sim&date_option=6&date_from=20030520&date_to=20160512&dup_remove=1&post_blogurl=&post_blogurl_without=&srchby=all&nso=p%3Afrom20030520to20160512&ie=utf8&start=11 - //str = "https://search.naver.com/search.naver?where=post&sm=tab_pge&query="; - str += "http://cafeblog.search.naver.com/search.naver?where=post&sm=tab_pge&query="; +/* + str = "https://search.naver.com/search.naver?where=post&sm=tab_pge&query="; + //str += "http://cafeblog.search.naver.com/search.naver?where=post&sm=tab_pge&query="; str += EncodetoUtf8(_str,true); str += "&st=sim&date_option=6&date_from=20030520&date_to="; str += strDate; @@ -45,6 +49,18 @@ QString SNaverBlogAccuracyManage::makeGetListQuery(QString _str,QDate _date) str += "&post_blogurl_without=&srchby=all&nso=p%3Afrom20030520to"; str += strDate + "&ie=utf8&start="; str += QString::number(m_ncList); +*/ + + str = "http://cafeblog.search.naver.com/search.naver?where=post&sm=tab_pge&query="; + //str += "http://cafeblog.search.naver.com/search.naver?where=post&sm=tab_pge&query="; + str += EncodetoUtf8(_str, true); + str += "&st=sim&date_option=6&date_from=20050520&date_to="; + str += strDate; + str += "&dup_remove=1&post_blogurl="; + str += m_strAuthorship; + str += "&post_blogurl_without=&srchby=all&nso=so%3Add%2Cp%3Afrom20050520to"; + str += strDate + "&ie=utf8&start="; + str += QString::number(m_ncList); return str; } @@ -97,12 +113,6 @@ void SNaverBlogAccuracyManage::processFinished(QProcess *pPro,QString _strOut) if (_strOut.right(4) == "last" || m_ncList >= 991 ) m_bLast = true; - if (m_bLast == false && m_nUntilPage > 0) - { - if ((m_ncList/10) >= m_nUntilPage) - m_bLast = true; - } - if (_strOut.right(5) == "block") { reloaded = true; @@ -132,6 +142,15 @@ void SNaverBlogAccuracyManage::processFinished(QProcess *pPro,QString _strOut) ReLoadList(); } } + + + if (m_bLast == false && m_nUntilPage > 0) + { + if ((m_ncList/10) >= m_nUntilPage) + m_bLast = true; + } + + m_strListURL.clear(); foreach(QString str,_strOut.split("\n")) { @@ -224,7 +243,7 @@ bool SNaverBlogAccuracyManage::Update() case E_PROCESS_URL_FINISH_WAIT: case E_PROCESS_COMMENT_FINISH_WAIT: m_nWait++; - if (m_nWait >=300) + if (m_nWait >= 180) { { { @@ -246,5 +265,4 @@ void SNaverBlogAccuracyManage::ReLoadList() if(m_ncList < 0) m_ncList = 1; m_pMain->InsertLog("Reload List"); - } diff --git a/CrawlerList/snaverblogmanage.cpp b/CrawlerList/snaverblogmanage.cpp index c2af4cf..b1ace47 100644 --- a/CrawlerList/snaverblogmanage.cpp +++ b/CrawlerList/snaverblogmanage.cpp @@ -100,12 +100,6 @@ void SNaverBlogManage::processFinished(QProcess *pPro,QString _strOut) if (_strOut.right(4) == "last" || m_ncList >= 991 ) m_bLast = true; - if (m_bLast == false && m_nUntilPage > 0) - { - if ((m_ncList/10) >= m_nUntilPage) - m_bLast = true; - } - if (_strOut.right(5) == "block") { reloaded = true; @@ -135,6 +129,13 @@ void SNaverBlogManage::processFinished(QProcess *pPro,QString _strOut) ReLoadList(); } } + + if (m_bLast == false && m_nUntilPage > 0) + { + if ((m_ncList/10) >= m_nUntilPage) + m_bLast = true; + } + m_strListURL.clear(); foreach(QString str,_strOut.split("\n")) { @@ -227,7 +228,7 @@ bool SNaverBlogManage::Update() case E_PROCESS_URL_FINISH_WAIT: case E_PROCESS_COMMENT_FINISH_WAIT: m_nWait++; - if (m_nWait >=300) + if (m_nWait >= 180) { { { diff --git a/CrawlerList/snavernewsmanage.cpp b/CrawlerList/snavernewsmanage.cpp index 1030471..0fd0c92 100644 --- a/CrawlerList/snavernewsmanage.cpp +++ b/CrawlerList/snavernewsmanage.cpp @@ -84,7 +84,7 @@ bool SNaverNewsManage::Update() case E_PROCESS_URL_FINISH_WAIT: case E_PROCESS_COMMENT_FINISH_WAIT: m_nWait++; - if (m_nWait >= 300) + if (m_nWait >= 180) { m_pMain->InsertLog("Kill Process."); m_pro[0].kill();