etc/clients
1
0
Fork 0
Code Issues Pull Requests Releases Activity

sns 처리 수정

Browse Source 
filter 처리 수정 

git-svn-id: svn://192.168.0.12/source@315 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2016-11-18 10:07:36 +00:00
parent 4e6aead7b3
commit f7c4ad21b9
14 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EffectProcess/EffectProcess.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.1.0, 2016-11-10T17:35:06. --> <!-- Written by QtCreator 4.1.0, 2016-11-17T12:13:33. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

7
EffectProcess/sresultsender.cpp
View File

@@ -85,12 +85,12 @@ bool SResultSender::send(const State_s1_effect& _result)
QString strQuery = QString strQuery =
"insert into stats_s1_effect (" "insert into stats_s1_effect ("
"event_num,replybuzz,replycount,likecount,interactioncount,engagementcount) " "event_num,replybuzz,replycount,likecount,interactioncount,engagementcount,lastupdate_filter) "
"values " "values "
"(:event_num,:replybuzz,:replycount,:likecount,:interactioncount,:engagementcount) " "(:event_num,:replybuzz,:replycount,:likecount,:interactioncount,:engagementcount,:lastupdate_filter) "
"on duplicate key update replybuzz = :replybuzz, replycount = :replycount," "on duplicate key update replybuzz = :replybuzz, replycount = :replycount,"
"likecount = :likecount, interactioncount = :interactioncount," "likecount = :likecount, interactioncount = :interactioncount,"
"engagementcount = :engagementcount"; "engagementcount = :engagementcount, lastupdate_filter = :lastupdate_filter";
QSqlQuery query(db); QSqlQuery query(db);
query.prepare(strQuery); query.prepare(strQuery);
@@ -100,6 +100,7 @@ bool SResultSender::send(const State_s1_effect& _result)
query.bindValue(":likecount", _result.likecount); query.bindValue(":likecount", _result.likecount);
query.bindValue(":interactioncount", _result.interactioncount); query.bindValue(":interactioncount", _result.interactioncount);
query.bindValue(":engagementcount", _result.engagementcount); query.bindValue(":engagementcount", _result.engagementcount);
query.bindValue(":lastupdate_filter", QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
if (!query.exec()) if (!query.exec())
{ {

6
EffectUI/EffectUI.pro
View File

@@ -26,7 +26,8 @@ SOURCES += main.cpp\
serrorprocess.cpp \ serrorprocess.cpp \
srunningprocess.cpp \ srunningprocess.cpp \
slogwidget.cpp \ slogwidget.cpp \
seffectlogic.cpp seffectlogic.cpp \
serrorsender.cpp
HEADERS += widget.h \ HEADERS += widget.h \
scompanylistwidget.h \ scompanylistwidget.h \
@@ -40,6 +41,7 @@ HEADERS += widget.h \
serrorprocess.h \ serrorprocess.h \
srunningprocess.h \ srunningprocess.h \
slogwidget.h \ slogwidget.h \
seffectlogic.h seffectlogic.h \
serrorsender.h
FORMS += widget.ui FORMS += widget.ui

2
EffectUI/EffectUI.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.1.0, 2016-11-08T19:00:35. --> <!-- Written by QtCreator 4.1.0, 2016-11-17T12:13:33. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

1
EffectUI/seffectlogic.cpp
View File

@@ -276,4 +276,3 @@ void SEffectLogic::slotTerminateNormal(const QVector<SEffectRow>& _error,
m_pSLogWidget->writeLog("Complete"); m_pSLogWidget->writeLog("Complete");
} }
} }

4
EffectUI/sparentprocess.cpp
View File

@@ -33,7 +33,7 @@ const QString FACEBOOK = "www.facebook.com/";
SParentProcess::SParentProcess():m_pProcess(new QProcess(this)), m_bRunning(false), nTime(0), SParentProcess::SParentProcess():m_pProcess(new QProcess(this)), m_bRunning(false), nTime(0),
m_bUserAbort(false), m_eInnerMode(E_INNER_RUN_MODE::MODE_WAIT) m_bUserAbort(false), m_eInnerMode(E_INNER_RUN_MODE::MODE_WAIT), m_pErrorSender(new SErrorSender(this))
{ {
QObject::connect(m_pProcess, SIGNAL(finished(int, QProcess::ExitStatus)), QObject::connect(m_pProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(finishedProcess(int, QProcess::ExitStatus))); this, SLOT(finishedProcess(int, QProcess::ExitStatus)));
@@ -267,6 +267,7 @@ void SParentProcess::finishedProcess(QProcess::ProcessError _error)
m_mapReportSummary.insert(analyzedResult.company_num, SReportSummary()); m_mapReportSummary.insert(analyzedResult.company_num, SReportSummary());
m_mapReportSummary[analyzedResult.company_num].nError++; m_mapReportSummary[analyzedResult.company_num].nError++;
m_vecError.append(m_erCurrentRow); m_vecError.append(m_erCurrentRow);
m_pErrorSender->send(analyzedResult);
} }
emit signalLog(strLog); emit signalLog(strLog);
@@ -303,6 +304,7 @@ void SParentProcess::finishedProcess(int exitCode, QProcess::ExitStatus exitStat
m_mapReportSummary.insert(analyzedResult.company_num, SReportSummary()); m_mapReportSummary.insert(analyzedResult.company_num, SReportSummary());
m_mapReportSummary[analyzedResult.company_num].nError++; m_mapReportSummary[analyzedResult.company_num].nError++;
m_vecError.append(m_erCurrentRow); m_vecError.append(m_erCurrentRow);
m_pErrorSender->send(analyzedResult);
} }
emit signalLog(strLog); emit signalLog(strLog);

2
EffectUI/sparentprocess.h
View File

@@ -5,6 +5,7 @@
#include <QVector> #include <QVector>
#include <QMap> #include <QMap>
#include <QProcess> #include <QProcess>
#include "serrorsender.h"
class QStringList; class QStringList;
class QString; class QString;
@@ -93,6 +94,7 @@ private:
SError m_error; SError m_error;
bool m_bUserAbort; bool m_bUserAbort;
QMap<int, SReportSummary> m_mapReportSummary; QMap<int, SReportSummary> m_mapReportSummary;
SErrorSender* m_pErrorSender;
}; };

2
EffectUI/widget.h
View File

@@ -11,6 +11,7 @@ class STimer;
class SLogWidget; class SLogWidget;
class SEffectLogic; class SEffectLogic;
class SRunningProcess; class SRunningProcess;
class SErrorSender;
namespace Ui { namespace Ui {
class Widget; class Widget;
@@ -38,6 +39,7 @@ private:
STimer *m_pTimer; STimer *m_pTimer;
SEffectLogic *m_pLogic; SEffectLogic *m_pLogic;
SRunningProcess* m_pProcess; SRunningProcess* m_pProcess;
SErrorSender* m_pErrorSender;
}; };
#endif // WIDGET_H #endif // WIDGET_H

9
MorphereAnalyzer/sbatchrun.cpp
View File

@@ -505,13 +505,13 @@ bool SBatchRun::loadData()
//strList << " " + query.value(j).toString() + " "; //strList << " " + query.value(j).toString() + " ";
strList.append(" " + query.value(j).toString() + " "); strList.append(" " + query.value(j).toString() + " ");
//strList.append(query.value(j).toString()); //strList.append(query.value(j).toString());
/*
if(strList[m_anData[E_DATA_platform_form]].trimmed() == "post" || strList[m_anData[E_DATA_platform_form]].trimmed() == "story" || strList[m_anData[E_DATA_platform_form]].trimmed() == "channel") if(strList[m_anData[E_DATA_platform_form]].trimmed() == "post" || strList[m_anData[E_DATA_platform_form]].trimmed() == "story" || strList[m_anData[E_DATA_platform_form]].trimmed() == "channel")
strList[m_anData[E_DATA_platform_form]] = "sns"; strList[m_anData[E_DATA_platform_form]] = "sns";
if(strList[m_anData[E_DATA_platform_form]].trimmed() == "group") if(strList[m_anData[E_DATA_platform_form]].trimmed() == "group")
strList[m_anData[E_DATA_platform_form]] = "community"; strList[m_anData[E_DATA_platform_form]] = "community";
*/
if(i == E_ARTICLE_BODY) if(i == E_ARTICLE_BODY)
{ {
@@ -651,6 +651,7 @@ void SBatchRun::FilterDate(QString _strJson)
} }
m_data[nSelect].clear(); m_data[nSelect].clear();
m_data[nSelect] = copyData; m_data[nSelect] = copyData;
qDebug() << m_data[nSelect].size();
} }
void SBatchRun::FilterLength(QString _strJson) void SBatchRun::FilterLength(QString _strJson)
@@ -691,6 +692,7 @@ void SBatchRun::FilterLength(QString _strJson)
} }
m_data[nSelect].clear(); m_data[nSelect].clear();
m_data[nSelect] = copyData; m_data[nSelect] = copyData;
qDebug() << m_data[nSelect].size();
} }
@@ -750,6 +752,7 @@ void SBatchRun::FilterCounter(QString _strJson)
} }
m_data[nSelect].clear(); m_data[nSelect].clear();
m_data[nSelect] = copyData; m_data[nSelect] = copyData;
qDebug() << m_data[nSelect].size();
} }
void SBatchRun::FilterReplace(QString _strJson) void SBatchRun::FilterReplace(QString _strJson)
@@ -783,6 +786,7 @@ void SBatchRun::FilterReplace(QString _strJson)
else else
m_data[nSelect][i][nCatalog] = m_data[nSelect][i][nCatalog].replace(strFind,strReplace); m_data[nSelect][i][nCatalog] = m_data[nSelect][i][nCatalog].replace(strFind,strReplace);
} }
qDebug() << m_data[nSelect].size();
} }
void SBatchRun::FilterSerach(QString _strJson) void SBatchRun::FilterSerach(QString _strJson)
@@ -855,4 +859,5 @@ void SBatchRun::FilterSerach(QString _strJson)
m_data[nSelect] = copyData; m_data[nSelect] = copyData;
m_vecKeyword.clear(); m_vecKeyword.clear();
} }
qDebug() << m_data[nSelect].size();
} }

4
MorphereAnalyzer/sdatadlg.cpp
View File

@@ -86,12 +86,12 @@ void SDataDlg::DataReload(QString _strTableName,int _nSelect)
for (int i = 0; i < pTable->columnCount() ; i++) for (int i = 0; i < pTable->columnCount() ; i++)
{ {
QString str = query.value(i).toString().replace("\n"," "); QString str = query.value(i).toString().replace("\n"," ");
/*
if((i == GetColumn().getColumnIndex("platform_form")) && (str.trimmed() == "post" || str.trimmed() == "channel" || str.trimmed() == "story")) if((i == GetColumn().getColumnIndex("platform_form")) && (str.trimmed() == "post" || str.trimmed() == "channel" || str.trimmed() == "story"))
str = "sns"; str = "sns";
if((i == GetColumn().getColumnIndex("platform_form")) && (str.trimmed() == "group")) if((i == GetColumn().getColumnIndex("platform_form")) && (str.trimmed() == "group"))
str = "community"; str = "community";
*/
pTable->setItem(nCount,i,new STableWidgetItem(" "+str.replace("\t"," ")+" ")); pTable->setItem(nCount,i,new STableWidgetItem(" "+str.replace("\t"," ")+" "));
} }
nCount++; nCount++;

2
MorphereAnalyzer/sfilterobject.cpp
View File

@@ -407,7 +407,7 @@ void SFilterObject::SearchKeyword()
strKey = strKey.replace("\t"," "); strKey = strKey.replace("\t"," ");
QString strTemp; QString strTemp;
foreach(QString str, strKey.split(" ")) foreach(QString str, strKey.split(" ", QString::SkipEmptyParts))
{ {
if (str.trimmed().isEmpty() == false) if (str.trimmed().isEmpty() == false)
strTemp += str.trimmed() + " "; strTemp += str.trimmed() + " ";

12
sfilterprocess/sdatagroup.cpp
View File

@@ -85,7 +85,6 @@ bool SDatagroup::loadData(const int& _nDatagroupNumber)
for (int j = 0; j < m_pSInitializer->getColumnStringList().size(); j++) for (int j = 0; j < m_pSInitializer->getColumnStringList().size(); j++)
strList.append(" " + query.value(j).toString() + " "); strList.append(" " + query.value(j).toString() + " ");
/*
if(strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "post" || if(strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "post" ||
strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "story" || strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "story" ||
strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "channel") strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "channel")
@@ -93,7 +92,7 @@ bool SDatagroup::loadData(const int& _nDatagroupNumber)
if(strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "group") if(strList[anColumn[SInitializer::E_DATA_platform_form]].trimmed() == "group")
strList[anColumn[SInitializer::E_DATA_platform_form]] = " community "; strList[anColumn[SInitializer::E_DATA_platform_form]] = " community ";
*/
switch(i) switch(i)
{ {
case E_ARTICLE_BODY: case E_ARTICLE_BODY:
@@ -312,7 +311,7 @@ bool SDatagroup::makeTable()
stid.num = nId++; stid.num = nId++;
stid.platformname_num = m_pSInitializer->getPlatformName(strListBody[anColumn[SInitializer::E_DATA_platform_name]].trimmed()); stid.platformname_num = m_pSInitializer->getPlatformName(strListBody[anColumn[SInitializer::E_DATA_platform_name]].trimmed());
stid.id = strListBody[anColumn[SInitializer::E_DATA_article_id]].trimmed(); stid.id = strListBody[anColumn[SInitializer::E_DATA_article_id]].trimmed();
m_SId.put(strListBody[anColumn[SInitializer::E_DATA_article_id]].trimmed(), stid); m_SId.put(m_SId.getIdKey(strListBody), stid);
} }
if (!m_SNickname.contains(strListBody[anColumn[SInitializer::E_DATA_article_nickname]].trimmed())) if (!m_SNickname.contains(strListBody[anColumn[SInitializer::E_DATA_article_nickname]].trimmed()))
@@ -336,14 +335,14 @@ bool SDatagroup::makeTable()
m_stDate.m_strLastupdate = (( m_stDate.m_strLastupdate > lastupdate ) ? m_stDate.m_strLastupdate : lastupdate); m_stDate.m_strLastupdate = (( m_stDate.m_strLastupdate > lastupdate ) ? m_stDate.m_strLastupdate : lastupdate);
if (!m_SId.contains(strListReply[anColumn[SInitializer::E_DATA_article_id]].trimmed())) if (!m_SId.contains(m_SId.getIdKey(strListReply)))
{ {
stId stid; stId stid;
stid.num = nId++; stid.num = nId++;
//stid.community_num = 0;//m_SCommunity.get(m_SCommunity.getCommunityKey(strListBody).trimmed())->num; //stid.community_num = 0;//m_SCommunity.get(m_SCommunity.getCommunityKey(strListBody).trimmed())->num;
stid.platformname_num = m_pSInitializer->getPlatformName(strListReply[anColumn[SInitializer::E_DATA_platform_name]].trimmed()); stid.platformname_num = m_pSInitializer->getPlatformName(strListReply[anColumn[SInitializer::E_DATA_platform_name]].trimmed());
stid.id = strListReply[anColumn[SInitializer::E_DATA_article_id]].trimmed(); stid.id = strListReply[anColumn[SInitializer::E_DATA_article_id]].trimmed();
m_SId.put(strListReply[anColumn[SInitializer::E_DATA_article_id]].trimmed(), stid); m_SId.put(m_SId.getIdKey(strListReply), stid);
} }
if (!m_SNickname.contains(strListReply[anColumn[SInitializer::E_DATA_article_nickname]].trimmed())) if (!m_SNickname.contains(strListReply[anColumn[SInitializer::E_DATA_article_nickname]].trimmed()))
@@ -957,7 +956,8 @@ void SDatagroup::SId::put(const stId &_stid)
QString SDatagroup::SId::getIdKey(const QStringList &_strlist) QString SDatagroup::SId::getIdKey(const QStringList &_strlist)
{ {
return _strlist[m_pSInitializer->getColumnIntArray()[SInitializer::E_DATA_article_id]].trimmed(); return _strlist[m_pSInitializer->getColumnIntArray()[SInitializer::E_DATA_article_id]].trimmed() +
_strlist[m_pSInitializer->getColumnIntArray()[SInitializer::E_DATA_platform_name]].trimmed();
} }
SDatagroup::stId* SDatagroup::SId::get(const QString &_strKey) SDatagroup::stId* SDatagroup::SId::get(const QString &_strKey)

2
sfilterprocess/sfilteralgorithm.cpp
View File

@@ -180,7 +180,7 @@ void SFilterAlgorithm::FilterSearch(QVector<QStringList> *m_data, bool *m_bDataF
SKeyword stKeyword; SKeyword stKeyword;
stKeyword.m_nCatalog = json.GetNumber(_strJson,"Category"); stKeyword.m_nCatalog = json.GetNumber(_strJson,"Category");
stKeyword.m_nKeyword = json.GetNumber(_strJson,"Keyword"); stKeyword.m_nKeyword = json.GetNumber(_strJson,"Keyword");
stKeyword.m_strListKeyword = json.Get(_strJson,"String").split(" "); stKeyword.m_strListKeyword = json.Get(_strJson,"String").split(" ", QString::SkipEmptyParts);
if (json.GetNumber(_strJson,"Method") == 1) if (json.GetNumber(_strJson,"Method") == 1)
{ {
for (int i = 0 ; i < stKeyword.m_strListKeyword.size(); i++ ) for (int i = 0 ; i < stKeyword.m_strListKeyword.size(); i++ )

2
sfilterprocess/sfilterprocess.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.1.0, 2016-11-11T11:27:20. --> <!-- Written by QtCreator 4.1.0, 2016-11-17T12:13:33. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>