diff --git a/FilterProcess/sconsumer.cpp b/FilterProcess/sconsumer.cpp index d0dac95..753c3b5 100644 --- a/FilterProcess/sconsumer.cpp +++ b/FilterProcess/sconsumer.cpp @@ -48,7 +48,7 @@ bool SConsumer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QList for (int i = 0; i < SInitializer::E_ARTICLE_MAX; i++) bFiltered[i] = false; _datagroup.copyData(vecData); - m_pSInitializer->insertCategoryLog(QString("Consumer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); + m_pSInitializer->insertDebugLog(QString("Consumer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); foreach (const SInitializer::stFilter& filter, _listFilter) { switch(filter.m_nType) @@ -72,7 +72,7 @@ bool SConsumer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QList m_SFilterAlgorithm.FilterCounter(vecData, bFiltered, filter.m_vData.toString()); break; } - m_pSInitializer->insertCategoryLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + + m_pSInitializer->insertDebugLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + "Reply: " + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ", " + SService::convertJsonToStr(filter.m_nType, filter.m_vData.toString())); @@ -81,6 +81,9 @@ bool SConsumer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QList stReal streal; m_pSInitializer->insertLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(""); const int *anColumn = m_pSInitializer->getColumnIntArray(); if (bFiltered[SInitializer::E_ARTICLE_BODY]) { diff --git a/FilterProcess/sfilteralgorithm.cpp b/FilterProcess/sfilteralgorithm.cpp index 8191c14..10ec78b 100644 --- a/FilterProcess/sfilteralgorithm.cpp +++ b/FilterProcess/sfilteralgorithm.cpp @@ -6,13 +6,6 @@ #include #include using namespace std; -/* -void FilterSearch(QVector *m_data, bool *m_bDataFlag, QString _strJson); -void FilterCounter(QVector *m_data, bool *m_bDataFlag, QString _strJson); -void FilterReplace(QVector *m_data, bool *m_bDataFlag, QString _strJson); -void FilterDate(QVector *m_data, bool *m_bDataFlag, QString _strJson, int _nDateColumn); -void FilterLength(QVector *m_data, bool *m_bDataFlag, QString _strJson); -*/ void SFilterAlgorithm::FilterDate(QVector *m_data, bool *m_bDataFlag, QString _strJson, int _nDateColumn) { @@ -40,7 +33,6 @@ void SFilterAlgorithm::FilterDate(QVector *m_data, bool *m_bDataFla } m_data[nSelect].clear(); m_data[nSelect] = copyData; - //cout << ((nSelect == 0) ? "body" : "reply") << ":" << m_data[nSelect].size() << endl; } void SFilterAlgorithm::FilterLength(QVector *m_data, bool *m_bDataFlag, QString _strJson) @@ -82,7 +74,6 @@ void SFilterAlgorithm::FilterLength(QVector *m_data, bool *m_bDataF m_data[nSelect].clear(); m_data[nSelect] = copyData; - //cout << ((nSelect == 0) ? "body" : "reply") << ":" << m_data[nSelect].size() << endl; } void SFilterAlgorithm::FilterCounter(QVector *m_data, bool *m_bDataFlag, QString _strJson) @@ -142,7 +133,6 @@ void SFilterAlgorithm::FilterCounter(QVector *m_data, bool *m_bData m_data[nSelect].clear(); m_data[nSelect] = copyData; - //cout << ((nSelect == 0) ? "body" : "reply") << ":" << m_data[nSelect].size() << endl; } void SFilterAlgorithm::FilterReplace(QVector *m_data, bool *m_bDataFlag, QString _strJson) @@ -196,7 +186,7 @@ void SFilterAlgorithm::FilterSearch(QVector *m_data, bool *m_bDataF } m_vecKeyword.push_back(stKeyword); } - if (json.GetBool(_strJson,"Last")) // + if (json.GetBool(_strJson,"Last")) { QVector copyData; @@ -246,7 +236,6 @@ void SFilterAlgorithm::FilterSearch(QVector *m_data, bool *m_bDataF } m_data[nSelect].clear(); m_data[nSelect] = copyData; - //cout << ((nSelect == 0) ? "body" : "reply") << ":" << m_data[nSelect].size() << endl; m_vecKeyword.clear(); } } diff --git a/FilterProcess/sfilterprocess.cpp b/FilterProcess/sfilterprocess.cpp index dab8edb..75f7918 100644 --- a/FilterProcess/sfilterprocess.cpp +++ b/FilterProcess/sfilterprocess.cpp @@ -41,7 +41,7 @@ bool SFilterProcess::run() } case E_PROCSS_TYPE_CATEGORY_MAKE: { - m_SInitializer.insertCategoryLog("FilterGroupName: " + process.m_strFilterGroupName); + m_SInitializer.insertDebugLog("FilterGroupName: " + process.m_strFilterGroupName); switch(process.m_nServiceNum) { case E_SERVICE_INFLUENCER: diff --git a/FilterProcess/sinfluencer.cpp b/FilterProcess/sinfluencer.cpp index d25bcea..de61fa4 100644 --- a/FilterProcess/sinfluencer.cpp +++ b/FilterProcess/sinfluencer.cpp @@ -99,7 +99,7 @@ bool SInfluencer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QLi for (int i = 0; i < SInitializer::E_ARTICLE_MAX; i++) bFiltered[i] = false; _datagroup.copyData(vecData); - m_pSInitializer->insertCategoryLog(QString("Influencer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); + m_pSInitializer->insertDebugLog(QString("Influencer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); foreach (SInitializer::stFilter filter, _listFilter) { switch(filter.m_nType) @@ -123,13 +123,16 @@ bool SInfluencer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QLi m_SFilterAlgorithm.FilterCounter(vecData, bFiltered, filter.m_vData.toString()); break; } - m_pSInitializer->insertCategoryLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + + m_pSInitializer->insertDebugLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + "Reply: " + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ", " + SService::convertJsonToStr(filter.m_nType, filter.m_vData.toString())); } stReal streal; m_pSInitializer->insertLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(""); const int *anColumn = m_pSInitializer->getColumnIntArray(); if (bFiltered[SInitializer::E_ARTICLE_BODY]) { diff --git a/FilterProcess/sinitializer.cpp b/FilterProcess/sinitializer.cpp index 8de7fdc..29da416 100644 --- a/FilterProcess/sinitializer.cpp +++ b/FilterProcess/sinitializer.cpp @@ -247,6 +247,28 @@ bool SInitializer::initDBConnection() return true; } +bool SInitializer::initDebug() +{ + QSettings settings(QString("setup.ini"), QSettings::IniFormat); + settings.setIniCodec("UTF-8"); + settings.beginGroup(QString("settings")); + + if (settings.childKeys().size() == 0) + { + m_bDebug = false; + return true; + } + + QString strOk = settings.value("debug", "x").toString().trimmed(); + if (strOk.startsWith('o', Qt::CaseInsensitive)) + m_bDebug = true; + else + m_bDebug = false; + settings.endGroup(); + return true; + +} + bool SInitializer::init(const QString& _strFilterProcessGroupID, const QString& _strFilterProcessGroupName) { m_stFilterProcessGroup.m_nFilterProcessGroupID = _strFilterProcessGroupID.toInt(); @@ -267,6 +289,7 @@ bool SInitializer::init(const QString& _strFilterProcessGroupID, const QString& b_ok &= initConsumerMarketer(); b_ok &= initConsumerCheckList(); b_ok &= initUpload(); + b_ok &= initDebug(); /* if (!b_ok) @@ -564,9 +587,12 @@ bool SInitializer::initColumn() } if (vecColumn.size() <= 0) return false; - foreach (const QStringList& strList,vecColumn) + foreach (const QStringList& strList, vecColumn) m_stColumn.m_slColumn.push_back(strList.at(E_COLUMN_DATABASE)); + foreach (const QStringList& strList, vecColumn) + m_stColumn.m_slColumnName.push_back(strList.at(E_COLUMN_NAME)); + for (QStringList::size_type i = 0; i < m_stColumn.m_slColumn.size(); i++) { if (m_stColumn.m_slColumn[i].trimmed() == QString("platform_title")) m_stColumn.m_anColumn[E_DATA_platform_title] = i; @@ -614,7 +640,7 @@ void SInitializer::insertLog(const QString& _strMsg) const file.close(); } -void SInitializer::insertCategoryLog(const QString& _strMsg) const +void SInitializer::insertDebugLog(const QString& _strMsg) const { /* cout << "["; @@ -622,14 +648,16 @@ void SInitializer::insertCategoryLog(const QString& _strMsg) const cout << "] "; cout << _strMsg.toStdString() << endl; */ + if (m_bDebug) + { + QFile file(m_stFilterProcessGroup.m_strFilterProcessGroupName + "_debug." + QDate::currentDate().toString(Qt::ISODate)+".log"); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) + return; - QFile file(m_stFilterProcessGroup.m_strFilterProcessGroupName + "_category." + QDate::currentDate().toString(Qt::ISODate)+".log"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) - return; - - QTextStream out(&file); - out << QTime::currentTime().toString("[hh:mm:ss] ") << _strMsg << "\n"; - file.close(); + QTextStream out(&file); + out << QTime::currentTime().toString("[hh:mm:ss] ") << _strMsg << "\n"; + file.close(); + } } QSqlDatabase SInitializer::getDatabase(const QString& _dbName) const @@ -647,6 +675,11 @@ QStringList SInitializer::getColumnStringList() const return m_stColumn.m_slColumn; } +QStringList SInitializer::getColumnNameStringList() const +{ + return m_stColumn.m_slColumnName; +} + QString SInitializer::getStartDay() const { return m_strStartDay; diff --git a/FilterProcess/sinitializer.h b/FilterProcess/sinitializer.h index dbd16e4..18eaf04 100644 --- a/FilterProcess/sinitializer.h +++ b/FilterProcess/sinitializer.h @@ -32,6 +32,7 @@ private: bool initConsumerMarketer(); bool initConsumerCheckList(); bool initUpload(); + bool initDebug(); public: @@ -129,6 +130,7 @@ public: struct stColumn { QStringList m_slColumn; + QStringList m_slColumnName; int m_anColumn[E_DATA_MAX]; stColumn() { @@ -192,15 +194,18 @@ private: QMap m_mapConsumerCheckListUser; QStringList m_slConsumerCheckList; bool m_bUpload; + bool m_bDebug; public: bool init(const QString& _strFilterProcessGroupID, const QString& _strFilterProcessGroupName); void insertLog(const QString& _strMsg) const; - void insertCategoryLog(const QString& _strMsg) const; + void insertDebugLog(const QString& _strMsg) const; QSqlDatabase getDatabase(const QString& _dbName) const; QSqlDatabase getDatabase(const SDBManager::E_DATABASE& _eDatabase) const; int getDataGroupNumber() const; QStringList getColumnStringList() const; + QStringList getColumnNameStringList() const; + QString getStartDay() const; QString getEndDay() const; const int* getColumnIntArray() const; diff --git a/FilterProcess/spowercafe.cpp b/FilterProcess/spowercafe.cpp index b8cc5db..d6378de 100644 --- a/FilterProcess/spowercafe.cpp +++ b/FilterProcess/spowercafe.cpp @@ -100,7 +100,7 @@ bool SPowercafe::makeCategory(SDatagroup &_datagroup, int _nCategory, const QLis for (int i = 0; i < SInitializer::E_ARTICLE_MAX; i++) bFiltered[i] = false; _datagroup.copyData(vecData); - m_pSInitializer->insertCategoryLog(QString("PowerCafe Category: ") + m_pSInitializer->getCategoryName(_nCategory)); + m_pSInitializer->insertDebugLog(QString("PowerCafe Category: ") + m_pSInitializer->getCategoryName(_nCategory)); foreach (const SInitializer::stFilter& filter, _listFilter) { switch(filter.m_nType) @@ -124,13 +124,16 @@ bool SPowercafe::makeCategory(SDatagroup &_datagroup, int _nCategory, const QLis m_SFilterAlgorithm.FilterCounter(vecData, bFiltered, filter.m_vData.toString()); break; } - m_pSInitializer->insertCategoryLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + + m_pSInitializer->insertDebugLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + "Reply: " + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ", " + SService::convertJsonToStr(filter.m_nType, filter.m_vData.toString())); } stReal streal; m_pSInitializer->insertLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(""); const int *anColumn = m_pSInitializer->getColumnIntArray(); if (bFiltered[SInitializer::E_ARTICLE_BODY]) { diff --git a/FilterProcess/sspammer.cpp b/FilterProcess/sspammer.cpp index b0f9cf9..767e304 100644 --- a/FilterProcess/sspammer.cpp +++ b/FilterProcess/sspammer.cpp @@ -93,7 +93,7 @@ bool SSpammer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QList< for (int i = 0; i < SInitializer::E_ARTICLE_MAX; i++) bFiltered[i] = false; _datagroup.copyData(vecData); - m_pSInitializer->insertCategoryLog(QString("Spammer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); + m_pSInitializer->insertDebugLog(QString("Spammer Category: ") + m_pSInitializer->getCategoryName(_nCategory)); foreach (const SInitializer::stFilter& filter, _listFilter) { switch(filter.m_nType) @@ -117,13 +117,16 @@ bool SSpammer::makeCategory(SDatagroup &_datagroup, int _nCategory, const QList< m_SFilterAlgorithm.FilterCounter(vecData, bFiltered, filter.m_vData.toString()); break; } - m_pSInitializer->insertCategoryLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + + m_pSInitializer->insertDebugLog("Body: " + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + ", " + "Reply: " + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ", " + SService::convertJsonToStr(filter.m_nType, filter.m_vData.toString())); } stReal streal; m_pSInitializer->insertLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(QString("Category:") + m_pSInitializer->getCategoryName(_nCategory) + ",(" + + QString::number(vecData[SInitializer::E_ARTICLE_BODY].size()) + '/' + QString::number(vecData[SInitializer::E_ARTICLE_REPLY].size()) + ")" + "(Body/Reply)" ); + m_pSInitializer->insertDebugLog(""); const int *anColumn = m_pSInitializer->getColumnIntArray(); if (bFiltered[SInitializer::E_ARTICLE_BODY]) {