diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 9d186e5..32b64ce 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -3394,16 +3394,61 @@ ENDSTAT: '// If od.ShowDialog <> Windows.Forms.DialogResult.OK Then Return Try - Pub.DSET1.Clear() - Pub.DSET1.AcceptChanges() - Dim xr As XmlReadMode = Pub.DSET1.ReadXml(od.FileName) - Pub.DSET1.AcceptChanges() + + + + + Dim buffer As String = System.IO.File.ReadAllText(od.FileName, System.Text.Encoding.UTF8) + Dim data As String = My.Settings.xmlformat.Replace("{data}", buffer) + Dim fn As String = "import.xml" + System.IO.File.WriteAllText(fn, data, System.Text.Encoding.UTF8) + + Dim tempds As New DS() + Dim xr As XmlReadMode = tempds.ReadXml(fn) + + DSET1.AcceptChanges() + tempds.AcceptChanges() + + Dim sb As New System.Text.StringBuilder() + sb.AppendLine("--- Ãß°¡µÈ Á¤º¸ ---") + '//°¡Á®¿Â Å×À̺íÀ» ±âº» Á¤º¸¿¡¼­ »èÁ¦ÇÑ´Ù + For Each tb As DataTable In tempds.Tables + + '//ÀÚ·á°¡ ¾ø´Â Å×À̺íÀº ó¸®ÇÏÁö ¾Ê´Â´Ù + If tb.Rows.Count < 1 Then Continue For + + sb.AppendLine("[" + tb.TableName + "] " + tb.Rows.Count.ToString() + " Lines") + + '//°ªÀÇ °ø¹éÁ¦°Å + For Each dr As DataRow In tb.Rows + For Each dc As DataColumn In tb.Columns + If dr(dc.ColumnName) Is DBNull.Value Then + + Else + dr(dc.ColumnName) = dr(dc.ColumnName).ToString().Trim() '//°ø¹é ÀÚµ¿ Á¦°Å + End If + Next + dr.EndEdit() + dr.AcceptChanges() + Next + + '//±âÁ¸ÀÚ·á»èÁ¦ + DSET1.Tables(tb.TableName).Clear() + DSET1.Tables(tb.TableName).AcceptChanges() + + '//ÇöÀç Á¤º¸·Î ÀúÀå + DSET1.Tables(tb.TableName).Merge(tb) + Next + + DSET1.AcceptChanges() FixData(False) '//µ¥ÀÌÅͺ¸Á¤ Calc.validation() '//nullº¸Á¤ Menu_°Ç¹°°³¿ä() Me.RefreshMenuList("") + MsgboxI(sb.ToString()) + Catch ex As Exception MsgboxE("¿ÜºÎÆÄÀÏ °¡Á®¿À±â ½ÇÆÐ\n" + ex.Message) End Try diff --git a/ArinWarev1/My Project/Settings.Designer.vb b/ArinWarev1/My Project/Settings.Designer.vb index de9d57a..2411051 100644 --- a/ArinWarev1/My Project/Settings.Designer.vb +++ b/ArinWarev1/My Project/Settings.Designer.vb @@ -64,6 +64,19 @@ Namespace My Return CType(Me("cs"),String) End Get End Property + + "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " {data}"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"")> _ + Public Property xmlformat() As String + Get + Return CType(Me("xmlformat"),String) + End Get + Set + Me("xmlformat") = value + End Set + End Property End Class End Namespace diff --git a/ArinWarev1/My Project/Settings.settings b/ArinWarev1/My Project/Settings.settings index 2455097..2254f2a 100644 --- a/ArinWarev1/My Project/Settings.settings +++ b/ArinWarev1/My Project/Settings.settings @@ -10,5 +10,11 @@ </SerializableConnectionString> Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;User ID=raytrace;Password=arin + + <?xml version="1.0" standalone="yes"?> +<DS xmlns="http://tempuri.org/DS.xsd"> + {data} +</DS> + \ No newline at end of file diff --git a/ArinWarev1/app.config b/ArinWarev1/app.config index 148ca96..7b2939f 100644 --- a/ArinWarev1/app.config +++ b/ArinWarev1/app.config @@ -1,7 +1,10 @@ - + +
+ + @@ -26,4 +29,14 @@ - + + + + <?xml version="1.0" standalone="yes"?> +<DS xmlns="http://tempuri.org/DS.xsd"> + {data} +</DS> + + + +