diff --git a/unimarc/unimarc/Helper_DB.cs b/unimarc/unimarc/Helper_DB.cs index 6ee5b3e..7b80f88 100644 --- a/unimarc/unimarc/Helper_DB.cs +++ b/unimarc/unimarc/Helper_DB.cs @@ -35,7 +35,13 @@ namespace UniMarc return new MySqlConnection(strConnection); } - public static DataTable ExecuteQueryData(string query, MySqlConnection cn = null) + /// + /// 입력한 쿼리의 결과를 데이터테이블로 반환합니다 + /// + /// + /// + /// + public static DataTable ExecuteDataTable(string query, MySqlConnection cn=null) { var bLocalCN = cn == null; DataTable dt = new DataTable(); @@ -68,12 +74,12 @@ namespace UniMarc /// /// /// - public static DataTable GetDT(string tableName, string columns = "*", string wheres = "", string orders = "", MySqlConnection cn = null) + public static DataTable ExecuteQueryData(string tableName, string columns = "*", string wheres = "", string orders = "", MySqlConnection cn = null) { var sql = $"select {columns} from {tableName}"; if (wheres.isEmpty() == false) sql += " where " + wheres; if (orders.isEmpty() == false) sql += " order by " + orders; - return ExecuteQueryData(sql, cn); + return ExecuteDataTable(sql, cn); } diff --git a/unimarc/unimarc/Settings.cs b/unimarc/unimarc/Settings.cs index 39882a8..ce3ac90 100644 --- a/unimarc/unimarc/Settings.cs +++ b/unimarc/unimarc/Settings.cs @@ -5,11 +5,12 @@ namespace UniMarc.Properties { public class UserSetting : AR.Setting { + public int ISBNSearchDelay { get; set; } public string LastSearchTarget { get; set; } public string LastSearchTargetDLS { get; set; } public override void AfterLoad() { - + if (ISBNSearchDelay == 0) ISBNSearchDelay = 500; } public override void AfterSave() diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index 530ccdf..26b0539 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -24,6 +24,7 @@ using System.Globalization; using System.Threading; using System.Data.SqlTypes; using AR; +using System.Runtime.InteropServices.WindowsRuntime; namespace UniMarc { @@ -2339,9 +2340,9 @@ namespace UniMarc /// /// /// - public string Aladin(string Query, string QueryType, string[] Param) + public List Aladin(string Query, string QueryType, string[] Param) { - string result = string.Empty; + List result = new List(); // 쿼리 생성 string key = "ttbgloriabook1512001"; string site = "http://www.aladin.co.kr/ttb/api/ItemSearch.aspx"; @@ -2382,7 +2383,7 @@ namespace UniMarc } catch (Exception ex) { - return ""; + return result; } var json = JsonConvert.SerializeXmlNode(doc); @@ -2400,7 +2401,7 @@ namespace UniMarc } catch { - return ""; + return result; } int length = 0; int ID_length = Param.Length; @@ -2417,6 +2418,7 @@ namespace UniMarc object buf = docs; length = 1; } + // List retval = new List(); for (int a = 0; a < length; a++) { List tmp_data = new List(); @@ -2430,9 +2432,10 @@ namespace UniMarc { tmp_data.Add(docs[a][Param[b]]); } - result += tmp_data[b].Replace("|", "") + "|"; + result.Add(tmp_data[b].Replace("|", "")); + //result += tmp_data[b].Replace("|", "") + "|"; } - result += "\n"; + //result += "\n"; } return result; } diff --git a/unimarc/unimarc/납품관리/Purchase.cs b/unimarc/unimarc/납품관리/Purchase.cs index 7dbdb39..97e165c 100644 --- a/unimarc/unimarc/납품관리/Purchase.cs +++ b/unimarc/unimarc/납품관리/Purchase.cs @@ -924,9 +924,9 @@ namespace UniMarc { string[] param = { "title", "publisher", "author", "priceStandard" }; API api = new API(); - string aladin = api.Aladin(isbn, "ISBN13", param); - - string[] insert = aladin.Split('|'); + var aladinResult = api.Aladin(isbn, "ISBN13", param); + + string[] insert = aladinResult.ToArray();// aladin.Split('|'); if (insert.Length < 2) { return; }; datagrid.Rows[row].Cells["book_name3"].Value = insert[0]; diff --git a/unimarc/unimarc/마크/Check_ISBN.Designer.cs b/unimarc/unimarc/마크/Check_ISBN.Designer.cs index 9aec16e..b124a12 100644 --- a/unimarc/unimarc/마크/Check_ISBN.Designer.cs +++ b/unimarc/unimarc/마크/Check_ISBN.Designer.cs @@ -32,23 +32,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cb_api = new System.Windows.Forms.ComboBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.btn_yes24 = new System.Windows.Forms.Button(); - this.Check_Marc = new System.Windows.Forms.CheckBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.btn_ComparePrice = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -70,6 +53,25 @@ this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.image = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tb_list_name = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.btn_yes24 = new System.Windows.Forms.Button(); + this.Check_Marc = new System.Windows.Forms.CheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btn_ComparePrice = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.tbDelayMs = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -128,187 +130,12 @@ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1630, 591); + this.dataGridView1.Size = new System.Drawing.Size(1753, 591); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // btn_lookup - // - this.btn_lookup.Location = new System.Drawing.Point(693, 4); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.Size = new System.Drawing.Size(99, 23); - this.btn_lookup.TabIndex = 1; - this.btn_lookup.Text = "ISBN 자동 조회"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(577, 5); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(100, 20); - this.cb_filter.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(7, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(45, 12); - this.label1.TabIndex = 3; - this.label1.Text = "목록 명"; - // - // tb_list_name - // - this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(54, 5); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(213, 21); - this.tb_list_name.TabIndex = 4; - this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(518, 9); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색 조건"; - // - // btn_Save - // - this.btn_Save.Location = new System.Drawing.Point(796, 4); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(99, 23); - this.btn_Save.TabIndex = 1; - this.btn_Save.Text = "전 체 저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); - // - // btn_Close - // - this.btn_Close.Location = new System.Drawing.Point(1105, 4); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(99, 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); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(285, 9); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 12); - this.label3.TabIndex = 5; - this.label3.Text = "검색 엔진"; - // - // cb_api - // - this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(344, 5); - this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(160, 20); - this.cb_api.TabIndex = 6; - this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1241, 4); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // - // richTextBox1 - // - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(0, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1632, 100); - this.richTextBox1.TabIndex = 8; - this.richTextBox1.Text = ""; - // - // btn_yes24 - // - this.btn_yes24.Location = new System.Drawing.Point(1002, 4); - this.btn_yes24.Name = "btn_yes24"; - this.btn_yes24.Size = new System.Drawing.Size(99, 23); - this.btn_yes24.TabIndex = 1; - this.btn_yes24.Text = "예스 양식 반출"; - this.btn_yes24.UseVisualStyleBackColor = true; - this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); - // - // Check_Marc - // - this.Check_Marc.AutoSize = true; - this.Check_Marc.Checked = true; - this.Check_Marc.CheckState = System.Windows.Forms.CheckState.Checked; - this.Check_Marc.Enabled = false; - this.Check_Marc.Location = new System.Drawing.Point(1488, 7); - this.Check_Marc.Name = "Check_Marc"; - this.Check_Marc.Size = new System.Drawing.Size(132, 16); - this.Check_Marc.TabIndex = 9; - this.Check_Marc.Text = "마크ISBN 동시 저장"; - this.Check_Marc.UseVisualStyleBackColor = true; - // - // panel1 - // - this.panel1.Controls.Add(this.btn_ComparePrice); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.Check_Marc); - this.panel1.Controls.Add(this.btn_lookup); - this.panel1.Controls.Add(this.btn_Save); - this.panel1.Controls.Add(this.progressBar1); - this.panel1.Controls.Add(this.btn_Close); - this.panel1.Controls.Add(this.cb_api); - this.panel1.Controls.Add(this.btn_yes24); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.cb_filter); - this.panel1.Controls.Add(this.tb_list_name); - this.panel1.Controls.Add(this.label2); - 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(1632, 31); - this.panel1.TabIndex = 10; - // - // btn_ComparePrice - // - this.btn_ComparePrice.Location = new System.Drawing.Point(899, 4); - this.btn_ComparePrice.Name = "btn_ComparePrice"; - this.btn_ComparePrice.Size = new System.Drawing.Size(99, 23); - this.btn_ComparePrice.TabIndex = 10; - this.btn_ComparePrice.Text = "정 가 대 조"; - this.btn_ComparePrice.UseVisualStyleBackColor = true; - this.btn_ComparePrice.Click += new System.EventHandler(this.btn_ComparePrice_Click); - // - // panel2 - // - this.panel2.Controls.Add(this.richTextBox1); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 624); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1632, 100); - this.panel2.TabIndex = 11; - // - // panel3 - // - this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 31); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1632, 593); - this.panel3.TabIndex = 12; - // // idx // this.idx.HeaderText = "idx"; @@ -428,11 +255,206 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // + // btn_lookup + // + this.btn_lookup.Location = new System.Drawing.Point(802, 4); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(99, 23); + this.btn_lookup.TabIndex = 1; + this.btn_lookup.Text = "ISBN 자동 조회"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(577, 5); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(100, 20); + this.cb_filter.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(7, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(45, 12); + this.label1.TabIndex = 3; + this.label1.Text = "목록 명"; + // + // tb_list_name + // + this.tb_list_name.Enabled = false; + this.tb_list_name.Location = new System.Drawing.Point(54, 5); + this.tb_list_name.Name = "tb_list_name"; + this.tb_list_name.Size = new System.Drawing.Size(213, 21); + this.tb_list_name.TabIndex = 4; + this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(518, 9); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "검색 조건"; + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(906, 4); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(99, 23); + this.btn_Save.TabIndex = 1; + this.btn_Save.Text = "전 체 저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(1217, 4); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(97, 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); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(285, 9); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 5; + this.label3.Text = "검색 엔진"; + // + // cb_api + // + this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_api.FormattingEnabled = true; + this.cb_api.Location = new System.Drawing.Point(344, 5); + this.cb_api.Name = "cb_api"; + this.cb_api.Size = new System.Drawing.Size(160, 20); + this.cb_api.TabIndex = 6; + this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(1318, 4); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(219, 23); + this.progressBar1.TabIndex = 7; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1755, 100); + this.richTextBox1.TabIndex = 8; + this.richTextBox1.Text = ""; + // + // btn_yes24 + // + this.btn_yes24.Location = new System.Drawing.Point(1112, 4); + this.btn_yes24.Name = "btn_yes24"; + this.btn_yes24.Size = new System.Drawing.Size(99, 23); + this.btn_yes24.TabIndex = 1; + this.btn_yes24.Text = "예스 양식 반출"; + this.btn_yes24.UseVisualStyleBackColor = true; + this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); + // + // Check_Marc + // + this.Check_Marc.AutoSize = true; + this.Check_Marc.Checked = true; + this.Check_Marc.CheckState = System.Windows.Forms.CheckState.Checked; + this.Check_Marc.Enabled = false; + this.Check_Marc.Location = new System.Drawing.Point(1565, 7); + this.Check_Marc.Name = "Check_Marc"; + this.Check_Marc.Size = new System.Drawing.Size(132, 16); + this.Check_Marc.TabIndex = 9; + this.Check_Marc.Text = "마크ISBN 동시 저장"; + this.Check_Marc.UseVisualStyleBackColor = true; + // + // panel1 + // + this.panel1.Controls.Add(this.tbDelayMs); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.btn_ComparePrice); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.Check_Marc); + this.panel1.Controls.Add(this.btn_lookup); + this.panel1.Controls.Add(this.btn_Save); + this.panel1.Controls.Add(this.progressBar1); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.cb_api); + this.panel1.Controls.Add(this.btn_yes24); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.cb_filter); + this.panel1.Controls.Add(this.tb_list_name); + this.panel1.Controls.Add(this.label2); + 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(1755, 31); + this.panel1.TabIndex = 10; + // + // btn_ComparePrice + // + this.btn_ComparePrice.Location = new System.Drawing.Point(1009, 4); + this.btn_ComparePrice.Name = "btn_ComparePrice"; + this.btn_ComparePrice.Size = new System.Drawing.Size(99, 23); + this.btn_ComparePrice.TabIndex = 10; + this.btn_ComparePrice.Text = "정 가 대 조"; + this.btn_ComparePrice.UseVisualStyleBackColor = true; + this.btn_ComparePrice.Click += new System.EventHandler(this.btn_ComparePrice_Click); + // + // panel2 + // + this.panel2.Controls.Add(this.richTextBox1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 624); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1755, 100); + this.panel2.TabIndex = 11; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 31); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1755, 593); + this.panel3.TabIndex = 12; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(683, 10); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(81, 12); + this.label4.TabIndex = 11; + this.label4.Text = "검색지연(ms)"; + // + // tbDelayMs + // + this.tbDelayMs.Location = new System.Drawing.Point(766, 5); + this.tbDelayMs.Name = "tbDelayMs"; + this.tbDelayMs.Size = new System.Drawing.Size(33, 21); + this.tbDelayMs.TabIndex = 12; + this.tbDelayMs.Text = "100"; + this.tbDelayMs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // Check_ISBN // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1632, 724); + this.ClientSize = new System.Drawing.Size(1755, 724); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -489,5 +511,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn image; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; + private System.Windows.Forms.TextBox tbDelayMs; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN.cs b/unimarc/unimarc/마크/Check_ISBN.cs index 140632f..2bf6431 100644 --- a/unimarc/unimarc/마크/Check_ISBN.cs +++ b/unimarc/unimarc/마크/Check_ISBN.cs @@ -51,6 +51,7 @@ namespace UniMarc private void Check_ISBN_Load(object sender, EventArgs e) { + this.tbDelayMs.Text = PUB.setting.ISBNSearchDelay.ToString(); if (mSearchText != "") { tb_list_name.Text = mSearchText; @@ -172,6 +173,22 @@ namespace UniMarc private void btn_lookup_Click(object sender, EventArgs e) { + if(int.TryParse(tbDelayMs.Text, out int delayMs)==false) + { + UTIL.MsgE("지연시간은 숫자로 입력하세요"); + tbDelayMs.Focus(); + tbDelayMs.SelectAll(); + return; + } + + //지연시간저장 + if(PUB.setting.ISBNSearchDelay != delayMs) + { + PUB.setting.ISBNSearchDelay = delayMs; + PUB.setting.Save(); + } + + if (cb_api.SelectedIndex == -1) { UTIL.MsgE("조건이 선택되지 않았습니다."); return; } if (cb_filter.SelectedIndex == -1) { UTIL.MsgE("조건이 선택되지 않았습니다."); return; } @@ -186,16 +203,16 @@ namespace UniMarc switch (cb_api.SelectedIndex) { case 0: - Aladin_API(dataGridView1); + Aladin_API(dataGridView1, delayMs); break; case 1: - NL_API(dataGridView1); + NL_API(dataGridView1, delayMs); break; case 2: - Daum_API(dataGridView1); + Daum_API(dataGridView1, delayMs); break; case 3: - Naver_API(dataGridView1); + Naver_API(dataGridView1, delayMs); break; } @@ -218,7 +235,7 @@ namespace UniMarc dataGridView1.Rows[a].Cells["api_data"].Value = ""; } } - private void Aladin_API(DataGridView gridview) + private void Aladin_API(DataGridView gridview,int delay_ms) { string temp = string.Empty; string type = string.Empty; @@ -266,7 +283,11 @@ namespace UniMarc } string query = Aladin_Set_query(type, a); - insert_Aladin(api.Aladin(query, type, param), a); + var apiresult = api.Aladin(query, type, param); + insert_Aladin(string.Join("|",apiresult), a); + + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } string Aladin_Set_query(string type, int idx) @@ -288,7 +309,7 @@ namespace UniMarc return result; } - private void NL_API(DataGridView gridView) + private void NL_API(DataGridView gridView, int delay_ms) { // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / @@ -362,9 +383,11 @@ namespace UniMarc } } + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } - private void Naver_API(DataGridView gridview) + private void Naver_API(DataGridView gridview, int delay_ms) { // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 @@ -405,10 +428,11 @@ namespace UniMarc #endregion string result = api.Naver(Target, "query", param); insert_Naver(result, a); - Thread.Sleep(700); + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } - private void Daum_API(DataGridView gridview) + private void Daum_API(DataGridView gridview, int delay_ms) { string[] param = { "title", "authors", "publisher", "isbn", "price", "datetime", "status", "thumbnail" }; @@ -447,6 +471,8 @@ namespace UniMarc } string result = api.Daum(query, type, param); insert_Daum(result, a); + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } diff --git a/unimarc/unimarc/마크/Check_ISBN2.Designer.cs b/unimarc/unimarc/마크/Check_ISBN2.Designer.cs index 31d1123..88f84dc 100644 --- a/unimarc/unimarc/마크/Check_ISBN2.Designer.cs +++ b/unimarc/unimarc/마크/Check_ISBN2.Designer.cs @@ -34,6 +34,37 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Check_ISBN2)); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tb_list_name = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.btn_yes24 = new System.Windows.Forms.Button(); + this.Check_Marc = new System.Windows.Forms.CheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.tbDelayMs = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.btn_ComparePrice = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); + this.bs1 = new System.Windows.Forms.BindingSource(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.link_url = new System.Windows.Forms.LinkLabel(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -55,34 +86,7 @@ this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.image = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cb_api = new System.Windows.Forms.ComboBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.btn_yes24 = new System.Windows.Forms.Button(); - this.Check_Marc = new System.Windows.Forms.CheckBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.btn_ComparePrice = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); - this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.bs1 = new System.Windows.Forms.BindingSource(this.components); + this.dvc_search_description = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -127,7 +131,8 @@ this.category, this.sold_out, this.image, - this.api_data}); + this.api_data, + this.dvc_search_description}); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; this.dataGridView1.Location = new System.Drawing.Point(0, 0); @@ -144,12 +149,320 @@ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1630, 566); + this.dataGridView1.Size = new System.Drawing.Size(1759, 566); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // btn_lookup + // + this.btn_lookup.Location = new System.Drawing.Point(805, 4); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(99, 23); + this.btn_lookup.TabIndex = 1; + this.btn_lookup.Text = "검색"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(577, 5); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(100, 20); + this.cb_filter.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(7, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(45, 12); + this.label1.TabIndex = 3; + this.label1.Text = "목록 명"; + // + // tb_list_name + // + this.tb_list_name.Enabled = false; + this.tb_list_name.Location = new System.Drawing.Point(54, 5); + this.tb_list_name.Name = "tb_list_name"; + this.tb_list_name.Size = new System.Drawing.Size(213, 21); + this.tb_list_name.TabIndex = 4; + this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(518, 9); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "검색 조건"; + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(908, 4); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(99, 23); + this.btn_Save.TabIndex = 1; + this.btn_Save.Text = "전 체 저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(1215, 4); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(78, 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); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(285, 9); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 5; + this.label3.Text = "검색 엔진"; + // + // cb_api + // + this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_api.FormattingEnabled = true; + this.cb_api.Location = new System.Drawing.Point(344, 5); + this.cb_api.Name = "cb_api"; + this.cb_api.Size = new System.Drawing.Size(160, 20); + this.cb_api.TabIndex = 6; + this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(1299, 4); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(179, 23); + this.progressBar1.TabIndex = 7; + // + // richTextBox1 + // + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 23); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1761, 77); + this.richTextBox1.TabIndex = 8; + this.richTextBox1.Text = ""; + // + // btn_yes24 + // + this.btn_yes24.Location = new System.Drawing.Point(1114, 4); + this.btn_yes24.Name = "btn_yes24"; + this.btn_yes24.Size = new System.Drawing.Size(99, 23); + this.btn_yes24.TabIndex = 1; + this.btn_yes24.Text = "예스 양식 반출"; + this.btn_yes24.UseVisualStyleBackColor = true; + this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); + // + // Check_Marc + // + this.Check_Marc.AutoSize = true; + this.Check_Marc.Checked = true; + this.Check_Marc.CheckState = System.Windows.Forms.CheckState.Checked; + this.Check_Marc.Enabled = false; + this.Check_Marc.Location = new System.Drawing.Point(1488, 7); + this.Check_Marc.Name = "Check_Marc"; + this.Check_Marc.Size = new System.Drawing.Size(132, 16); + this.Check_Marc.TabIndex = 9; + this.Check_Marc.Text = "마크ISBN 동시 저장"; + this.Check_Marc.UseVisualStyleBackColor = true; + // + // panel1 + // + this.panel1.Controls.Add(this.tbDelayMs); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.btn_ComparePrice); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.Check_Marc); + this.panel1.Controls.Add(this.btn_lookup); + this.panel1.Controls.Add(this.btn_Save); + this.panel1.Controls.Add(this.progressBar1); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Controls.Add(this.cb_api); + this.panel1.Controls.Add(this.btn_yes24); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.cb_filter); + this.panel1.Controls.Add(this.tb_list_name); + this.panel1.Controls.Add(this.label2); + 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(1761, 31); + this.panel1.TabIndex = 10; + // + // tbDelayMs + // + this.tbDelayMs.Location = new System.Drawing.Point(766, 4); + this.tbDelayMs.Name = "tbDelayMs"; + this.tbDelayMs.Size = new System.Drawing.Size(33, 21); + this.tbDelayMs.TabIndex = 14; + this.tbDelayMs.Text = "100"; + this.tbDelayMs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(683, 9); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(81, 12); + this.label4.TabIndex = 13; + this.label4.Text = "검색지연(ms)"; + // + // btn_ComparePrice + // + this.btn_ComparePrice.Location = new System.Drawing.Point(1011, 4); + this.btn_ComparePrice.Name = "btn_ComparePrice"; + this.btn_ComparePrice.Size = new System.Drawing.Size(99, 23); + this.btn_ComparePrice.TabIndex = 10; + this.btn_ComparePrice.Text = "정 가 대 조"; + this.btn_ComparePrice.UseVisualStyleBackColor = true; + this.btn_ComparePrice.Click += new System.EventHandler(this.btn_ComparePrice_Click); + // + // panel2 + // + this.panel2.Controls.Add(this.richTextBox1); + this.panel2.Controls.Add(this.link_url); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 624); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1761, 100); + this.panel2.TabIndex = 11; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Controls.Add(this.bindingNavigator1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 31); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1761, 593); + this.panel3.TabIndex = 12; + // + // bindingNavigator1 + // + this.bindingNavigator1.AddNewItem = null; + this.bindingNavigator1.BindingSource = this.bs1; + this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem; + this.bindingNavigator1.DeleteItem = null; + this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2}); + this.bindingNavigator1.Location = new System.Drawing.Point(0, 566); + this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bindingNavigator1.Name = "bindingNavigator1"; + this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem; + this.bindingNavigator1.Size = new System.Drawing.Size(1759, 25); + this.bindingNavigator1.TabIndex = 1; + this.bindingNavigator1.Text = "bindingNavigator1"; + // + // bs1 + // + this.bs1.CurrentChanged += new System.EventHandler(this.bs1_CurrentChanged); + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // link_url + // + this.link_url.Dock = System.Windows.Forms.DockStyle.Top; + this.link_url.Location = new System.Drawing.Point(0, 0); + this.link_url.Name = "link_url"; + this.link_url.Size = new System.Drawing.Size(1761, 23); + this.link_url.TabIndex = 9; + this.link_url.TabStop = true; + this.link_url.Text = "linkLabel1"; + this.link_url.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.link_url.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_url_LinkClicked); + // // idx // this.idx.DataPropertyName = "idx"; @@ -290,283 +603,17 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // - // btn_lookup + // dvc_search_description // - this.btn_lookup.Location = new System.Drawing.Point(693, 4); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.Size = new System.Drawing.Size(99, 23); - this.btn_lookup.TabIndex = 1; - this.btn_lookup.Text = "ISBN 자동 조회"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(577, 5); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(100, 20); - this.cb_filter.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(7, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(45, 12); - this.label1.TabIndex = 3; - this.label1.Text = "목록 명"; - // - // tb_list_name - // - this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(54, 5); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(213, 21); - this.tb_list_name.TabIndex = 4; - this.tb_list_name.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_list_name_KeyDown); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(518, 9); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색 조건"; - // - // btn_Save - // - this.btn_Save.Location = new System.Drawing.Point(796, 4); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(99, 23); - this.btn_Save.TabIndex = 1; - this.btn_Save.Text = "전 체 저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); - // - // btn_Close - // - this.btn_Close.Location = new System.Drawing.Point(1105, 4); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(99, 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); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(285, 9); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 12); - this.label3.TabIndex = 5; - this.label3.Text = "검색 엔진"; - // - // cb_api - // - this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(344, 5); - this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(160, 20); - this.cb_api.TabIndex = 6; - this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1241, 4); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // - // richTextBox1 - // - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(0, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1632, 100); - this.richTextBox1.TabIndex = 8; - this.richTextBox1.Text = ""; - // - // btn_yes24 - // - this.btn_yes24.Location = new System.Drawing.Point(1002, 4); - this.btn_yes24.Name = "btn_yes24"; - this.btn_yes24.Size = new System.Drawing.Size(99, 23); - this.btn_yes24.TabIndex = 1; - this.btn_yes24.Text = "예스 양식 반출"; - this.btn_yes24.UseVisualStyleBackColor = true; - this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click); - // - // Check_Marc - // - this.Check_Marc.AutoSize = true; - this.Check_Marc.Checked = true; - this.Check_Marc.CheckState = System.Windows.Forms.CheckState.Checked; - this.Check_Marc.Enabled = false; - this.Check_Marc.Location = new System.Drawing.Point(1488, 7); - this.Check_Marc.Name = "Check_Marc"; - this.Check_Marc.Size = new System.Drawing.Size(132, 16); - this.Check_Marc.TabIndex = 9; - this.Check_Marc.Text = "마크ISBN 동시 저장"; - this.Check_Marc.UseVisualStyleBackColor = true; - // - // panel1 - // - this.panel1.Controls.Add(this.btn_ComparePrice); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.Check_Marc); - this.panel1.Controls.Add(this.btn_lookup); - this.panel1.Controls.Add(this.btn_Save); - this.panel1.Controls.Add(this.progressBar1); - this.panel1.Controls.Add(this.btn_Close); - this.panel1.Controls.Add(this.cb_api); - this.panel1.Controls.Add(this.btn_yes24); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.cb_filter); - this.panel1.Controls.Add(this.tb_list_name); - this.panel1.Controls.Add(this.label2); - 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(1632, 31); - this.panel1.TabIndex = 10; - // - // btn_ComparePrice - // - this.btn_ComparePrice.Location = new System.Drawing.Point(899, 4); - this.btn_ComparePrice.Name = "btn_ComparePrice"; - this.btn_ComparePrice.Size = new System.Drawing.Size(99, 23); - this.btn_ComparePrice.TabIndex = 10; - this.btn_ComparePrice.Text = "정 가 대 조"; - this.btn_ComparePrice.UseVisualStyleBackColor = true; - this.btn_ComparePrice.Click += new System.EventHandler(this.btn_ComparePrice_Click); - // - // panel2 - // - this.panel2.Controls.Add(this.richTextBox1); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 624); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1632, 100); - this.panel2.TabIndex = 11; - // - // panel3 - // - this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Controls.Add(this.bindingNavigator1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 31); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1632, 593); - this.panel3.TabIndex = 12; - // - // bindingNavigator1 - // - this.bindingNavigator1.AddNewItem = null; - this.bindingNavigator1.BindingSource = this.bs1; - this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem; - this.bindingNavigator1.DeleteItem = null; - this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2}); - this.bindingNavigator1.Location = new System.Drawing.Point(0, 566); - this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bindingNavigator1.Name = "bindingNavigator1"; - this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem; - this.bindingNavigator1.Size = new System.Drawing.Size(1630, 25); - this.bindingNavigator1.TabIndex = 1; - this.bindingNavigator1.Text = "bindingNavigator1"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.dvc_search_description.DataPropertyName = "search_description"; + this.dvc_search_description.HeaderText = "검색 설명"; + this.dvc_search_description.Name = "dvc_search_description"; // // Check_ISBN2 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1632, 724); + this.ClientSize = new System.Drawing.Size(1761, 724); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -607,6 +654,20 @@ private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Button btn_ComparePrice; + private System.Windows.Forms.BindingNavigator bindingNavigator1; + private System.Windows.Forms.BindingSource bs1; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.TextBox tbDelayMs; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.LinkLabel link_url; private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn isbn; @@ -628,16 +689,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn image; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; - private System.Windows.Forms.BindingNavigator bindingNavigator1; - private System.Windows.Forms.BindingSource bs1; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_search_description; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN2.cs b/unimarc/unimarc/마크/Check_ISBN2.cs index 13c0fcd..ffede92 100644 --- a/unimarc/unimarc/마크/Check_ISBN2.cs +++ b/unimarc/unimarc/마크/Check_ISBN2.cs @@ -16,9 +16,6 @@ namespace UniMarc { public partial class Check_ISBN2 : Form { - Main main; - List_aggregation list_agg; - Commodity_registration cr; Helper_DB db = new Helper_DB(); public string compidx; public string list_name = string.Empty; @@ -30,58 +27,29 @@ namespace UniMarc BindingList bookList = new BindingList(); - public Check_ISBN2(Main _main,string pSearchText = "",string pListIDX = "") + public Check_ISBN2(string pSearchText = "", string pListIDX = "") { InitializeComponent(); - main = _main; compidx = PUB.user.CompanyIdx; mSearchText = pSearchText; mListIDX = pListIDX; } - public Check_ISBN2(List_aggregation _list_agg) - { - InitializeComponent(); - list_agg = _list_agg; - compidx = list_agg.compidx; - } - public Check_ISBN2(Commodity_registration _cr) - { - InitializeComponent(); - cr = _cr; - compidx = cr.comp_idx; - } + private void Check_ISBN_Load(object sender, EventArgs e) { bs1.DataSource = bookList; + dataGridView1.AutoGenerateColumns = false; dataGridView1.DataSource = bs1; dataGridView1.DataBindingComplete += DataGridView1_DataBindingComplete; + tbDelayMs.Text = PUB.setting.ISBNSearchDelay.ToString(); if (mSearchText != "") { tb_list_name.Text = mSearchText; DataLoad(mSearchText, mListIDX); } - } - public void DataLoad() - { - tb_list_name.Text = list_name; - cb_api.Items.Clear(); - - cb_api.Items.AddRange(list_combo); - - db.DBcon(); - string[] search_tbl = { "compidx", "list_name" }; - string[] search_col = { compidx, list_name }; - string search_data = "`idx`, `header`, `num`, `isbn`, `book_name`, `author`, `book_comp`, " + - "`count`, `pay`, `total`, `import`, `price`, " + - "`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`"; - - string cmd = db.More_DB_Search("Obj_List_Book", search_tbl, search_col, search_data); - string db_res = db.DB_Send_CMD_Search(cmd); - string[] data = db_res.Split('|'); - made_Grid(data); } public void DataLoad(string ListName, string l_idx) @@ -98,44 +66,49 @@ namespace UniMarc string[] search_col = { compidx, l_idx }; string search_data = "`idx`, `header`, `num`, `isbn_marc`, `book_name`, `author`, `book_comp`, " + "`count`, `pay`, `total`, `import`, `price`, " + - "`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`"; + "`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`,`search_book_name`,`search_author`,`search_book_comp`,`search_description`,`search_url`"; string cmd = db.More_DB_Search("Obj_List_Book", search_tbl, search_col, search_data); - string db_res = db.DB_Send_CMD_Search(cmd); - string[] data = db_res.Split('|'); - made_Grid(data); + var dt = Helper_DB.ExecuteDataTable(cmd); + made_Grid(dt); } #region Load_Sub - void made_Grid(string[] data) + void made_Grid(DataTable datas) { - /* 번호 isbn 도서명 저자 출판사 - * 수량 단가 합계 상태 정가 - * 비고 발행일 % 도서분류 */ - - int sdc = 18; // search_data_count - for (int a = 0; a < data.Length; a += sdc) + this.dataGridView1.AutoGenerateColumns = false; + if (datas == null) { - if (a + 17 >= data.Length) break; + UTIL.MsgE("자료가 없습니다"); + return; + } + foreach (DataRow row in datas.Rows) + { var item = new IsbnGridItem(); - item.idx = data[a]; - item.num = data[a + 1] + " " + data[a + 2]; // header + num - item.isbn = data[a + 3]; - item.book_name = data[a + 4]; - item.author = data[a + 5]; - item.book_comp = data[a + 6]; - item.count = data[a + 7]; - item.unit = data[a + 8]; - item.total = data[a + 9]; - item.condition = data[a + 10]; - item.price = data[a + 11]; - item.etc = data[a + 12]; - item.pubDate = data[a + 13]; - item.persent = data[a + 14]; - item.category = data[a + 15]; - item.image = data[a + 16]; - - string setBookName = data[a + 17]; + item.idx = row["idx"]?.ToString() ?? string.Empty; + item.num = (row["header"]?.ToString() ?? string.Empty) + " " + (row["num"]?.ToString() ?? string.Empty); // header + num + item.isbn = row["isbn_marc"]?.ToString() ?? string.Empty; + item.book_name = row["book_name"]?.ToString() ?? string.Empty; + item.author = row["author"]?.ToString() ?? string.Empty; + item.book_comp = row["book_comp"]?.ToString() ?? string.Empty; + item.count = row["count"]?.ToString() ?? string.Empty; + item.unit = row["pay"]?.ToString() ?? string.Empty; + item.total = row["total"]?.ToString() ?? string.Empty; + item.condition = row["import"]?.ToString() ?? string.Empty; + item.price = row["price"]?.ToString() ?? string.Empty; + item.etc = row["etc"]?.ToString() ?? string.Empty; + item.pubDate = row["pubDate"]?.ToString() ?? string.Empty; + item.persent = row["persent"]?.ToString() ?? string.Empty; + item.category = row["category"]?.ToString() ?? string.Empty; + item.image = row["image_url"]?.ToString() ?? string.Empty; + + item.search_book_name = row["search_book_name"]?.ToString() ?? string.Empty; + item.search_author = row["search_author"]?.ToString() ?? string.Empty; + item.search_book_comp = row["search_book_comp"]?.ToString() ?? string.Empty; + item.search_description = row["search_description"]?.ToString() ?? string.Empty; + item.search_link = row["search_url"]?.ToString() ?? string.Empty; + + string setBookName = row["set_book_name"]?.ToString() ?? string.Empty; if (!string.IsNullOrEmpty(setBookName)) { item.book_name = setBookName; @@ -167,7 +140,7 @@ namespace UniMarc } } } - + void Set_grid() { for (int a = 0; a < dataGridView1.Columns.Count; a++) @@ -195,6 +168,22 @@ namespace UniMarc private void btn_lookup_Click(object sender, EventArgs e) { + if (int.TryParse(tbDelayMs.Text, out int delayMs) == false) + { + UTIL.MsgE("지연시간은 숫자로 입력하세요"); + tbDelayMs.Focus(); + tbDelayMs.SelectAll(); + return; + } + + //지연시간저장 + if (PUB.setting.ISBNSearchDelay != delayMs) + { + PUB.setting.ISBNSearchDelay = delayMs; + PUB.setting.Save(); + } + + if (cb_api.SelectedIndex == -1) { UTIL.MsgE("조건이 선택되지 않았습니다."); return; } if (cb_filter.SelectedIndex == -1) { UTIL.MsgE("조건이 선택되지 않았습니다."); return; } @@ -209,16 +198,16 @@ namespace UniMarc switch (cb_api.SelectedIndex) { case 0: - Aladin_API(); + Aladin_API(delayMs); break; case 1: - NL_API(); + NL_API(delayMs); break; case 2: - Daum_API(); + Daum_API(delayMs); break; case 3: - Naver_API(); + Naver_API(delayMs); break; } @@ -241,15 +230,15 @@ namespace UniMarc item.api_data = ""; } } - private void Aladin_API() + private void Aladin_API(int delay_ms) { string temp = string.Empty; string type = string.Empty; // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 - string[] param = { "title", "author", "publisher", "isbn13", "priceStandard", - "pubDate", "categoryName", "stockStatus", "cover" }; + string[] param = { "title", "author", "publisher", "isbn13", "priceStandard", + "pubDate", "categoryName", "stockStatus", "cover" ,"description","link"}; API api = new API(); switch (cb_filter.SelectedIndex) @@ -267,7 +256,7 @@ namespace UniMarc type = "ISBN13"; break; } - for (int a = 0; a < bookList.Count; a++) + for (int a = 0; a < bookList.Count; a++) { progressBar1.PerformStep(); @@ -276,13 +265,15 @@ namespace UniMarc item.isbn = ""; string isbn = item.isbn; - if (cb_filter.SelectedIndex == 3) { + if (cb_filter.SelectedIndex == 3) + { if (!CheckData(isbn)) continue; else dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Empty; } - else { + else + { if (CheckData(isbn)) continue; else @@ -290,7 +281,10 @@ namespace UniMarc } string query = Aladin_Set_query(type, a); - insert_Aladin(api.Aladin(query, type, param), a); + var apireseult = api.Aladin(query, type, param); + insert_Aladin(apireseult, a); + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } string Aladin_Set_query(string type, int idx) @@ -312,7 +306,7 @@ namespace UniMarc return result; } - private void NL_API() + private void NL_API(int delay_ms) { // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / @@ -376,7 +370,8 @@ namespace UniMarc grid[8] = tmp_Array[b]; dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; - if (ArrayLength < 10) { + if (ArrayLength < 10) + { input_api(grid, a, grid[5]); break; } @@ -385,15 +380,17 @@ namespace UniMarc bookList[a].api_data += string.Join("|", grid) + "|"; } } - } + + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } - private void Naver_API() + private void Naver_API(int delay_ms) { // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 - string[] param = { "title", "author", "publisher", "isbn", "discount", + string[] param = { "title", "author", "publisher", "isbn", "discount", "pubdate", "discount", "image"}; API api = new API(); @@ -431,18 +428,20 @@ namespace UniMarc #endregion string result = api.Naver(Target, "query", param); insert_Naver(result, a); - Thread.Sleep(700); + + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } - private void Daum_API() + private void Daum_API(int delay_ms) { - string[] param = { "title", "authors", "publisher", "isbn", "price", + string[] param = { "title", "authors", "publisher", "isbn", "price", "datetime", "status", "thumbnail" }; string type = string.Empty; string query = string.Empty; API api = new API(); - for(int a = 0; a < bookList.Count; a++) + for (int a = 0; a < bookList.Count; a++) { progressBar1.PerformStep(); @@ -474,6 +473,9 @@ namespace UniMarc } string result = api.Daum(query, type, param); insert_Daum(result, a); + + if (delay_ms > 0) + System.Threading.Thread.Sleep(delay_ms); } } @@ -484,37 +486,41 @@ namespace UniMarc return true; } - void insert_Aladin(string data, int row) + void insert_Aladin(List data, int row) { if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; } dataGridView1.Rows[row].Selected = true; - if (data.Length > 0) { - bookList[row].api_data = data; + if (data.Count > 0) + { + bookList[row].api_data = string.Join("|", data); dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; } - string[] insert = data.Split('|'); + //string[] insert = data.Split('|'); - if (data == "") { return; } + if (data.Any() == false) { return; } string newstring; - try { + try + { // pubDate형 보기편하게 DateTime형으로 재정리 newstring = String.Format("{0:yyyy/MM/dd HH:mm}", - DateTime.Parse(insert[5].Remove(insert[5].IndexOf(" G")))); + DateTime.Parse(data[5].Remove(data[5].IndexOf(" G")))); } - catch { - newstring = insert[5]; + catch + { + newstring = data[5]; } - insert[6] = Aladin_CategorySort(insert[6]); + data[6] = Aladin_CategorySort(data[6]); - if (insert.Length > 10) { + if (data.Count > 11) + { return; } if (cb_filter.SelectedItem.ToString() == "별치조사") - input_api_aladin(insert, row, newstring); - input_api(insert, row, newstring); + input_api_aladin(data.ToArray(), row, newstring); + input_api(data.ToArray(), row, newstring); /* if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; } @@ -628,7 +634,7 @@ namespace UniMarc } catch (FormatException fe) { - + } input_api(grid, row, newstring); @@ -709,7 +715,8 @@ namespace UniMarc else if (book_comp.Contains(value[2])) chk[2] = true; else if (value[2].Contains(book_comp)) chk[2] = true; - if (chk[0] && chk[1] && chk[2]) { + if (chk[0] && chk[1] && chk[2]) + { item.search_book_name = value[0]; item.search_author = value[1]; @@ -721,13 +728,25 @@ namespace UniMarc item.sold_out = value[7]; item.image = value[8]; + if (value.Length > 9) + item.search_description = value[9]; + else + item.search_description = string.Empty; + + if (value.Length > 10) + item.search_link = value[10]; + else + item.search_link = string.Empty; + + dataGridView1.Rows[idx].DefaultCellStyle.BackColor = Color.Yellow; } } private void btn_Save_Click(object sender, EventArgs e) { - string[] Edit_tbl = { "isbn", "book_name", "author", "book_comp", "pay", "price", "pubDate", "category", "image_url", "sold_out", "etc" }; + string[] Edit_tbl = { "isbn", "book_name", "author", "book_comp", "pay", "price", "pubDate", "category", "image_url", "sold_out", "etc", + "search_book_name","search_author","search_book_comp"}; for (int a = 0; a < bookList.Count; a++) @@ -735,11 +754,6 @@ namespace UniMarc var item = bookList[a]; if (string.IsNullOrEmpty(item.isbn)) continue; - if (main != null) - Edit_tbl[0] = "isbn_marc"; - else - Edit_tbl[0] = "isbn"; - string[] Edit_Col = { item.isbn, item.book_name, @@ -751,7 +765,10 @@ namespace UniMarc item.category, item.image, item.sold_out, - item.etc + item.etc, + item.search_book_name, + item.search_author, + item.search_book_comp }; string[] Search_tbl = { "idx", "list_name", "compidx" }; @@ -763,11 +780,12 @@ namespace UniMarc string U_cmd = db.More_Update("Obj_List_Book", Edit_tbl, Edit_Col, Search_tbl, Search_col, 1); Helper_DB.ExcuteNonQuery(U_cmd); - if (Check_Marc.Checked) { + if (Check_Marc.Checked) + { string CMcmd = string.Format("UPDATE `Obj_List_Book` SET `isbn_marc` = \"{0}\" WHERE `idx` = \"{1}\"", Edit_Col[0], Search_col[0]); Helper_DB.ExcuteNonQuery(CMcmd); - } + } } UTIL.MsgI("저장되었습니다!"); save = true; @@ -853,11 +871,13 @@ namespace UniMarc private void cb_api_SelectedIndexChanged(object sender, EventArgs e) { cb_filter.Items.Clear(); - if (cb_api.SelectedIndex == 0) { + if (cb_api.SelectedIndex == 0) + { string[] aladin = { "도서명", "저자", "출판사", "별치조사" }; cb_filter.Items.AddRange(aladin); } - else { + else + { string[] sub = { "도서명", "저자", "출판사" }; cb_filter.Items.AddRange(sub); } @@ -865,19 +885,23 @@ namespace UniMarc private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { rowidx = e.RowIndex; - if (rowidx < 0) { + if (rowidx < 0) + { return; } richTextBox1.Text += dataGridView1.Rows[rowidx].Cells["etc"].Value.ToString().Contains("세트분할").ToString(); - if (dataGridView1.Rows[rowidx].Cells["api_data"].Value == null) { + if (dataGridView1.Rows[rowidx].Cells["api_data"].Value == null) + { return; } richTextBox1.Text = dataGridView1.Rows[rowidx].Cells["api_data"].Value.ToString(); } private void Check_ISBN_FormClosing(object sender, FormClosingEventArgs e) { - if (!save) { - if (UTIL.MsgQ("데이터가 저장되지않았습니다!\n종료하시겠습니까?") == DialogResult.No) { + if (!save) + { + if (UTIL.MsgQ("데이터가 저장되지않았습니다!\n종료하시겠습니까?") == DialogResult.No) + { e.Cancel = true; } } @@ -917,5 +941,28 @@ namespace UniMarc dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Orange; } } + + private void bs1_CurrentChanged(object sender, EventArgs e) + { + // + var item = bs1.Current as IsbnGridItem; + if (item == null) + { + link_url.Text = ""; + } + else + { + link_url.Text = item.search_link; + } + + } + + private void link_url_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var url = link_url.Text; + if (url.isEmpty()) return; + System.Diagnostics.Process.Start(url); + + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN2.resx b/unimarc/unimarc/마크/Check_ISBN2.resx index 0f43f13..9311edf 100644 --- a/unimarc/unimarc/마크/Check_ISBN2.resx +++ b/unimarc/unimarc/마크/Check_ISBN2.resx @@ -180,6 +180,9 @@ True + + True + 17, 17 @@ -189,42 +192,42 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAExSURBVDhPY2AYNKBw1vP/TQue/8+c+Pg/uhwMhLc/wCnH - kDvz2f9VR97/x6UovvvB/+CGa1jlwCBjytP/C/d9wKoovufh/6X7///3r76AIQcHCT1P/k/b8h5DUUT7 - fbDmzFn//3uVnsBtQGTXo/+9qz+gKAptvQfW3Lru/3//zr//XfIP4DYgsPnh/7r57+CKglvu/l+09/// - jnX//2fM+fnfru7nf/uM7bgN8Ki6/z9/2hsURXbFt/+nz/n937/r23+dwnf/LRLW4zbAvvTu/+zJrzEU - 6aec/29S9OK/Stan/8aRy3AbYJF3539q/2usigySTvyXTfv6Xzd4HoYcHBhm3f4f1vISpyL91Mv/NXyn - YZUDA520G//9qh/iVaTiMQGnHINT7pX/IAV4FQ1KAADwdsCrWJS2HgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+ + +8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A + ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/ + +4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/ + xpHLcBtgkXfnf2r/a6yKDJJO/JdN+/pfN3gehhwcGGbd/h/W8hKnIv3Uy/81fKdhlQMDnbQb//2qH+JV + pOIxAaccg1Pulf8gBXgVDUoAAPB2wKtYlLYeAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY2AYMiC8/cF/dDGiQXz3g//BDdfIMyC+5+H/ - pfv///evvkC6ARHt98GaM2f9/+9VeoI0A0Jb74E1t677/9+/8+9/l/wDxBsQ3HL3/6K9//93rPv/P2PO - z/92dT//22dsJ94AELArvv0/fc7v//5d3/7rFL77b5GwnjQDQEA/5fx/k6IX/1WyPv03jlxGugEgYJB0 - 4r9s2tf/usHzyDMABPRTL//X8J1GvgEgoOIxgTIDBi8AANAUYJgsLP+3AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33 + wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ + sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE + 9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACkSURBVDhPY2AYdKBw1vP/6GIkgdyZz/4ndN8j35CMKU// - z9v/+39C1x3yDEnoefJ/9r5f/zu3/v3vVnqZdEMiux79n7Lt1/+SpX//J0z/+98m9yxphgQ2P/zfuvY9 - WLNxyZf/0tHX/htHLiPeEI+q+/9L5r6Da1Z06SFeMwjYl979H9jyjDzNIGCRd+e/TcEV8jSDgGHWbfI1 - g4BO2g3yNQ9NAACgfl+gY6ualwAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5 + 8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu + I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+ + X6Bjq5qXAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAErSURBVDhPY2AYVKBw1vP/6GIwAJJrWvD8f+bExzjVMOTO - fPY/ofseVgUguVVH3v8Pb3+AVR4MMqY8/T9v/+//CV13MBSB5Bbu+/A/uOEahhwcJPQ8+T9736//nVv/ - /ncrvYyiECQ3bcv7//7VF3AbENn16P+Ubb/+lyz9+z9h+t//Nrln4YpBcr2rP/z3Kj2B24DA5of/W9e+ - B2s2LvnyXzr62n/jyGVgDSC5uvnv/rvkH8BtgEfV/f8lc9/BNSu69MAVg+Typ735b5+xHbcB9qV3/we2 - PMPQDJPLnvz6v0XCetwGWOTd+W9TcAVDM0wutf813EtYgWHWbayaQQAkF9by8r9u8Dys8mCgk3YDpyRI - zq/64X8N32k41eAFTrlX/qt4TABjdLmBBQC+0b+zZl1WGAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe + /w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/ + /tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI + ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6 + 3AZY5N35b1NwBUMzTC61/zXcS1iBYdZtrJpBACQX1vLyv27wPKzyYKCTdgOnJEjOr/rhfw3faTjV4AVO + uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC \ No newline at end of file diff --git a/unimarc/unimarc/마크/IsbnGridItem.cs b/unimarc/unimarc/마크/IsbnGridItem.cs index 9a1c08b..263be48 100644 --- a/unimarc/unimarc/마크/IsbnGridItem.cs +++ b/unimarc/unimarc/마크/IsbnGridItem.cs @@ -29,5 +29,10 @@ namespace UniMarc public string sold_out { get; set; } public string image { get; set; } public string api_data { get; set; } + public string search_description { get; set; } + public string search_link { get; set; } + + + } } diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 95f7081..96f8107 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -73,7 +73,7 @@ namespace UniMarc "AND `chk_marc` > 0;", Area, table, compidx, search, state); - DataTable dt = Helper_DB.ExecuteQueryData(cmd); + DataTable dt = Helper_DB.ExecuteDataTable(cmd); List items = new List(); if (dt == null || dt.Rows.Count == 0) @@ -356,7 +356,7 @@ namespace UniMarc if (item == null) return; string tSearchText = item.list_name; string tSearchIDX = item.idx; - var isbn = main.OpenFormInTab(() => new Check_ISBN2(main, tSearchText, tSearchIDX)); + var isbn = main.OpenFormInTab(() => new Check_ISBN2( tSearchText, tSearchIDX)); isbn.tb_list_name.Enabled = true; } } diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs index f110045..3eeb9db 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.cs @@ -278,7 +278,7 @@ namespace UniMarc { where += $" and c_sangho like '%{inputsearch.Replace("'", "''")}%'"; } - var dt = Helper_DB.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + var dt = Helper_DB.ExecuteQueryData("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); using (var f = new fSelectDT(dt)) if (f.ShowDialog() == DialogResult.OK) { diff --git a/unimarc/unimarc/마크/Mac_List_Add2.cs b/unimarc/unimarc/마크/Mac_List_Add2.cs index 91cf23b..047d1d2 100644 --- a/unimarc/unimarc/마크/Mac_List_Add2.cs +++ b/unimarc/unimarc/마크/Mac_List_Add2.cs @@ -355,7 +355,7 @@ namespace UniMarc { where += $" and c_sangho like '%{inputsearch.Replace("'", "''")}%'"; } - var dt = Helper_DB.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + var dt = Helper_DB.ExecuteQueryData("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); using (var f = new fSelectDT(dt)) if (f.ShowDialog() == DialogResult.OK) { diff --git a/unimarc/unimarc/마크/Mac_List_Edit.cs b/unimarc/unimarc/마크/Mac_List_Edit.cs index 21f5023..9d5390a 100644 --- a/unimarc/unimarc/마크/Mac_List_Edit.cs +++ b/unimarc/unimarc/마크/Mac_List_Edit.cs @@ -91,7 +91,7 @@ namespace UniMarc { where += $" and c_sangho like '%{inputsearch.Replace("'", "''")}%'"; } - var dt = Helper_DB.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + var dt = Helper_DB.ExecuteQueryData("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); using (var f = new fSelectDT(dt)) if (f.ShowDialog() == DialogResult.OK) { diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 0c92204..f58845b 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -3564,7 +3564,7 @@ namespace UniMarc { where = $"c_sangho like '%{inputsearch.Replace("'", "''")}%'"; } - var dt = Helper_DB.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + var dt = Helper_DB.ExecuteQueryData("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); using (var f = new fSelectDT(dt)) if (f.ShowDialog() == DialogResult.OK) { diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index 72ba320..e9f5844 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -781,7 +781,7 @@ namespace UniMarc { where = $"c_sangho like '%{inputsearch.Replace("'", "''")}%'"; } - var dt = Helper_DB.GetDT("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); + var dt = Helper_DB.ExecuteQueryData("Client", columns: "idx,c_sangho", orders: "c_sangho", wheres: where); using (var f = new fSelectDT(dt)) if (f.ShowDialog() == DialogResult.OK) { @@ -895,7 +895,7 @@ namespace UniMarc var main = Application.OpenForms.OfType
().FirstOrDefault(); if (main != null) { - var isbn = main.OpenFormInTab(() => new Check_ISBN2(main, tSearchText, tSearchIDX)); + var isbn = main.OpenFormInTab(() => new Check_ISBN2(tSearchText, tSearchIDX)); if (isbn != null) { isbn.tb_list_name.Enabled = true; diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index e5e1333..e22d5e5 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -147,7 +147,7 @@ namespace UniMarc string[] Search_col = { "work_list", "date" }; string[] Search_data = { ListName, date }; string cmd = db.More_DB_Search(Table, Search_col, Search_data, Area); - var res = Helper_DB.ExecuteQueryData(cmd); // Assumed called above + var res = Helper_DB.ExecuteDataTable(cmd); // Assumed called above var list = new List(); int tCnt = 1; diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index d0424cd..0c2e6ad 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -83,7 +83,7 @@ namespace UniMarc if (int.TryParse(marc.lbCustIDX.Text, out int custidx) == true && custidx > 0) { //string mCompidx = PUB.user.CompanyIdx; - var dt = Helper_DB.GetDT("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {PUB.user.CompanyIdx} AND idx = {custidx}"); + var dt = Helper_DB.ExecuteQueryData("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {PUB.user.CompanyIdx} AND idx = {custidx}"); if (dt != null && dt.Rows.Count > 0) { var row = dt.Rows[0]; diff --git a/unimarc/unimarc/마크/Marc_mkList2.cs b/unimarc/unimarc/마크/Marc_mkList2.cs index 11970eb..26d095f 100644 --- a/unimarc/unimarc/마크/Marc_mkList2.cs +++ b/unimarc/unimarc/마크/Marc_mkList2.cs @@ -77,7 +77,7 @@ namespace UniMarc if (int.TryParse(marc2.lbCustIDX.Text, out int custidx) == true && custidx > 0) { //string mCompidx = PUB.user.CompanyIdx; - var dt = Helper_DB.GetDT("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {PUB.user.CompanyIdx} AND idx = {custidx}"); + var dt = Helper_DB.ExecuteQueryData("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {PUB.user.CompanyIdx} AND idx = {custidx}"); if (dt != null && dt.Rows.Count > 0) { var row = dt.Rows[0];