From d2b51d16e8e5ecffa49292b58ab509a3c1be657c Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 24 Feb 2016 09:57:45 +0000 Subject: [PATCH] =?UTF-8?q?2016-02-24=20=EB=82=98=EB=A8=B8=EC=A7=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=93=A4=EC=96=B4=EA=B0=80=EA=B8=B0=20?= =?UTF-8?q?=EC=A0=84=EC=97=90=20=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.0.12/source@256 8346c931-da38-4b9b-9d4c-e48b93cbd075 --- Analyzer/mainwindow.cpp | 7 +++++++ Analyzer/sbatchrun.cpp | 16 +++++++++++----- Analyzer/scountdlg.cpp | 1 + Analyzer/stable.cpp | 10 ++++++++++ MorphereAnalyzer/ymorpherethread.cpp | 2 -- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Analyzer/mainwindow.cpp b/Analyzer/mainwindow.cpp index 6f2274b..b0443b5 100644 --- a/Analyzer/mainwindow.cpp +++ b/Analyzer/mainwindow.cpp @@ -137,6 +137,13 @@ void MainWindow::FileNew() QVector column = GetColumn().data(); pTable->SetHeaderList(&column,SColumn::E_NAME); pTable->setRowCount(text.toInt()); + for(int i = 0; i < text.toInt(); i++) + { + for(int j = 0; j < column.size(); j++) + { + pTable->setItem(i, j, new QTableWidgetItem(QString(" "))); + } + } } } diff --git a/Analyzer/sbatchrun.cpp b/Analyzer/sbatchrun.cpp index 202d1fd..2a31f13 100644 --- a/Analyzer/sbatchrun.cpp +++ b/Analyzer/sbatchrun.cpp @@ -462,24 +462,25 @@ bool SBatchRun::loadData() QString astrWhere[E_ARTICLE_MAX] = {" where article_form = 'body'"," where article_form = 'reply'"}; astrWhere[E_ARTICLE_BODY] += " and date(article_date) >= "; - astrWhere[E_ARTICLE_REPLY] += " and date(article_date) >= "; + //astrWhere[E_ARTICLE_REPLY] += " and date(article_date) >= "; if(m_pgbCutDays->isChecked()) { astrWhere[E_ARTICLE_BODY] += "date(subdate(now(), INTERVAL "; astrWhere[E_ARTICLE_BODY] += QString::number(abs(nCutDays)); astrWhere[E_ARTICLE_BODY] += " DAY))"; astrWhere[E_ARTICLE_BODY] += " and date(article_date) <= date(now())"; - + /* astrWhere[E_ARTICLE_REPLY] += "date(subdate(now(), INTERVAL "; astrWhere[E_ARTICLE_REPLY] += QString::number(abs(nCutDays)); astrWhere[E_ARTICLE_REPLY] += " DAY))"; + */ } else { astrWhere[E_ARTICLE_BODY] += "date('" + dateFrom.toString("yyyy-MM-dd") + "') "; astrWhere[E_ARTICLE_BODY] += " and date(article_date) <= date('" + dateTo.toString("yyyy-MM-dd") + "')"; - astrWhere[E_ARTICLE_REPLY] += "date('" + dateFrom.toString("yyyy-MM-dd") + "') "; + //astrWhere[E_ARTICLE_REPLY] += "date('" + dateFrom.toString("yyyy-MM-dd") + "') "; } astrWhere[E_ARTICLE_BODY] += " Order by article_date DESC"; @@ -512,6 +513,11 @@ bool SBatchRun::loadData() if(i == E_ARTICLE_BODY) { + if (strList[m_anData[E_DATA_article_id]].trimmed().isEmpty() && strList[m_anData[E_DATA_platform_form]].trimmed() == "news") + { + strList[m_anData[E_DATA_article_id]] = strList[m_anData[E_DATA_platform_title]]; + strList[m_anData[E_DATA_article_nickname]] = strList[m_anData[E_DATA_platform_title]]; + } if (strList[m_anData[E_DATA_article_date]].trimmed().isEmpty()) continue; if (strList[m_anData[E_DATA_article_id]].trimmed().isEmpty()) continue; if (strList[m_anData[E_DATA_article_nickname]].trimmed().isEmpty()) continue; @@ -528,7 +534,7 @@ bool SBatchRun::loadData() { if (strList[m_anData[E_DATA_article_id]].trimmed().isEmpty()) continue; if (strList[m_anData[E_DATA_article_nickname]].trimmed().isEmpty()) continue; - if (strList[m_anData[E_DATA_article_date]].trimmed() == "0000-00-00 00:00:00") + if (strList[m_anData[E_DATA_article_date]].trimmed() == "0000-00-00 00:00:00" || strList[m_anData[E_DATA_article_date]].trimmed().isEmpty()) strList[m_anData[E_DATA_article_date]] = "1990-01-01 00:00:00"; if(setUrl.contains(strList[m_anData[E_DATA_article_url]].trimmed())) @@ -787,7 +793,7 @@ void SBatchRun::FilterSerach(QString _strJson) SKeyword stKeyword; stKeyword.m_nCatalog = json.GetNumber(_strJson,"Category"); 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) { for (int i = 0 ; i < stKeyword.m_strListKeyword.size(); i++ ) diff --git a/Analyzer/scountdlg.cpp b/Analyzer/scountdlg.cpp index e777438..9ad6edd 100644 --- a/Analyzer/scountdlg.cpp +++ b/Analyzer/scountdlg.cpp @@ -75,6 +75,7 @@ void SCountDlg::choose_1() } } if (nCatalog == D_NOT_SELECT) return; + m_pTable->clear(); m_pTable->SetHeaderList(QStringList() << GetColumn().data().at(nCatalog).at(SColumn::E_NAME) << "Count"); QTableWidget *pCurrent = (QTableWidget *)GetMainWindow()->m_pDataDlg->GetCurrentWidget(); GetMainWindow()->m_progress.setRange(0,pCurrent->rowCount()); diff --git a/Analyzer/stable.cpp b/Analyzer/stable.cpp index 5513ea4..0f85435 100644 --- a/Analyzer/stable.cpp +++ b/Analyzer/stable.cpp @@ -125,7 +125,17 @@ void STable::Paste() { int nPlusRow = nStartRow + nRows - rowCount(); if (nPlusRow > 0) + { + int rowcnt = rowCount(); setRowCount(rowCount()+nPlusRow); + for(int i = rowcnt; i < rowcnt + nPlusRow; i++) + { + for(int j = 0; j < columnCount(); j++) + { + setItem(i, j, new QTableWidgetItem(QString(" "))); + } + } + } } int nRow = nStartRow; foreach(QString strRow,strRows) diff --git a/MorphereAnalyzer/ymorpherethread.cpp b/MorphereAnalyzer/ymorpherethread.cpp index ff90417..946eb5c 100644 --- a/MorphereAnalyzer/ymorpherethread.cpp +++ b/MorphereAnalyzer/ymorpherethread.cpp @@ -112,6 +112,4 @@ QString YMorphereThread::getWeeksInMonth(unsigned int _nDate) strWeek += qToday.toString("yyyyMM"); strWeek += QString::number(week); return strWeek; - } -