백업

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

Analyzer/sdatadlg.cpp

@@ -408,6 +408,7 @@ void SDataDlg::Import(QVector <QByteArray> _vecImport )
     STable *pNew = new STable;
     QTextCodec *codec = QTextCodec::codecForName("eucKR");
     GetMainWindow()->m_progress.setRange(0,_vecImport.size());
+    QVector <QStringList> column = GetColumn().data();
     int ncRow = 0;
     bool bFirst = true;
     pNew->setRowCount(_vecImport.size());
@@ -421,7 +422,14 @@ void SDataDlg::Import(QVector <QByteArray> _vecImport )
             {
                 pNew->setColumnCount(strings.size()-1);
                 for (int i = 1; i < strings.size();i++)
+                {
+                    for(int j = 0; j < column.size(); j++)
+                    {
+                        if(column.at(j).at(SColumn::E_DATABASE).compare(strings.at(i)) == 0)
+                            strings[i] = column.at(j).at(SColumn::E_NAME);
+                    }
                     pNew->setHorizontalHeaderItem(i-1,new QTableWidgetItem(strings.at(i)));
+                }
                 bFirst = false;
                 pNew->setRowCount(_vecImport.size()-1);
                 continue;
@@ -451,7 +459,7 @@ void SDataDlg::Export(QString _strFilename)
     out << "#Head#,";
     QVector <QStringList> column = GetColumn().data();
     foreach(QStringList strList,column)
-        out << strList.at(SColumn::E_NAME) << ",";
+        out << strList.at(SColumn::E_DATABASE) << ",";
     out << endl;
     GetMainWindow()->m_progress.setRange(0,pCurrent->rowCount()-1);
     for (int nCount = 0 ; nCount < pCurrent->rowCount(); nCount++ )

GroupManager/widget.cpp

@@ -500,6 +500,7 @@ void Widget::on_group_button_import()
     int nCount=0;
     QStringList attributes;
     QString strquery;
+    QSqlQuery query;
     while(!in.atEnd())
     {
         QString strLine;
@@ -520,36 +521,37 @@ void Widget::on_group_button_import()
                     attributes << strings.at(i);
                 nCount++;
             }
+
+            strquery = "insert into data_" + strgroup.at(0) + " (";
+
+            foreach(QString str, attributes)
+            {
+                strquery += (str.trimmed() + ",");
+            }
+
+            strquery = strquery.left(strquery.length() - 1);
+            strquery += ") VALUES (";
+
+            foreach(QString str,attributes)
+            {
+                strquery += ":" + str.trimmed().toUpper() + ",";
+            }
+            strquery = strquery.left(strquery.length() - 1);
+            strquery += ")";
+
             continue;
         }
 
-        strquery = "insert into data_" + strgroup.at(0) + " (";
-
-        foreach(QString str, attributes)
-        {
-            strquery += (str.trimmed() + ",");
-        }
-
-        strquery = strquery.left(strquery.length() - 1);
-        strquery += ") VALUES (";
-
-        foreach(QString str,attributes)
-        {
-            strquery += ":" + str.trimmed().toUpper() + ",";
-        }
-        strquery = strquery.left(strquery.length() - 1);
-        strquery += ")";
-
-
         strLine = strLine.replace("\"","");
         QStringList strings = strLine.split(",");
 
-        QSqlQuery query;
         query.prepare(strquery.toUtf8());       
         for(int i=0; i<attributes.size();i++)
         {
+
             if(attributes.at(i).trimmed() == "article_order")
             {
+
                 if(strings.at(i).trimmed().length() == 0)
                 {
                     QString strEmpty;
@@ -558,7 +560,9 @@ void Widget::on_group_button_import()
                 else
                 {
                     query.bindValue(":"+attributes.at(i).toUpper(), strings.at(i).trimmed().toInt());
-                }               
+                }
+
+                query.bindValue(":"+attributes.at(i).toUpper(), strings.at(i).trimmed().toInt());
             }
 
             if(strings.at(i).trimmed().length() == 0)

MorphereAnalyzer/widget.cpp

@@ -1569,7 +1569,7 @@ void Widget::FileImport()
 
     for(int i = 0; i < m_vecColumn.size(); i++)
     {
-        strlistHeader << m_vecColumn.at(i).at(E_COLUMN_NAME);
+        strlistHeader << m_vecColumn.at(i).at(E_COLUMN_DATABASE);
     }
 
 
@@ -1600,7 +1600,7 @@ void Widget::FileImport()
                     {
                         if (strlistHeader.contains(strings.at(i)))
                         {
-                            if (m_vecColumn.at(j).at(E_COLUMN_NAME) == strings.at(i).trimmed())
+                            if (m_vecColumn.at(j).at(E_COLUMN_DATABASE) == strings.at(i).trimmed())
                             {
                                 wgHeader << j;
                             }
@@ -1610,8 +1610,11 @@ void Widget::FileImport()
                     }
                 }
                 nCount++;
+                qDebug() << m_vecColumn.size();
+
                 for(int i = 0; i < m_vecColumn.size(); i++)
                 {
+                    qDebug() << i;
                     pNew->setHorizontalHeaderItem(i ,new QTableWidgetItem(m_vecColumn.at(wgHeader.at(i)).at(E_COLUMN_NAME)));
                 }
 
@@ -1660,7 +1663,7 @@ void Widget::FileExport()
     out << "#Head#,";
 
     foreach(QStringList strList,m_vecColumn)
-        out << strList.at(E_COLUMN_NAME) << ",";
+        out << strList.at(E_COLUMN_DATABASE) << ",";
     out << endl;
 
     m_pProgress->setRange(0,pCurrent->rowCount()-1);

ProxyProcess/ProxyProcess.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.0, 2015-10-15T15:24:22. -->
+<!-- Written by QtCreator 3.3.0, 2015-10-15T15:42:58. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>