diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 22f9d1e..34f27df 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 78f12bd..7eb09cb 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 ac69d36..144e7ac 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 1729f47..9c7dc96 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.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 18ff902..78ad721 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 78f12bd..7eb09cb 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 ac69d36..144e7ac 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 1729f47..9c7dc96 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/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs index 7045470..6e68034 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs @@ -30,6 +30,8 @@ namespace UniMarc.마크 private void InitializeComponent() { this.panel1 = new System.Windows.Forms.Panel(); + this.label12 = new System.Windows.Forms.Label(); + this.cb_grade = new System.Windows.Forms.ComboBox(); this.lbl_SaveData = new System.Windows.Forms.Label(); this.lbl_ClassSymbol = new System.Windows.Forms.Label(); this.lbl_AuthorSymbol = new System.Windows.Forms.Label(); @@ -89,8 +91,6 @@ namespace UniMarc.마크 this.etcBox1 = new System.Windows.Forms.RichTextBox(); this.etcBox2 = new System.Windows.Forms.RichTextBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label12 = new System.Windows.Forms.Label(); - this.cb_grade = new System.Windows.Forms.ComboBox(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); this.panel6.SuspendLayout(); @@ -122,6 +122,30 @@ namespace UniMarc.마크 this.panel1.Size = new System.Drawing.Size(1087, 212); this.panel1.TabIndex = 0; // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label12.Location = new System.Drawing.Point(851, 116); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(62, 12); + this.label12.TabIndex = 321; + this.label12.Text = "마크 등급"; + // + // cb_grade + // + this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_grade.FormattingEnabled = true; + this.cb_grade.Items.AddRange(new object[] { + "A", + "B", + "C", + "D"}); + this.cb_grade.Location = new System.Drawing.Point(845, 130); + this.cb_grade.Name = "cb_grade"; + this.cb_grade.Size = new System.Drawing.Size(75, 20); + this.cb_grade.TabIndex = 320; + // // lbl_SaveData // this.lbl_SaveData.AutoSize = true; @@ -738,30 +762,6 @@ namespace UniMarc.마크 this.tableLayoutPanel1.Size = new System.Drawing.Size(236, 456); this.tableLayoutPanel1.TabIndex = 0; // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label12.Location = new System.Drawing.Point(851, 116); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(62, 12); - this.label12.TabIndex = 321; - this.label12.Text = "마크 등급"; - // - // cb_grade - // - this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_grade.FormattingEnabled = true; - this.cb_grade.Items.AddRange(new object[] { - "D", - "C", - "B", - "A"}); - this.cb_grade.Location = new System.Drawing.Point(845, 130); - this.cb_grade.Name = "cb_grade"; - this.cb_grade.Size = new System.Drawing.Size(75, 20); - this.cb_grade.TabIndex = 320; - // // Marc_Plan_Sub_MarcEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index 6a62df3..90ccd41 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -25,7 +25,6 @@ namespace UniMarc.마크 { InitializeComponent(); marc = _marc; - } private void Marc_mkList_Load(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/Search_Infor.cs b/unimarc/unimarc/마크/Search_Infor.cs index aad80cd..b09b0b3 100644 --- a/unimarc/unimarc/마크/Search_Infor.cs +++ b/unimarc/unimarc/마크/Search_Infor.cs @@ -42,13 +42,16 @@ namespace WindowsFormsApp1.Mac if (cb_data_area.SelectedIndex == 0) { db.DBcon(); - string Area = "`idx`, `grade`, `user`, `date`, `isbn`, `서명`, " - + "`총서명`, `저자`, `출판사`, `가격`, `출판년월`, " - + "`marc`, `비고1`, `비고2`"; (string target, string searchText) = setting_target(true); + string WhereQuery = MakeWHEREQurey(target, searchText); - string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, MakeWHEREQurey(target, searchText)); + string Area = + "`idx`, `grade`, `user`, `date`, `isbn`, `서명`, " + + "`총서명`, `저자`, `출판사`, `가격`, `출판년월`, " + + "`marc`, `marc_chk`, `marc1`, `marc_chk1`, `marc2`, `marc_chk2`, `비고1`, `비고2`"; + + string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, WhereQuery); string db_res = db.DB_Send_CMD_Search(cmd); string[] tmp_arr = db_res.Split('|'); inputGrid_MyDB(tmp_arr); @@ -62,8 +65,9 @@ namespace WindowsFormsApp1.Mac + "`book_comp`, `price`, `years`, `marc`, `etc`"; (string target, string searchText) = setting_target(false); + string WhereQuery = MakeWHEREQurey(target, searchText); - string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, MakeWHEREQurey(target, searchText)); + string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, WhereQuery); string db_res = db.DB_Send_CMD_Search(cmd); string[] tmp_arr = db_res.Split('|'); inputGrid_ClDB(tmp_arr); @@ -107,25 +111,36 @@ namespace WindowsFormsApp1.Mac for (int a = 0; a < arr.Length; a++) { - if (a % 14 == 0) grid[0] = arr[a]; - if (a % 14 == 1) grid[1] = Change_Grade(arr[a]); - if (a % 14 == 2) grid[2] = arr[a]; - if (a % 14 == 3) grid[3] = arr[a]; - if (a % 14 == 4) grid[4] = arr[a]; - if (a % 14 == 5) grid[5] = arr[a]; - if (a % 14 == 6) grid[6] = arr[a]; - if (a % 14 == 7) grid[7] = arr[a]; - if (a % 14 == 8) grid[8] = arr[a]; - if (a % 14 == 9) grid[9] = arr[a]; - if (a % 14 == 10) grid[10] = arr[a]; - if (a % 14 == 11) grid[11] = arr[a]; - if (a % 14 == 12) grid[12] = arr[a]; - if (a % 14 == 13) { + int index = a % 19; + if (index == 0) grid[0] = arr[a]; // idx + if (index == 1) grid[1] = Change_Grade(arr[a]); // 등급 + if (index == 2) grid[2] = arr[a]; // 작성자 + if (index == 3) grid[3] = arr[a]; // 마지막 저장시각 + if (index == 4) grid[4] = arr[a]; // isbn + if (index == 5) grid[5] = arr[a]; // 도서명 + if (index == 6) grid[6] = arr[a]; // 총서명 + if (index == 7) grid[7] = arr[a]; // 저자 + if (index == 8) grid[8] = arr[a]; // 출판사 + if (index == 9) grid[9] = arr[a]; // 가격 + if (index == 10) grid[10] = arr[a]; // 출판년월 + if (index == 12 || index == 14 || index == 16) { // *마크* + string CheckMarc = MyDB_Sub(arr[a - 1], arr[a]); + if (CheckMarc != "false") grid[11] = CheckMarc; + } + if (index == 17) grid[12] = arr[a]; // 비고1 + if (index == 18) { // 비고2 grid[13] = arr[a]; dataGridView1.Rows.Add(grid); } } } + string MyDB_Sub(string marc, string chk) + { + if (chk == "1") + return marc; + else + return "false"; + } void inputGrid_ClDB(string[] arr) {