2016-02-24 나머지 수정 들어가기 전에 백업

git-svn-id: svn://192.168.0.12/source@256 8346c931-da38-4b9b-9d4c-e48b93cbd075

Analyzer/mainwindow.cpp

@@ -137,6 +137,13 @@ void MainWindow::FileNew()
         QVector <QStringList> 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("  ")));
+            }
+        }
     }
 }
 

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++ )

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());    

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)

MorphereAnalyzer/ymorpherethread.cpp

@@ -112,6 +112,4 @@ QString YMorphereThread::getWeeksInMonth(unsigned int _nDate)
     strWeek += qToday.toString("yyyyMM");
     strWeek += QString::number(week);
     return strWeek;
-
 }
-