filterprocess debug/upload 설정 추가

setup.ini의 [settings] 옵션 하부에
upload=o
debug=x
설정가능
설정은 o,x로 가능함
기본설정은 upload=o, debug=x


git-svn-id: svn://192.168.0.12/source@322 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2016-11-29 07:35:43 +00:00
parent 60f692f641
commit a7ec2f63fd
8 changed files with 70 additions and 31 deletions

View File

@@ -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])
{

View File

@@ -6,13 +6,6 @@
#include <QDebug>
#include <iostream>
using namespace std;
/*
void FilterSearch(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson);
void FilterCounter(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson);
void FilterReplace(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson);
void FilterDate(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson, int _nDateColumn);
void FilterLength(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson);
*/
void SFilterAlgorithm::FilterDate(QVector<QStringList> *m_data, bool *m_bDataFlag, QString _strJson, int _nDateColumn)
{
@@ -40,7 +33,6 @@ void SFilterAlgorithm::FilterDate(QVector<QStringList> *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<QStringList> *m_data, bool *m_bDataFlag, QString _strJson)
@@ -82,7 +74,6 @@ void SFilterAlgorithm::FilterLength(QVector<QStringList> *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<QStringList> *m_data, bool *m_bDataFlag, QString _strJson)
@@ -142,7 +133,6 @@ void SFilterAlgorithm::FilterCounter(QVector<QStringList> *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<QStringList> *m_data, bool *m_bDataFlag, QString _strJson)
@@ -196,7 +186,7 @@ void SFilterAlgorithm::FilterSearch(QVector<QStringList> *m_data, bool *m_bDataF
}
m_vecKeyword.push_back(stKeyword);
}
if (json.GetBool(_strJson,"Last")) //
if (json.GetBool(_strJson,"Last"))
{
QVector <QStringList> copyData;
@@ -246,7 +236,6 @@ void SFilterAlgorithm::FilterSearch(QVector<QStringList> *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();
}
}

View File

@@ -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:

View File

@@ -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])
{

View File

@@ -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)
@@ -567,6 +590,9 @@ bool SInitializer::initColumn()
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,8 +648,9 @@ void SInitializer::insertCategoryLog(const QString& _strMsg) const
cout << "] ";
cout << _strMsg.toStdString() << endl;
*/
QFile file(m_stFilterProcessGroup.m_strFilterProcessGroupName + "_category." + QDate::currentDate().toString(Qt::ISODate)+".log");
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;
@@ -631,6 +658,7 @@ void SInitializer::insertCategoryLog(const QString& _strMsg) const
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;

View File

@@ -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<int, QString> 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;

View File

@@ -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])
{

View File

@@ -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])
{