diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 88fd13c..22f9d1e 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 493c9e6..78f12bd 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 2dac6d2..ac69d36 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index b9de734..1729f47 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index 83b6e0f..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index fcc3d04..18ff902 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 493c9e6..78f12bd 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 2dac6d2..ac69d36 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index b9de734..1729f47 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Mac_Input.Designer.cs b/unimarc/unimarc/마크/Mac_Input.Designer.cs index 6d9b1b7..764b360 100644 --- a/unimarc/unimarc/마크/Mac_Input.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Input.Designer.cs @@ -37,14 +37,15 @@ this.comboBox1 = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.series = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tag008 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); @@ -139,6 +140,7 @@ this.author, this.book_comp, this.price, + this.tag008, this.Marc}); this.dataGridView1.Location = new System.Drawing.Point(12, 58); this.dataGridView1.Name = "dataGridView1"; @@ -149,6 +151,12 @@ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyUp); // + // openFileDialog1 + // + this.openFileDialog1.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*"; + this.openFileDialog1.InitialDirectory = "C:"; + this.openFileDialog1.Title = "열기"; + // // isbn // this.isbn.HeaderText = "ISBN"; @@ -184,18 +192,17 @@ this.price.Name = "price"; this.price.Width = 70; // + // tag008 + // + this.tag008.HeaderText = "tag008"; + this.tag008.Name = "tag008"; + // // Marc // this.Marc.HeaderText = "마크"; this.Marc.Name = "Marc"; this.Marc.Width = 300; // - // openFileDialog1 - // - this.openFileDialog1.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*"; - this.openFileDialog1.InitialDirectory = "C:"; - this.openFileDialog1.Title = "열기"; - // // Mac_Input // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -230,6 +237,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn tag008; private System.Windows.Forms.DataGridViewTextBoxColumn Marc; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_Input.cs b/unimarc/unimarc/마크/Mac_Input.cs index 654c561..5c69b92 100644 --- a/unimarc/unimarc/마크/Mac_Input.cs +++ b/unimarc/unimarc/마크/Mac_Input.cs @@ -57,15 +57,20 @@ namespace WindowsFormsApp1.Mac } void input_Grid(string text) { + String_Text st = new String_Text(); string[] grid = text.Split(''); for (int a = 0; a < grid.Length - 1; a++) { if (comboBox1.SelectedIndex != 0) grid[a] = grid[a].Replace("\r\n", ""); - string[] data = Split_Marc(grid[a]); - data[0] = data[0].Replace(":", ""); - data[6] = grid[a] + ""; + // string[] data = Split_Marc(grid[a]); + // data[0] = data[0].Replace(":", ""); + // data[6] = grid[a] + ""; + + string[] Tag = { "020a", "245a", "440a", "245d", "260b", "950b", "008", "950a" }; + string[] data = st.Take_Tag(grid[a], Tag); + data[7] = grid[a] + ""; dataGridView1.Rows.Add(data); } } @@ -132,7 +137,10 @@ namespace WindowsFormsApp1.Mac string table = "Marc"; string[] GridCol = { "isbn", "book_name", "series", "author", "book_comp", "price" }; - string[] col = { "ISBN", "서명", "총서명", "저자", "출판사", "가격", "marc", "marc_chk", "compidx", "grade", "date", "user" }; + string[] col = { + "ISBN", "서명", "총서명", "저자", "출판사", "가격", + "marc", "marc_chk", "compidx", "grade", "date", + "user", "008tag" }; for(int a = 0; a < dataGridView1.Rows.Count; a++) { foreach (string colName in GridCol) @@ -141,6 +149,7 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells[colName].Value = ""; } string Marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString(); + string tag008 = dataGridView1.Rows[a].Cells["tag008"].Value.ToString(); Marc = Marc.Replace(@"'", "'"); Marc = Marc.Replace(@"""", "\"\""); try @@ -151,7 +160,8 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[a].Cells["author"].Value.ToString(), dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(), dataGridView1.Rows[a].Cells["price"].Value.ToString(), - Marc, "1", compidx, "2", Time, user }; + Marc, "1", compidx, "2", Time, + user, tag008 }; // string Incmd = db.DB_INSERT_DUPLICATE(table, col, data); string Incmd = db.DB_INSERT(table, col, data); diff --git a/unimarc/unimarc/마크/Mac_Input.resx b/unimarc/unimarc/마크/Mac_Input.resx index a355628..94360f6 100644 --- a/unimarc/unimarc/마크/Mac_Input.resx +++ b/unimarc/unimarc/마크/Mac_Input.resx @@ -135,6 +135,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 53b4ede..e9c19e0 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -564,7 +564,7 @@ namespace ExcelTest List_Book.Rows[row_idx].Cells["pay"].Value.ToString(), List_Book.Rows[row_idx].Cells["url"].Value.ToString() }; string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - string orimarc = st.made_Ori_marc(richTextBox1).Replace("\\", "￦"); + string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); // 필수태그 확인 if (!isMustTag(orimarc)) {