diff --git a/.gitignore b/.gitignore index 6e9db0b..b2644cc 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ Test_HTML/ AuthorSymbol/ TestGrid/ Split_Marc/ -Test_Update/ \ No newline at end of file +Test_Update/ +Barum_TestProject/ \ No newline at end of file diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index dc6e040..fb711cf 100644 Binary files a/Test_Project/.vs/Test_Project/v16/.suo and b/Test_Project/.vs/Test_Project/v16/.suo differ diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index f3bc040..1c3515e 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 7b047a4..8846858 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 5e4f891..00a2b4b 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 a2d292b..9170564 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/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 080c262..1ed5731 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index f5e894a..83b6e0f 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 6229407..98f4bfd 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 7b047a4..8846858 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 5e4f891..00a2b4b 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 a2d292b..9170564 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_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index 2b726f1..d04ce05 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -120,7 +120,6 @@ this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(1156, 598); this.dataGridView1.TabIndex = 48; - this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index a4d14dc..b67256a 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -239,6 +239,7 @@ namespace WindowsFormsApp1.Mac int idx_col = e.ColumnIndex; if (3 <= idx_col && idx_col <= 8) { ExcelTest.Marc marc = new ExcelTest.Marc(this); + marc.MdiParent = main; marc.WindowState = FormWindowState.Maximized; marc.Show(); marc.input_list(dataGridView1.Rows[idx_row].Cells[1].Value.ToString(), @@ -262,10 +263,5 @@ namespace WindowsFormsApp1.Mac Skill_Grid sg = new Skill_Grid(); sg.Print_Grid_Num(sender, e); } - - private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - - } } } diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index f3f4930..75fa1ff 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -103,7 +103,7 @@ namespace ExcelTest public void input_list(string date, string value) { db.DBcon(); - string Area = "`idx`, `isbn`, `header`, `num`, `book_name`, `author`, `book_comp`, `pay`, `image_url`"; + string Area = "`idx`, `isbn`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`"; string[] sear_tbl = { "date", "list_name" }; string[] sear_col = { date, value }; @@ -114,18 +114,19 @@ namespace ExcelTest string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "V" }; + "", "", "V" }; for(int a = 0; a < db_data.Length; a++) { - if (a % 9 == 0) { grid[0] = db_data[a]; } // 0: idx - if (a % 9 == 1) { grid[1] = db_data[a]; } // 1: isbn - if (a % 9 == 2) { grid[2] = db_data[a]; } // 2: header - if (a % 9 == 3) { grid[2] += db_data[a]; } // 2: num - if (a % 9 == 4) { grid[3] = db_data[a]; } // 3: book_num - if (a % 9 == 5) { grid[4] = db_data[a]; } // 4: author - if (a % 9 == 6) { grid[5] = db_data[a]; } // 5: book_comp - if (a % 9 == 7) { grid[6] = db_data[a]; } // 6: pay - if (a % 9 == 8) { grid[7] = db_data[a]; // 7: image_url + if (a % 10 == 0) { grid[0] = db_data[a]; } // 0: idx + if (a % 10 == 1) { grid[1] = db_data[a]; } // 1: isbn + if (a % 10 == 2) { grid[2] = db_data[a]; } // 2: header + if (a % 10 == 3) { grid[2] += db_data[a]; } // 2: num + if (a % 10 == 4) { grid[3] = db_data[a]; } // 3: book_num + if (a % 10 == 5) { grid[4] = db_data[a]; } // 4: author + if (a % 10 == 6) { grid[5] = db_data[a]; } // 5: book_comp + if (a % 10 == 7) { grid[6] = db_data[a]; } // 6: count + if (a % 10 == 8) { grid[7] = db_data[a]; } // 7: pay + if (a % 10 == 9) { grid[8] = db_data[a]; // 8: image_url List_Book.Rows.Add(grid); } } @@ -501,7 +502,7 @@ namespace ExcelTest } private void Btn_Memo_Click(object sender, EventArgs e) { - Marc_memo memo = new Marc_memo(); + Marc_memo memo = new Marc_memo(this); memo.StartPosition = FormStartPosition.Manual; memo.Location = new Point(1018, 8); memo.TopMost = true; @@ -530,8 +531,8 @@ namespace ExcelTest { string[] Edit_tbl = { "marc", "marc_chk", "marc_chk1", "비고1", "비고2", "url", "division", "008tag", "date", "user" }; string[] Edit_col = { made_Ori_marc(), "1", "0", etc1.Text, etc2.Text, grid_data[5], tag056, text008.Text, date, user_name }; - string[] Sear_tbl = { "compidx", "ISBN" }; - string[] Sear_col = { ml.compidx, List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString() }; + string[] Sear_tbl = { "ISBN" }; + string[] Sear_col = { List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString() }; string res = Sub_marc_chk(grid_data[0]); switch (res) @@ -561,11 +562,11 @@ namespace ExcelTest } else { - string[] Insert_tbl = { "compidx", "ISBN", "서명", "저자", "출판사", + string[] Insert_tbl = { "ISBN", "서명", "저자", "출판사", "가격", "marc", "비고1", "비고2", "url", "grade", "marc_chk", "user", "division", "008tag", "date" }; - string[] Insert_col = { ml.compidx, grid_data[0], grid_data[1], grid_data[2], grid_data[3], + string[] Insert_col = { grid_data[0], grid_data[1], grid_data[2], grid_data[3], grid_data[4], made_Ori_marc(), etc1.Text, etc2.Text, grid_data[5], cb_grade.SelectedIndex.ToString(), "1", user_name, tag056, text008.Text, date }; @@ -598,9 +599,8 @@ namespace ExcelTest { string marc = richTextBox1.Text; - List target = new List(); string[] temp = marc.Split('\n'); - target = temp.ToList(); + List target = temp.ToList(); bool eight_chk = false; string tag056 = string.Empty; @@ -634,6 +634,7 @@ namespace ExcelTest string 디렉토리 = string.Empty; string 가변길이 = string.Empty; string text = richTextBox1.Text.Replace("\t", ""); + text = text.Replace("\\", "￦"); string[] array_text = text.Split('\n'); // num+count+total = 디렉토리 @@ -717,7 +718,7 @@ namespace ExcelTest private string Sub_marc_chk(string isbn) { string Area = "`marc_chk`, `marc_chk1`, `marc_chk2`"; - string cmd = db.DB_Select_Search(Area, "Marc", "compidx", ml.compidx, "ISBN", isbn); + string cmd = db.DB_Select_Search(Area, "Marc", "ISBN", isbn); string db_res = db.DB_Send_CMD_Search(cmd); string[] chk_ary = db_res.Split('|'); @@ -778,6 +779,7 @@ namespace ExcelTest List field = new List(); Marc_data = Marc_data.Replace("", "▼"); Marc_data = Marc_data.Replace("", "▲"); + Marc_data = Marc_data.Replace("￦", "\\"); // string leader = Marc_data.Substring(0, 24); int startidx = 0; string[] data = Marc_data.Substring(24).Split('▲'); @@ -1145,15 +1147,17 @@ namespace ExcelTest for (int a = 0; a < List_Book.Rows.Count; a++) { - if (!Check_BackColor(a) || !Check_List_V(a)) { + if (!Check_BackColor(a) && Check_List_V(a)) { isSuccess = false; - msg += List_Book.Rows[a].Cells["num"].Value.ToString() + " "; + msg += string.Format("『{0}』 ", List_Book.Rows[a].Cells["book_name"].Value.ToString()); } } if (!isSuccess) { - MessageBox.Show(string.Format("표시된 연번을 확인해주세요.\n{0}", msg)); + MessageBox.Show(string.Format("표시된 도서명을 확인해주세요.\n{0}", msg)); return; } + Marc_mkList mkList = new Marc_mkList(this); + mkList.Show(); } #region 마크생성목록_Sub bool Check_BackColor(int row) diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index dc29092..3154051 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); @@ -72,6 +72,8 @@ this.comboBox8 = new System.Windows.Forms.ComboBox(); this.comboBox9 = new System.Windows.Forms.ComboBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btn_mk_marcList = new System.Windows.Forms.Button(); this.btn_Search = new System.Windows.Forms.Button(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -79,14 +81,13 @@ this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.url = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btn_mk_marcList = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -99,7 +100,7 @@ this.richTextBox1.AcceptsTab = true; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.richTextBox1.Font = new System.Drawing.Font("굴림체", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.richTextBox1.Location = new System.Drawing.Point(502, 92); + this.richTextBox1.Location = new System.Drawing.Point(542, 95); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Size = new System.Drawing.Size(631, 649); this.richTextBox1.TabIndex = 32; @@ -110,7 +111,7 @@ // this.etc1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc1.Location = new System.Drawing.Point(1139, 324); + this.etc1.Location = new System.Drawing.Point(1187, 324); this.etc1.Name = "etc1"; this.etc1.Size = new System.Drawing.Size(291, 204); this.etc1.TabIndex = 32; @@ -121,7 +122,7 @@ // this.etc2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc2.Location = new System.Drawing.Point(1139, 534); + this.etc2.Location = new System.Drawing.Point(1187, 534); this.etc2.Name = "etc2"; this.etc2.Size = new System.Drawing.Size(291, 201); this.etc2.TabIndex = 32; @@ -131,7 +132,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(506, 15); + this.label1.Location = new System.Drawing.Point(554, 15); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 14; @@ -140,7 +141,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(675, 15); + this.label2.Location = new System.Drawing.Point(723, 15); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 206; @@ -150,7 +151,7 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(716, 11); + this.comboBox1.Location = new System.Drawing.Point(764, 11); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(79, 20); this.comboBox1.TabIndex = 207; @@ -160,7 +161,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(808, 15); + this.label3.Location = new System.Drawing.Point(856, 15); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 206; @@ -170,7 +171,7 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(859, 11); + this.comboBox2.Location = new System.Drawing.Point(907, 11); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(79, 20); this.comboBox2.TabIndex = 207; @@ -180,7 +181,7 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(961, 15); + this.label98.Location = new System.Drawing.Point(1009, 15); this.label98.Name = "label98"; this.label98.Size = new System.Drawing.Size(53, 12); this.label98.TabIndex = 14; @@ -190,7 +191,7 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(1015, 11); + this.comboBox3.Location = new System.Drawing.Point(1063, 11); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(118, 20); this.comboBox3.TabIndex = 207; @@ -200,7 +201,7 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(1258, 15); + this.label99.Location = new System.Drawing.Point(1306, 15); this.label99.Name = "label99"; this.label99.Size = new System.Drawing.Size(29, 12); this.label99.TabIndex = 206; @@ -208,7 +209,7 @@ // // text008col // - this.text008col.Location = new System.Drawing.Point(1287, 11); + this.text008col.Location = new System.Drawing.Point(1335, 11); this.text008col.Name = "text008col"; this.text008col.Size = new System.Drawing.Size(41, 21); this.text008col.TabIndex = 204; @@ -217,7 +218,7 @@ // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(760, 37); + this.label100.Location = new System.Drawing.Point(808, 37); this.label100.Name = "label100"; this.label100.Size = new System.Drawing.Size(53, 12); this.label100.TabIndex = 206; @@ -227,7 +228,7 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(811, 33); + this.comboBox4.Location = new System.Drawing.Point(859, 33); this.comboBox4.Name = "comboBox4"; this.comboBox4.Size = new System.Drawing.Size(79, 20); this.comboBox4.TabIndex = 207; @@ -237,7 +238,7 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(899, 37); + this.label101.Location = new System.Drawing.Point(947, 37); this.label101.Name = "label101"; this.label101.Size = new System.Drawing.Size(29, 12); this.label101.TabIndex = 206; @@ -247,7 +248,7 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(929, 33); + this.comboBox5.Location = new System.Drawing.Point(977, 33); this.comboBox5.Name = "comboBox5"; this.comboBox5.Size = new System.Drawing.Size(101, 20); this.comboBox5.TabIndex = 207; @@ -257,7 +258,7 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(1045, 37); + this.label102.Location = new System.Drawing.Point(1093, 37); this.label102.Name = "label102"; this.label102.Size = new System.Drawing.Size(29, 12); this.label102.TabIndex = 206; @@ -267,7 +268,7 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(1075, 33); + this.comboBox6.Location = new System.Drawing.Point(1123, 33); this.comboBox6.Name = "comboBox6"; this.comboBox6.Size = new System.Drawing.Size(101, 20); this.comboBox6.TabIndex = 207; @@ -276,7 +277,7 @@ // // text008gov // - this.text008gov.Location = new System.Drawing.Point(1215, 33); + this.text008gov.Location = new System.Drawing.Point(1263, 33); this.text008gov.Name = "text008gov"; this.text008gov.Size = new System.Drawing.Size(41, 21); this.text008gov.TabIndex = 204; @@ -285,7 +286,7 @@ // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(1186, 37); + this.label103.Location = new System.Drawing.Point(1234, 37); this.label103.Name = "label103"; this.label103.Size = new System.Drawing.Size(29, 12); this.label103.TabIndex = 206; @@ -295,7 +296,7 @@ // this.col008res.AutoSize = true; this.col008res.ForeColor = System.Drawing.Color.Blue; - this.col008res.Location = new System.Drawing.Point(1330, 15); + this.col008res.Location = new System.Drawing.Point(1378, 15); this.col008res.Name = "col008res"; this.col008res.Size = new System.Drawing.Size(13, 12); this.col008res.TabIndex = 206; @@ -306,7 +307,7 @@ // this.gov008res.AutoSize = true; this.gov008res.ForeColor = System.Drawing.Color.Blue; - this.gov008res.Location = new System.Drawing.Point(1258, 37); + this.gov008res.Location = new System.Drawing.Point(1306, 37); this.gov008res.Name = "gov008res"; this.gov008res.Size = new System.Drawing.Size(13, 12); this.gov008res.TabIndex = 206; @@ -316,7 +317,7 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(508, 35); + this.checkBox1.Location = new System.Drawing.Point(556, 35); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(112, 16); this.checkBox1.TabIndex = 213; @@ -327,7 +328,7 @@ // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(632, 35); + this.checkBox2.Location = new System.Drawing.Point(680, 35); this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(112, 16); this.checkBox2.TabIndex = 213; @@ -339,7 +340,7 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(1134, 11); + this.comboBox7.Location = new System.Drawing.Point(1182, 11); this.comboBox7.Name = "comboBox7"; this.comboBox7.Size = new System.Drawing.Size(118, 20); this.comboBox7.TabIndex = 207; @@ -348,7 +349,7 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(1355, 92); + this.Btn_Memo.Location = new System.Drawing.Point(1403, 92); this.Btn_Memo.Name = "Btn_Memo"; this.Btn_Memo.Size = new System.Drawing.Size(75, 23); this.Btn_Memo.TabIndex = 215; @@ -361,14 +362,14 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -376,6 +377,7 @@ this.book_name, this.author, this.book_comp, + this.count, this.pay, this.url, this.marc_idx, @@ -391,14 +393,14 @@ this.List_Book.RowHeadersWidth = 10; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.List_Book.Size = new System.Drawing.Size(476, 684); + this.List_Book.Size = new System.Drawing.Size(502, 684); this.List_Book.TabIndex = 217; this.List_Book.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellContentClick); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView8_KeyDown); // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(1355, 120); + this.btn_Save.Location = new System.Drawing.Point(1403, 120); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(75, 23); this.btn_Save.TabIndex = 215; @@ -429,14 +431,14 @@ this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; this.panel3.Controls.Add(this.text008); this.panel3.Controls.Add(this.label4); - this.panel3.Location = new System.Drawing.Point(503, 57); + this.panel3.Location = new System.Drawing.Point(551, 57); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(430, 30); this.panel3.TabIndex = 219; // // btn_close // - this.btn_close.Location = new System.Drawing.Point(1355, 149); + this.btn_close.Location = new System.Drawing.Point(1403, 149); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(75, 23); this.btn_close.TabIndex = 215; @@ -448,7 +450,7 @@ // this.input_date.CustomFormat = "yyyy-MM-dd"; this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.input_date.Location = new System.Drawing.Point(565, 11); + this.input_date.Location = new System.Drawing.Point(613, 11); this.input_date.Name = "input_date"; this.input_date.Size = new System.Drawing.Size(91, 21); this.input_date.TabIndex = 220; @@ -458,7 +460,7 @@ // this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox1.Location = new System.Drawing.Point(1139, 62); + this.pictureBox1.Location = new System.Drawing.Point(1187, 62); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(204, 256); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -468,7 +470,7 @@ // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(1355, 63); + this.btn_preview.Location = new System.Drawing.Point(1403, 63); this.btn_preview.Name = "btn_preview"; this.btn_preview.Size = new System.Drawing.Size(75, 23); this.btn_preview.TabIndex = 215; @@ -485,7 +487,7 @@ "B", "C", "D"}); - this.cb_grade.Location = new System.Drawing.Point(1026, 62); + this.cb_grade.Location = new System.Drawing.Point(1074, 62); this.cb_grade.Name = "cb_grade"; this.cb_grade.Size = new System.Drawing.Size(75, 20); this.cb_grade.TabIndex = 222; @@ -493,7 +495,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(963, 66); + this.label6.Location = new System.Drawing.Point(1011, 66); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(57, 12); this.label6.TabIndex = 223; @@ -556,6 +558,25 @@ this.panel1.Size = new System.Drawing.Size(476, 35); this.panel1.TabIndex = 226; // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.btn_mk_marcList); + this.panel2.Location = new System.Drawing.Point(377, -1); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(98, 35); + this.panel2.TabIndex = 228; + // + // btn_mk_marcList + // + this.btn_mk_marcList.Location = new System.Drawing.Point(6, 5); + this.btn_mk_marcList.Name = "btn_mk_marcList"; + this.btn_mk_marcList.Size = new System.Drawing.Size(85, 23); + this.btn_mk_marcList.TabIndex = 227; + this.btn_mk_marcList.Text = "마크목록생성"; + this.btn_mk_marcList.UseVisualStyleBackColor = true; + this.btn_mk_marcList.Click += new System.EventHandler(this.btn_mk_marcList_Click); + // // btn_Search // this.btn_Search.Location = new System.Drawing.Point(293, 5); @@ -613,6 +634,13 @@ this.book_comp.ReadOnly = true; this.book_comp.Width = 80; // + // count + // + this.count.HeaderText = "C"; + this.count.Name = "count"; + this.count.ReadOnly = true; + this.count.Width = 30; + // // pay // this.pay.FillWeight = 84.26746F; @@ -653,38 +681,19 @@ // // colCheck // - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle2; this.colCheck.HeaderText = "V"; this.colCheck.Name = "colCheck"; this.colCheck.ReadOnly = true; this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colCheck.Width = 30; // - // btn_mk_marcList - // - this.btn_mk_marcList.Location = new System.Drawing.Point(6, 5); - this.btn_mk_marcList.Name = "btn_mk_marcList"; - this.btn_mk_marcList.Size = new System.Drawing.Size(85, 23); - this.btn_mk_marcList.TabIndex = 227; - this.btn_mk_marcList.Text = "마크목록생성"; - this.btn_mk_marcList.UseVisualStyleBackColor = true; - this.btn_mk_marcList.Click += new System.EventHandler(this.btn_mk_marcList_Click); - // - // panel2 - // - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.btn_mk_marcList); - this.panel2.Location = new System.Drawing.Point(377, -1); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(98, 35); - this.panel2.TabIndex = 228; - // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1457, 770); + this.ClientSize = new System.Drawing.Size(1489, 770); this.Controls.Add(this.panel1); this.Controls.Add(this.label6); this.Controls.Add(this.cb_grade); @@ -763,7 +772,6 @@ private System.Windows.Forms.CheckBox checkBox2; private System.Windows.Forms.ComboBox comboBox7; private System.Windows.Forms.Button Btn_Memo; - private System.Windows.Forms.DataGridView List_Book; private System.Windows.Forms.Button btn_Save; private System.Windows.Forms.DataGridViewTextBoxColumn 도서명; private System.Windows.Forms.DataGridViewTextBoxColumn 저자; @@ -785,19 +793,21 @@ private System.Windows.Forms.ComboBox comboBox9; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btn_Search; + private System.Windows.Forms.Button btn_mk_marcList; + private System.Windows.Forms.Panel panel2; private System.Windows.Forms.DataGridViewTextBoxColumn list_idx; private System.Windows.Forms.DataGridViewTextBoxColumn ISBN13; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn count; private System.Windows.Forms.DataGridViewTextBoxColumn pay; private System.Windows.Forms.DataGridViewTextBoxColumn url; private System.Windows.Forms.DataGridViewTextBoxColumn marc_idx; private System.Windows.Forms.DataGridViewTextBoxColumn db_marc; private System.Windows.Forms.DataGridViewTextBoxColumn grade; private System.Windows.Forms.DataGridViewTextBoxColumn colCheck; - private System.Windows.Forms.Button btn_mk_marcList; - private System.Windows.Forms.Panel panel2; + public System.Windows.Forms.DataGridView List_Book; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx index f6d3d4b..fc48524 100644 --- a/unimarc/unimarc/마크/Marc.resx +++ b/unimarc/unimarc/마크/Marc.resx @@ -135,6 +135,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index 9fc9795..abec554 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -28,13 +28,13 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); this.tb_Select_List = new System.Windows.Forms.TextBox(); @@ -51,8 +51,10 @@ this.gu = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.s_book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.s_book_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_num1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_name2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_num2 = 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(); @@ -70,7 +72,7 @@ this.panel1.Controls.Add(this.btn_Select_List); this.panel1.Location = new System.Drawing.Point(12, 12); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1285, 38); + this.panel1.Size = new System.Drawing.Size(1464, 38); this.panel1.TabIndex = 0; // // button1 @@ -105,14 +107,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.num, @@ -125,8 +127,10 @@ this.gu, this.ISBN, this.book_name, - this.s_book_name, - this.s_book_num, + this.s_book_name1, + this.s_book_num1, + this.s_book_name2, + this.s_book_num2, this.author, this.book_comp, this.price, @@ -135,7 +139,7 @@ this.dataGridView1.Location = new System.Drawing.Point(13, 57); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1284, 611); + this.dataGridView1.Size = new System.Drawing.Size(1463, 611); this.dataGridView1.TabIndex = 1; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // @@ -143,7 +147,7 @@ // this.checkBox1.AutoSize = true; this.checkBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.checkBox1.Location = new System.Drawing.Point(1275, 63); + this.checkBox1.Location = new System.Drawing.Point(1435, 63); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(15, 14); this.checkBox1.TabIndex = 2; @@ -161,8 +165,8 @@ // // reg_num // - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.reg_num.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.reg_num.DefaultCellStyle = dataGridViewCellStyle16; this.reg_num.FillWeight = 130.9363F; this.reg_num.HeaderText = "등록번호"; this.reg_num.Name = "reg_num"; @@ -170,8 +174,8 @@ // // class_code // - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.class_code.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.class_code.DefaultCellStyle = dataGridViewCellStyle17; this.class_code.FillWeight = 76.41504F; this.class_code.HeaderText = "분류"; this.class_code.Name = "class_code"; @@ -179,8 +183,8 @@ // // author_code // - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.author_code.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.author_code.DefaultCellStyle = dataGridViewCellStyle18; this.author_code.FillWeight = 77.02635F; this.author_code.HeaderText = "저자기호"; this.author_code.Name = "author_code"; @@ -188,8 +192,8 @@ // // chk_overlap // - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.chk_overlap.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.chk_overlap.DefaultCellStyle = dataGridViewCellStyle19; this.chk_overlap.FillWeight = 38.80909F; this.chk_overlap.HeaderText = "V"; this.chk_overlap.Name = "chk_overlap"; @@ -197,8 +201,8 @@ // // count // - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.count.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.count.DefaultCellStyle = dataGridViewCellStyle20; this.count.FillWeight = 40.14827F; this.count.HeaderText = "C"; this.count.Name = "count"; @@ -206,8 +210,8 @@ // // F // - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.F.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.F.DefaultCellStyle = dataGridViewCellStyle21; this.F.FillWeight = 41.51828F; this.F.HeaderText = "F"; this.F.Name = "F"; @@ -235,21 +239,32 @@ this.book_name.ReadOnly = true; this.book_name.Width = 226; // - // s_book_name + // s_book_name1 // - this.s_book_name.FillWeight = 129.9903F; - this.s_book_name.HeaderText = "총서명"; - this.s_book_name.Name = "s_book_name"; - this.s_book_name.ReadOnly = true; - this.s_book_name.Width = 101; + this.s_book_name1.FillWeight = 129.9903F; + this.s_book_name1.HeaderText = "총서명"; + this.s_book_name1.Name = "s_book_name1"; + this.s_book_name1.ReadOnly = true; + this.s_book_name1.Width = 101; // - // s_book_num + // s_book_num1 // - this.s_book_num.FillWeight = 76.24091F; - this.s_book_num.HeaderText = "총서번호"; - this.s_book_num.Name = "s_book_num"; - this.s_book_num.ReadOnly = true; - this.s_book_num.Width = 59; + this.s_book_num1.FillWeight = 76.24091F; + this.s_book_num1.HeaderText = "총서번호"; + this.s_book_num1.Name = "s_book_num1"; + this.s_book_num1.ReadOnly = true; + this.s_book_num1.Width = 59; + // + // s_book_name2 + // + this.s_book_name2.HeaderText = "총서명"; + this.s_book_name2.Name = "s_book_name2"; + // + // s_book_num2 + // + this.s_book_num2.HeaderText = "총서번호"; + this.s_book_num2.Name = "s_book_num2"; + this.s_book_num2.Width = 59; // // author // @@ -298,7 +313,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1309, 716); + this.ClientSize = new System.Drawing.Size(1488, 716); this.Controls.Add(this.checkBox1); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.panel1); @@ -330,8 +345,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn gu; private System.Windows.Forms.DataGridViewTextBoxColumn ISBN; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; - private System.Windows.Forms.DataGridViewTextBoxColumn s_book_name; - private System.Windows.Forms.DataGridViewTextBoxColumn s_book_num; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_name1; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_num1; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_name2; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_num2; private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; private System.Windows.Forms.DataGridViewTextBoxColumn price; diff --git a/unimarc/unimarc/마크/Marc_Plan.resx b/unimarc/unimarc/마크/Marc_Plan.resx index bc7a8a1..426e841 100644 --- a/unimarc/unimarc/마크/Marc_Plan.resx +++ b/unimarc/unimarc/마크/Marc_Plan.resx @@ -147,10 +147,16 @@ True - + True - + + True + + + True + + True diff --git a/unimarc/unimarc/마크/Marc_memo.Designer.cs b/unimarc/unimarc/마크/Marc_memo.Designer.cs index 2768878..f4d5151 100644 --- a/unimarc/unimarc/마크/Marc_memo.Designer.cs +++ b/unimarc/unimarc/마크/Marc_memo.Designer.cs @@ -31,15 +31,14 @@ namespace UniMarc.마크 { this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); - this.btn_Close = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); this.cb_List = new System.Windows.Forms.ComboBox(); this.btn_ReturnMarc = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); this.panel2.SuspendLayout(); - this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // richTextBox1 @@ -66,19 +65,6 @@ namespace UniMarc.마크 this.panel2.Size = new System.Drawing.Size(800, 450); this.panel2.TabIndex = 2; // - // panel1 - // - this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(this.cb_List); - this.panel1.Controls.Add(this.btn_ReturnMarc); - this.panel1.Controls.Add(this.btn_Close); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(800, 37); - this.panel1.TabIndex = 2; - // // panel3 // this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; @@ -89,15 +75,17 @@ namespace UniMarc.마크 this.panel3.Size = new System.Drawing.Size(800, 413); this.panel3.TabIndex = 2; // - // btn_Close + // panel1 // - this.btn_Close.Location = new System.Drawing.Point(707, 8); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(82, 23); - this.btn_Close.TabIndex = 0; - this.btn_Close.Text = "닫 기"; - this.btn_Close.UseVisualStyleBackColor = true; - this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel1.Controls.Add(this.cb_List); + this.panel1.Controls.Add(this.btn_ReturnMarc); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(800, 37); + this.panel1.TabIndex = 2; // // cb_List // @@ -118,15 +106,15 @@ namespace UniMarc.마크 this.btn_ReturnMarc.UseVisualStyleBackColor = true; this.btn_ReturnMarc.Click += new System.EventHandler(this.btn_ReturnMarc_Click); // - // button1 + // btn_Close // - this.button1.Location = new System.Drawing.Point(395, 8); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 2; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); + this.btn_Close.Location = new System.Drawing.Point(707, 8); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(82, 23); + this.btn_Close.TabIndex = 0; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // // Marc_memo // @@ -139,8 +127,8 @@ namespace UniMarc.마크 this.Text = "메모장"; this.Load += new System.EventHandler(this.Marc_memo_Load); this.panel2.ResumeLayout(false); - this.panel1.ResumeLayout(false); this.panel3.ResumeLayout(false); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -154,6 +142,5 @@ namespace UniMarc.마크 private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.ComboBox cb_List; private System.Windows.Forms.Button btn_ReturnMarc; - private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_memo.cs b/unimarc/unimarc/마크/Marc_memo.cs index 6ac486f..38d3d65 100644 --- a/unimarc/unimarc/마크/Marc_memo.cs +++ b/unimarc/unimarc/마크/Marc_memo.cs @@ -13,9 +13,11 @@ namespace UniMarc.마크 { public partial class Marc_memo : Form { - public Marc_memo() + Marc marc; + public Marc_memo(Marc _marc) { InitializeComponent(); + marc = _marc; } private void Marc_memo_Load(object sender, EventArgs e) @@ -30,6 +32,7 @@ namespace UniMarc.마크 private void btn_ReturnMarc_Click(object sender, EventArgs e) { string text = richTextBox1.Text; + string result = ""; int idx = cb_List.SelectedIndex; if (idx < 0) return; @@ -38,20 +41,21 @@ namespace UniMarc.마크 switch (idx) { case 0: - Hana(text); + result = Hana(text); break; case 1: - Kolis(text); + result = Kolis(text) + "\n"; break; default: break; } } catch { } - btn_ReturnMarc.Text = cb_List.SelectedItem.ToString(); + richTextBox1.Text = ""; + marc.richTextBox1.Text = result.Replace("↔", ""); } #region - void Hana(string text) + string Hana(string text) { string[] arr = text.Split('\n'); @@ -60,28 +64,26 @@ namespace UniMarc.마크 arr[a] = arr[a].Insert(5, "\t"); arr[a] = arr[a].Insert(3, "\t"); } - - richTextBox1.Text = string.Join("▲\n", arr); + return string.Join("▲\n", arr); } - void Kolis(string text) + string Kolis(string text) { string[] arr = text.Split('\n'); - for (int a = 0; a < arr.Length - 1; a++) + for (int a = 0; a < arr.Length; a++) { string[] tag = arr[a].Split('\t'); + if (arr[a] == "") break; + if (tag[1].Length == 0) - { tag[1] = " "; - } + else if (tag[1].Length == 1) - { tag[1] += " "; - } + arr[a] = string.Join("\t", tag); } - - richTextBox1.Text = string.Join("\n", arr); + return string.Join("\n", arr); } #endregion @@ -111,10 +113,5 @@ namespace UniMarc.마크 { this.Close(); } - - private void button1_Click(object sender, EventArgs e) - { - string text = richTextBox1.Text; - } } } diff --git a/unimarc/unimarc/마크/Marc_mkList.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs index 8f8d3a2..44524cd 100644 --- a/unimarc/unimarc/마크/Marc_mkList.Designer.cs +++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs @@ -29,19 +29,276 @@ namespace UniMarc.마크 /// private void InitializeComponent() { + this.panel1 = new System.Windows.Forms.Panel(); + this.rb_autoNum = new System.Windows.Forms.RadioButton(); + this.rb_basicNum = new System.Windows.Forms.RadioButton(); + this.cb_listType = new System.Windows.Forms.ComboBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.chk_countSplit = new System.Windows.Forms.CheckBox(); + this.btn_mkList = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.panel3 = new System.Windows.Forms.Panel(); + this.cb_authorType = new System.Windows.Forms.ComboBox(); + this.cb_FirstBook = new System.Windows.Forms.ComboBox(); + this.cb_FirstAuthor = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.tb_listName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.cb_divNum = new System.Windows.Forms.ComboBox(); + this.cb_divType = new System.Windows.Forms.ComboBox(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.rb_autoNum); + this.panel1.Controls.Add(this.rb_basicNum); + this.panel1.Controls.Add(this.cb_listType); + this.panel1.Location = new System.Drawing.Point(12, 6); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(234, 30); + this.panel1.TabIndex = 0; + // + // rb_autoNum + // + this.rb_autoNum.AutoSize = true; + this.rb_autoNum.Location = new System.Drawing.Point(88, 6); + this.rb_autoNum.Name = "rb_autoNum"; + this.rb_autoNum.Size = new System.Drawing.Size(71, 16); + this.rb_autoNum.TabIndex = 0; + this.rb_autoNum.TabStop = true; + this.rb_autoNum.Text = "자동연번"; + this.rb_autoNum.UseVisualStyleBackColor = true; + // + // rb_basicNum + // + this.rb_basicNum.AutoSize = true; + this.rb_basicNum.Location = new System.Drawing.Point(11, 6); + this.rb_basicNum.Name = "rb_basicNum"; + this.rb_basicNum.Size = new System.Drawing.Size(71, 16); + this.rb_basicNum.TabIndex = 0; + this.rb_basicNum.TabStop = true; + this.rb_basicNum.Text = "기존연번"; + this.rb_basicNum.UseVisualStyleBackColor = true; + // + // cb_listType + // + this.cb_listType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_listType.FormattingEnabled = true; + this.cb_listType.Location = new System.Drawing.Point(165, 4); + this.cb_listType.Name = "cb_listType"; + this.cb_listType.Size = new System.Drawing.Size(61, 20); + this.cb_listType.TabIndex = 1; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.chk_countSplit); + this.panel2.Location = new System.Drawing.Point(252, 6); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(97, 30); + this.panel2.TabIndex = 0; + // + // chk_countSplit + // + this.chk_countSplit.AutoSize = true; + this.chk_countSplit.Location = new System.Drawing.Point(12, 7); + this.chk_countSplit.Name = "chk_countSplit"; + this.chk_countSplit.Size = new System.Drawing.Size(72, 16); + this.chk_countSplit.TabIndex = 0; + this.chk_countSplit.Text = "수량분리"; + this.chk_countSplit.UseVisualStyleBackColor = true; + this.chk_countSplit.Click += new System.EventHandler(this.chk_countSplit_Click); + // + // btn_mkList + // + this.btn_mkList.Location = new System.Drawing.Point(416, 10); + this.btn_mkList.Name = "btn_mkList"; + this.btn_mkList.Size = new System.Drawing.Size(75, 23); + this.btn_mkList.TabIndex = 1; + this.btn_mkList.Text = "목록생성"; + this.btn_mkList.UseVisualStyleBackColor = true; + this.btn_mkList.Click += new System.EventHandler(this.btn_mkList_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(506, 10); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(75, 23); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.cb_authorType); + this.panel3.Controls.Add(this.cb_divType); + this.panel3.Controls.Add(this.cb_divNum); + this.panel3.Controls.Add(this.cb_FirstBook); + this.panel3.Controls.Add(this.cb_FirstAuthor); + this.panel3.Controls.Add(this.label1); + this.panel3.Location = new System.Drawing.Point(12, 42); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(569, 30); + this.panel3.TabIndex = 2; + // + // cb_authorType + // + this.cb_authorType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_authorType.FormattingEnabled = true; + this.cb_authorType.Location = new System.Drawing.Point(136, 4); + this.cb_authorType.Name = "cb_authorType"; + this.cb_authorType.Size = new System.Drawing.Size(171, 20); + this.cb_authorType.TabIndex = 1; + // + // cb_FirstBook + // + this.cb_FirstBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstBook.FormattingEnabled = true; + this.cb_FirstBook.Location = new System.Drawing.Point(313, 4); + this.cb_FirstBook.Name = "cb_FirstBook"; + this.cb_FirstBook.Size = new System.Drawing.Size(61, 20); + this.cb_FirstBook.TabIndex = 1; + // + // cb_FirstAuthor + // + this.cb_FirstAuthor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_FirstAuthor.FormattingEnabled = true; + this.cb_FirstAuthor.Location = new System.Drawing.Point(68, 4); + this.cb_FirstAuthor.Name = "cb_FirstAuthor"; + this.cb_FirstAuthor.Size = new System.Drawing.Size(61, 20); + this.cb_FirstAuthor.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(9, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.TabIndex = 1; + this.label1.Text = "저자기호"; + // + // panel4 + // + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.tb_listName); + this.panel4.Controls.Add(this.label3); + this.panel4.Location = new System.Drawing.Point(12, 78); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(569, 30); + this.panel4.TabIndex = 2; + // + // tb_listName + // + this.tb_listName.Location = new System.Drawing.Point(68, 4); + this.tb_listName.Name = "tb_listName"; + this.tb_listName.Size = new System.Drawing.Size(496, 21); + this.tb_listName.TabIndex = 2; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(9, 8); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(49, 12); + this.label3.TabIndex = 1; + this.label3.Text = "목 록 명"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(12, 147); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(345, 13); + this.label2.TabIndex = 1; + this.label2.Text = "저장된 마크만 반출됩니다. 저자기호를 확인해주세요."; + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(12, 114); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(569, 23); + this.progressBar1.TabIndex = 3; + // + // cb_divNum + // + this.cb_divNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divNum.FormattingEnabled = true; + this.cb_divNum.Location = new System.Drawing.Point(503, 4); + this.cb_divNum.Name = "cb_divNum"; + this.cb_divNum.Size = new System.Drawing.Size(61, 20); + this.cb_divNum.TabIndex = 1; + // + // cb_divType + // + this.cb_divType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_divType.FormattingEnabled = true; + this.cb_divType.Location = new System.Drawing.Point(409, 4); + this.cb_divType.Name = "cb_divType"; + this.cb_divType.Size = new System.Drawing.Size(88, 20); + this.cb_divType.TabIndex = 1; + this.cb_divType.SelectedIndexChanged += new System.EventHandler(this.cb_divType_SelectedIndexChanged); + // // Marc_mkList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(592, 171); + this.Controls.Add(this.progressBar1); + this.Controls.Add(this.panel4); + this.Controls.Add(this.label2); + this.Controls.Add(this.panel3); + this.Controls.Add(this.btn_Close); + this.Controls.Add(this.btn_mkList); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); this.Name = "Marc_mkList"; this.Text = "마크목록생성"; + this.Load += new System.EventHandler(this.Marc_mkList_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.ComboBox cb_listType; + private System.Windows.Forms.RadioButton rb_autoNum; + private System.Windows.Forms.RadioButton rb_basicNum; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.CheckBox chk_countSplit; + private System.Windows.Forms.Button btn_mkList; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.ComboBox cb_authorType; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cb_FirstBook; + private System.Windows.Forms.ComboBox cb_FirstAuthor; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox tb_listName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ProgressBar progressBar1; + private System.Windows.Forms.ComboBox cb_divType; + private System.Windows.Forms.ComboBox cb_divNum; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index b5258a8..6ffd50a 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -1,4 +1,5 @@ -using System; +using ExcelTest; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,292 @@ namespace UniMarc.마크 { public partial class Marc_mkList : Form { - public Marc_mkList() + Marc marc; + public Marc_mkList(Marc _marc) { InitializeComponent(); + marc = _marc; + } + + private void Marc_mkList_Load(object sender, EventArgs e) + { + #region panel1 set + rb_basicNum.Checked = true; + rb_autoNum.Enabled = false; + + string[] type = { "정리" }; + cb_listType.Items.AddRange(type); + cb_listType.SelectedIndex = 0; + #endregion + + #region panel2 set 저자기호 // 분류기호 + + // 저자기호 + string[] First = { "첫음", "초성" }; + cb_FirstAuthor.Items.AddRange(First); + cb_FirstAuthor.SelectedIndex = 0; + + string[] authorType = { + /* 00 */ "이재철 1표", + /* 01 */ "이재철 2표", + /* 02 */ "이재철 3표(실용형 가표)", + /* 03 */ "이재철 4표(실용형 까표)", + /* 04 */ "이재철 5표(완전형 가표)", + /* 05 */ "이재철 6표(완전형 가표)", + /* 06 */ "이재철 7표(실용형 하표)", + /* 07 */ "이재철 7표(동서저자기호표)", + /* 08 */ "이재철 8표(완전형 하표)", + /* 09 */ "이재철 8표(동서저자기호표)", + /* 10 */ "장일세 저자기호표", + /* 11 */ "커터 샌본 저자기호표", + /* 12 */ "엘러드 저자기호법", + /* 13 */ "동서양 저자기호법 (국중)" + }; + cb_authorType.Items.AddRange(authorType); + cb_authorType.SelectedIndex = 0; + + string[] Book = { "첫음", "초성", "중성" }; + cb_FirstBook.Items.AddRange(Book); + cb_FirstBook.SelectedIndex = 0; + + // 분류기호 + string[] divType = { "KDC", "DDC" }; + cb_divType.Items.AddRange(divType); + cb_divType.SelectedIndex = 0; + + string[] divNum = { "4", "5", "6" }; + cb_divNum.Items.AddRange(divNum); + cb_divNum.SelectedIndex = 0; + #endregion + } + + private void cb_divType_SelectedIndexChanged(object sender, EventArgs e) + { + cb_divNum.Items.Clear(); + if (((ComboBox)sender).SelectedIndex == 0) { + string[] divNum = { "4", "5", "6" }; + cb_divNum.Items.AddRange(divNum); + } + else { + string[] divNum = { "21", "22", "23" }; + cb_divNum.Items.AddRange(divNum); + } + } + + private void btn_mkList_Click(object sender, EventArgs e) + { + string listName = tb_listName.Text; + string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + bool isAuthor = false; + bool isBook = false; + if (cb_FirstAuthor.SelectedIndex == 0) + isAuthor = true; + if (cb_FirstBook.SelectedIndex == 0) + isBook = true; + + if (listName == "") { + MessageBox.Show("목록명을 입력해주세요!"); + return; + } + + int[] row = checkGridRow(); + + // TODO: 필터링하여 DB에 집어넣는 작업 필요. + for (int a = 0; a < row.Length; a++) + { + #region 저자기호 + string Author = Take_Tag(marc.List_Book.Rows[a].Cells["db_marc"].Value.ToString(), "245d"); + string Book = Take_Tag(marc.List_Book.Rows[a].Cells["book_name"].Value.ToString(), "245a"); + + char aut; + if (Author.Length <= 1) + aut = Author[0]; + else + aut = Author[1]; + + AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol(); + string res_Author = sb.Author_Fillter(Author[0], isAuthor); + + #region 콤보박스 선택 + if (cb_authorType.SelectedIndex == 0) // 이재철 1표 + Author = sb.Symbol_1(aut); + if (cb_authorType.SelectedIndex == 1) // 이재철 2표 + Author = sb.Symbol_2(aut); + if (cb_authorType.SelectedIndex == 2) // 이재철 3표 + Author = sb.Symbol_3(aut); + if (cb_authorType.SelectedIndex == 3) // 이재철 4표 + Author = sb.Symbol_4(aut); + if (cb_authorType.SelectedIndex == 4) // 이재철 5표 + Author = sb.Symbol_5(aut); + if (cb_authorType.SelectedIndex == 5) // 이재철 6표 + Author = sb.Symbol_6(aut); + if (cb_authorType.SelectedIndex == 6) // 이재철 7표 + Author = sb.Symbol_7(aut); + if (cb_authorType.SelectedIndex == 7) // 이재철 7표 (동양서저자기호표) + Author = sb.Symbol_7_동서(aut); + if (cb_authorType.SelectedIndex == 8) // 이재철 8표 + Author = sb.Symbol_8(aut); + if (cb_authorType.SelectedIndex == 9) // 이재철 8표 (동양서저자기호표) + Author = sb.Symbol_8_동서(aut); + if (cb_authorType.SelectedIndex == 10) // 장일세 + Author = sb.Symbol_Jang(Author); + if (cb_authorType.SelectedIndex == 11) // 커터샌본 + Author = sb.Cutter(Author); + if (cb_authorType.SelectedIndex == 12) // 엘러드 + Author = sb.Elord(Author); + if (cb_authorType.SelectedIndex == 13) // 동서양 저자기호표(국중) + Author = sb.NLK(Author); + + #endregion + Author = Author.Replace("|", ""); + res_Author += Author + sb.Book_Fillter(Book, isBook); + #endregion + + #region 분류기호 + string res_Div = cb_divType.Text + cb_divNum.Text; + #endregion + // DB_UPDATE 수량 체크 + } + } + + string Take_Tag(string marc, string search) + { + string[] ary = marc.Split(''); + string[] tag = res_dir(ary[0].Substring(24)); + (string[] jisi, string[] mrc) = jisi_Symbol(tag, ary); + + string s_tag = ""; + string scan = ""; + try + { + s_tag = search.Substring(0, 3); + scan = "" + search.Substring(3); + } + catch { } + + string result = string.Empty; + + for (int a = 0; a < tag.Length; a++) + { + if (tag[a] == s_tag) + { + string marc_s = mrc[a]; + int start = marc_s.IndexOf(scan); + + if (start < 0) + result = ""; + else + { + int end = marc_s.IndexOf("", start + 2); + if (end < 0) + result = marc_s.Substring(start); + else + result = marc_s.Substring(start, end - start); + break; + } + } + } + return result; + } + #region Take_Tag_Sub + string[] res_dir(string dir) + { + List tmp = new List(); + + for (int a = 0; a < dir.Length; a++) + { + if (a % 12 == 0) + tmp.Add(dir.Substring(a, 3)); + } + return tmp.ToArray(); + } + + (string[], string[]) jisi_Symbol(string[] dir, string[] marc) + { + List res = new List(); + List tmp = new List(); + + for (int a = 0; a < dir.Length; a++) + { + if (dir[a].Length < 1) + break; + + if (marc[a + 1].Contains("")) + { + res.Add(marc[a + 1].Substring(0, 2)); + tmp.Add(marc[a + 1].Substring(2)); + } + else + { + res.Add(""); + tmp.Add(marc[a + 1]); + } + } + return (res.ToArray(), tmp.ToArray()); + } + #endregion + #region mkList_Sub + int[] checkGridRow() + { + List GridRow = new List(); + for (int a = 0; a < marc.List_Book.Rows.Count; a++) + { + if (marc.List_Book.Rows[a].Cells["colCheck"].Value.ToString() == "V") + GridRow.Add(a); + } + + int[] Result = GridRow.ToArray(); + return Result; + } + string Author_Symbol() + { + string result = ""; + + // 저자 첫음 + + // 저자 코드 + + // 도서 첫음 + + return result; + } + /* TODO: 마크 데이터 추출이후 작업 + #region Author_Symbol_Sub + string First_Author() + { + int idx = cb_FirstAuthor.SelectedIndex; + RadioButton rb = new RadioButton(); + if (idx == 0) + rb.Checked = true; + else + rb.Checked = false; + + } + string Author_Type() + { + int idx = cb_cb_authorType.SelectedIndex; + } + string First_Book() + { + int idx = cb_FirstBook.SelectedIndex; + } + #endregion + */ + #endregion + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void chk_countSplit_Click(object sender, EventArgs e) + { + if (chk_countSplit.Checked) + chk_countSplit.Checked = false; + + else + chk_countSplit.Checked = true; } } } diff --git a/unimarc/unimarc/마크/Symbol_Add.cs b/unimarc/unimarc/마크/Symbol_Add.cs index 8fa0689..a02f5cc 100644 --- a/unimarc/unimarc/마크/Symbol_Add.cs +++ b/unimarc/unimarc/마크/Symbol_Add.cs @@ -53,7 +53,6 @@ namespace WindowsFormsApp1.Mac Symbol sb = new Symbol(); string res = tb_author.Text; - string author = tb_author.Text; string book = tb_book.Text; if (tb_author.Text == "") @@ -78,18 +77,13 @@ namespace WindowsFormsApp1.Mac return; } } - char aut, rauto; + char aut; if (tb_author.Text.Length <= 1) - { - rauto = tb_author.Text[0]; aut = tb_author.Text[0]; - } else - { - rauto = tb_author.Text[0]; aut = tb_author.Text[1]; - } - string rb1 = sb.Author_Fillter(rauto, rb_author1); + + string rb1 = sb.Author_Fillter(tb_author.Text[0], rb_author1.Checked); #region 콤보박스 선택 if (cb_symbol.SelectedIndex == 0) // 이재철 1표 @@ -126,8 +120,8 @@ namespace WindowsFormsApp1.Mac #endregion res = res.Replace("|", ""); - res = sb.Moum_Fillter(res, rb_moum1); - string rb2 = sb.Book_Fillter(book, rb_book1); + res = sb.Moum_Fillter(res, rb_moum1.Checked); + string rb2 = sb.Book_Fillter(book, rb_book1.Checked); string result = string.Format("{0}{1}{2}", rb1, res, rb2); diff --git a/unimarc/unimarc/마크/Symbol_Sub.cs b/unimarc/unimarc/마크/Symbol_Sub.cs index 776498d..d14a81b 100644 --- a/unimarc/unimarc/마크/Symbol_Sub.cs +++ b/unimarc/unimarc/마크/Symbol_Sub.cs @@ -1390,7 +1390,7 @@ namespace AuthorSymbol HANGUL_INFO info = HangulJaso.DevideJaso(author[0]); string HNH = info.isHangul; - bool isHangul = false; + bool isHangul; if (HNH == "NH") { author = author.ToUpper(); isHangul = false; @@ -1410,37 +1410,37 @@ namespace AuthorSymbol return Code; } - public string Author_Fillter(char Author, RadioButton rb) + public string Author_Fillter(char Author, bool rb) { - if (rb.Checked) + if (rb) return Author.ToString(); HANGUL_INFO info = HangulJaso.DevideJaso(Author); - if (info.isHangul == "NH" && !rb.Checked) + if (info.isHangul == "NH" && !rb) return ""; return info.chars[0].ToString(); } - public string Book_Fillter(string book, RadioButton rb) + public string Book_Fillter(string book, bool rb) { if (book == "") return ""; HANGUL_INFO info = HangulJaso.DevideJaso(book[0]); - if (info.isHangul == "NH" && !rb.Checked) + if (info.isHangul == "NH" && !rb) return ""; - if (rb.Checked) + if (rb) return book[0].ToString(); return info.chars[0].ToString(); } - public string Moum_Fillter(string Value, RadioButton rb) + public string Moum_Fillter(string Value, bool rb) { string result = Value; - if (rb.Checked) + if (rb) { if (Value.Length == 3) {