diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index d2eacfd..2c08bfc 100644 Binary files a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo and b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo differ diff --git a/ISBN_Check_test/Form1.Designer.cs b/ISBN_Check_test/Form1.Designer.cs index 979fb43..dc85a2e 100644 --- a/ISBN_Check_test/Form1.Designer.cs +++ b/ISBN_Check_test/Form1.Designer.cs @@ -51,6 +51,7 @@ namespace ISBN_Check_test this.label2 = new System.Windows.Forms.Label(); this.button2 = new System.Windows.Forms.Button(); this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -174,7 +175,7 @@ namespace ISBN_Check_test // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(659, 13); + this.label1.Location = new System.Drawing.Point(631, 15); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 4; @@ -216,7 +217,7 @@ namespace ISBN_Check_test // // button2 // - this.button2.Location = new System.Drawing.Point(551, 9); + this.button2.Location = new System.Drawing.Point(534, 9); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 2; @@ -234,16 +235,24 @@ namespace ISBN_Check_test this.cb_api.TabIndex = 0; this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(720, 9); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(184, 23); + this.progressBar1.TabIndex = 7; + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(920, 618); + this.Controls.Add(this.label1); + this.Controls.Add(this.progressBar1); this.Controls.Add(this.end_idx); this.Controls.Add(this.start_idx); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.label2); - this.Controls.Add(this.label1); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.button2); this.Controls.Add(this.button1); @@ -280,6 +289,7 @@ namespace ISBN_Check_test private System.Windows.Forms.DataGridViewTextBoxColumn category; private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.ProgressBar progressBar1; } } diff --git a/ISBN_Check_test/Form1.cs b/ISBN_Check_test/Form1.cs index 63a7c2b..5a3e26a 100644 --- a/ISBN_Check_test/Form1.cs +++ b/ISBN_Check_test/Form1.cs @@ -7,6 +7,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Threading; using System.Windows.Forms; namespace ISBN_Check_test @@ -20,8 +21,9 @@ namespace ISBN_Check_test } private void Form1_Load(object sender, EventArgs e) { - string[] api_list = { "알라딘", "네이버" }; + string[] api_list = { "알라딘", "네이버", "다음" }; cb_api.Items.AddRange(api_list); + } private void button2_Click(object sender, EventArgs e) { @@ -38,13 +40,19 @@ namespace ISBN_Check_test button2_Click(null, null); if(cb_api.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } if(cb_filter.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } - + Stopwatch stopwatch = new Stopwatch(); stopwatch.Start(); int start = Convert.ToInt32(start_idx.Text) - 1; int end = Convert.ToInt32(end_idx.Text) - 1; + progressBar1.Style = ProgressBarStyle.Continuous; + progressBar1.Minimum = start; + progressBar1.Maximum = end; + progressBar1.Step = 1; + progressBar1.Value = 0; + if (start_idx.Text != "1" || end_idx.Text != dataGridView1.Rows.Count.ToString()) { start = Convert.ToInt32(start_idx.Text) - 1; end = Convert.ToInt32(end_idx.Text) - 1; @@ -58,6 +66,9 @@ namespace ISBN_Check_test case 1: Naver_API(dataGridView1, start, end); break; + case 2: + Daum_API(dataGridView1, start, end); + break; } stopwatch.Stop(); @@ -112,6 +123,7 @@ namespace ISBN_Check_test query = Set_query(type, a); insert_By_Aladin(api.Aladin(query, type, param), a); + process_Sub(); } } private void Naver_API(DataGridView gridview, int start, int end) @@ -179,13 +191,57 @@ namespace ISBN_Check_test L_Array.Add(gridview.Rows[a].Cells["author"].Value.ToString()); L_Array.Add(gridview.Rows[a].Cells["book_comp"].Value.ToString()); break; - } + } // 필터 적용 + string[] arrayType = L_type.ToArray(); string[] arrayValue = L_Array.ToArray(); string result = api.Naver(arrayValue, arrayType, param); insert_By_Naver(result, a); + process_Sub(); + Thread.Sleep(700); } } + private void Daum_API(DataGridView gridview, int start, int end) + { + string[] param = { "title", "authors", "publisher", "isbn", "price", + "datetime", "status" }; + string type = string.Empty; + string query = string.Empty; + API api = new API(); + + for(int a = start; a < end; a++) + { + if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.Yellow) + continue; + else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) + gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; + + switch (cb_filter.SelectedIndex) + { + case 0: + type = "title"; + query = gridview.Rows[a].Cells["book_name"].Value.ToString(); + break; + case 1: + type = "person"; + query = gridview.Rows[a].Cells["author"].Value.ToString(); + break; + case 2: + type = "publisher"; + query = gridview.Rows[a].Cells["book_comp"].Value.ToString(); + break; + } + + string result = api.Daum(query, type, param); + richTextBox1.Text = result; + insert_By_Daum(result, a); + process_Sub(); + } + } + private void process_Sub() + { + progressBar1.PerformStep(); + } string Set_query(string type, int idx) { string result = string.Empty; @@ -305,11 +361,68 @@ namespace ISBN_Check_test dataGridView1.Rows[row].Cells["Column1"].Value += string.Join("|", grid) + "|"; dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; } + #endregion + if (sp_data.Length > 1) return; if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; } dataGridView1.Rows[row].Selected = true; - #endregion + + bool[] chk = { false, false, false }; + string book_name = dataGridView1.Rows[row].Cells["book_name"].Value.ToString(); + string author = dataGridView1.Rows[row].Cells["author"].Value.ToString(); + string book_comp = dataGridView1.Rows[row].Cells["book_comp"].Value.ToString(); + string newstring = DateTime.ParseExact(grid[5], "yyyyMMdd", null).ToString("yyyy-MM-dd"); + + if (grid[0] == book_name) chk[0] = true; + if (grid[1].Contains(author) == true) chk[1] = true; + if (grid[2] == book_comp) chk[2] = true; + + if (chk[0] == true && chk[1] == true && chk[2] == true) + { + dataGridView1.Rows[row].Cells["isbn"].Value = grid[3]; + dataGridView1.Rows[row].Cells["price2"].Value = grid[4]; + dataGridView1.Rows[row].Cells["pubDate"].Value = newstring; + dataGridView1.Rows[row].Cells["category"].Value = grid[6]; + dataGridView1.Rows[row].Cells["sold_out"].Value = grid[7]; + dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.Yellow; + } + } + void insert_By_Daum(string value, int row) + { + if (row > 0) { dataGridView1.Rows[row - 1].Selected = false; } + dataGridView1.Rows[row].Selected = true; + + if (value == "") return; + + string[] sp_data = value.Split('\n'); + string[] grid = { "", "", "", "", "", "", "", "" }; + + for (int a = 0; a < sp_data.Length-1; a++) + { + string[] data = sp_data[a].Split('|'); + grid[0] = data[0]; + grid[1] = data[1]; + grid[2] = data[2]; + string[] tmp_isbn = data[3].Split(' '); + if (tmp_isbn.Length < 2) + grid[3] = data[3].Replace(" ", ""); + + else + grid[3] = tmp_isbn[1]; + + grid[4] = data[4]; + grid[5] = data[5].Substring(0, data[5].IndexOf('T')); + grid[7] = data[6]; + + dataGridView1.Rows[row].Cells["Column1"].Value += string.Join("|", grid) + "|"; + dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; + } + + if (sp_data.Length > 1) return; + + if (row > 0) dataGridView1.Rows[row - 1].Selected = false; + dataGridView1.Rows[row].Selected = true; bool[] chk = { false, false, false }; string book_name = dataGridView1.Rows[row].Cells["book_name"].Value.ToString(); @@ -330,7 +443,6 @@ namespace ISBN_Check_test dataGridView1.Rows[row].Cells["sold_out"].Value = grid[7]; dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.Yellow; } - } private void dataGridView1_KeyDown(object sender, KeyEventArgs e) { @@ -343,8 +455,16 @@ namespace ISBN_Check_test sg.DataGrid_to_Delete(sender, e); } if (e.KeyCode == Keys.Enter) { dataGridView1_CellDoubleClick(null, null); rowidx++; } - if (e.KeyCode == Keys.Up) { rowidx--; } - if (e.KeyCode == Keys.Down) { rowidx++; } + if (e.KeyCode == Keys.Up) { + rowidx--; + if (rowidx < 0) + rowidx = 0; + } + if (e.KeyCode == Keys.Down) { + rowidx++; + if (rowidx > dataGridView1.Rows.Count - 1) + rowidx = dataGridView1.Rows.Count - 1; + } end_idx.Text = dataGridView1.Rows.Count.ToString(); } private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) @@ -364,7 +484,7 @@ namespace ISBN_Check_test private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { if (dataGridView1.Rows[rowidx].Cells["Column1"].Value == null || - dataGridView1.Rows[rowidx].Cells["Column1"].Value == "") { return; } + dataGridView1.Rows[rowidx].Cells["Column1"].Value.ToString() == "") { return; } Form2 f2 = new Form2(this); f2.row = rowidx; f2.Call_API = cb_api.Text; @@ -389,6 +509,10 @@ namespace ISBN_Check_test "도서명 + 저자 + 출판사" }; cb_filter.Items.AddRange(naver); } + else if (cb_api.SelectedIndex == 2) { + string[] daum = { "도서명", "저자", "출판사" }; + cb_filter.Items.AddRange(daum); + } } } } diff --git a/ISBN_Check_test/Form1_Sub.cs b/ISBN_Check_test/Form1_Sub.cs index a416e34..589825b 100644 --- a/ISBN_Check_test/Form1_Sub.cs +++ b/ISBN_Check_test/Form1_Sub.cs @@ -173,13 +173,13 @@ namespace ISBN_Check_test } return result; } - public string Daum(string[] Query, string[] Param) + public string Daum(string Query, string Type, string[] Param) { string result = string.Empty; // url생성 string url = "https://dapi.kakao.com/v3/search/book"; - string query = string.Format("{0}?query={1}&target={2}", url, Query[0], "title"); + string query = string.Format("{0}?query={1}&target={2}&", url, Query, Type); WebRequest request = WebRequest.Create(query); string rKey = "e3935565b731a2a6f32880c90d76403a"; @@ -310,6 +310,7 @@ namespace ISBN_Check_test } } } + ((DataGridView)sender).Rows.Add(); } } } diff --git a/ISBN_Check_test/Form2.cs b/ISBN_Check_test/Form2.cs index a248f0f..c1aa65c 100644 --- a/ISBN_Check_test/Form2.cs +++ b/ISBN_Check_test/Form2.cs @@ -66,9 +66,8 @@ namespace ISBN_Check_test tb_book_comp.Text = f1.dataGridView1.Rows[row].Cells["book_comp"].Value.ToString(); if (f1.dataGridView1.Rows[row].Cells["price"].Value != null) - { tb_price.Text = f1.dataGridView1.Rows[row].Cells["price"].Value.ToString(); - } + else { tb_price.Text = ""; } string data = f1.dataGridView1.Rows[row].Cells["Column1"].Value.ToString(); @@ -96,7 +95,7 @@ namespace ISBN_Check_test else if (Call_API == "네이버") return DateTime.ParseExact(date, "yyyyMMdd", null).ToString("yyyy-MM-dd"); else - return "NULL"; + return date; } private void same_chk() { @@ -108,7 +107,7 @@ namespace ISBN_Check_test tb_price.Text.Replace(",","") }; - for(int a= 0; a < dataGridView1.Rows.Count - 1; a++) + for(int a= 0; a < dataGridView1.Rows.Count; a++) { int chk_idx = 0; @@ -121,12 +120,13 @@ namespace ISBN_Check_test if(dataGridView1.Rows[a].Cells["book_comp"].Value.ToString() == ori_data[2]) { chk_idx++; } - if (chk_idx >= 2) { - int price = Convert.ToInt32(ori_data[4]); int pay = Convert.ToInt32(dataGridView1.Rows[a].Cells["price"].Value.ToString()); + int price = 0; + if (ori_data[4] != "") + price = Convert.ToInt32(ori_data[4]); - if(price-5000 <= pay && pay <= price + 5000) + if (price - 5000 <= pay && pay <= price + 5000) dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; else @@ -137,8 +137,7 @@ namespace ISBN_Check_test } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - - if(e != null) { rowidx = e.RowIndex;} + if(e != null) { rowidx = e.RowIndex; } string book_name = dataGridView1.Rows[rowidx].Cells["book_name"].Value.ToString(); string author = dataGridView1.Rows[rowidx].Cells["author"].Value.ToString(); string book_comp = dataGridView1.Rows[rowidx].Cells["book_comp"].Value.ToString(); @@ -169,8 +168,19 @@ namespace ISBN_Check_test private void dataGridView1_KeyDown(object sender, KeyEventArgs e) { if(e.KeyCode == Keys.Enter) { dataGridView1_CellDoubleClick(null, null); } - if (e.KeyCode == Keys.Up) { rowidx--; } - if (e.KeyCode == Keys.Down) { rowidx++; } + if (e.KeyCode == Keys.Up) { + rowidx--; + if (rowidx < 0) + rowidx = 0; + } + if (e.KeyCode == Keys.Down) { + rowidx++; + if (rowidx > dataGridView1.Rows.Count - 1) + rowidx = dataGridView1.Rows.Count - 1; + } + if (e.KeyCode == Keys.Escape) { + this.Close(); + } } private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { diff --git a/ISBN_Check_test/Form3.cs b/ISBN_Check_test/Form3.cs index b5162ae..94db591 100644 --- a/ISBN_Check_test/Form3.cs +++ b/ISBN_Check_test/Form3.cs @@ -32,16 +32,15 @@ namespace ISBN_Check_test // 발행일 / 도서분류 / 재고 string[] param = { "title", "authors", "publisher", "isbn", "price", "datetime", "status" }; - string result = api.Daum(ArrayValue, param); - richTextBox1.Text = result; - - input_Grid(result); + // string result = api.Daum(ArrayValue, param); + // richTextBox1.Text = result; + // input_Grid(result); } private void input_Grid(string value) { string[] sp_data = value.Split('|'); - string[] grid = { "", "", "", "", "", "" }; + string[] grid = { "", "", "", "", "", "", "" }; for (int a = 0; a < sp_data.Length; a++) { @@ -59,7 +58,9 @@ namespace ISBN_Check_test if (a % 7 == 5) { sp_data[a] = sp_data[a].Substring(0, sp_data[a].IndexOf('T')); grid[5] = sp_data[a]; } // 출간일 - if (a % 7 == 6) { grid[6] = sp_data[a]; } // 판매여부 + if (a % 7 == 6) { grid[6] = sp_data[a]; + dataGridView1.Rows.Add(grid); + } // 판매여부 } } private void tb_book_name_KeyDown(object sender, KeyEventArgs e) diff --git a/ISBN_Check_test/ISBN_Check_test.csproj b/ISBN_Check_test/ISBN_Check_test.csproj index 62bf443..511d143 100644 --- a/ISBN_Check_test/ISBN_Check_test.csproj +++ b/ISBN_Check_test/ISBN_Check_test.csproj @@ -11,7 +11,7 @@ v4.7.2 512 true - true + false false \\MSDN-SPECIAL\project_share\ true diff --git a/ISBN_Check_test/Program.cs b/ISBN_Check_test/Program.cs index 72612a2..2f7dbe3 100644 --- a/ISBN_Check_test/Program.cs +++ b/ISBN_Check_test/Program.cs @@ -16,7 +16,7 @@ namespace ISBN_Check_test { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form3()); + Application.Run(new Form1()); } } } diff --git a/ISBN_Check_test/Properties/AssemblyInfo.cs b/ISBN_Check_test/Properties/AssemblyInfo.cs index 05a0471..8c8d630 100644 --- a/ISBN_Check_test/Properties/AssemblyInfo.cs +++ b/ISBN_Check_test/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.*")] +// [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index 2e40a15..a0f6b77 100644 --- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application +++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application @@ -21,7 +21,7 @@ - u4b91ibX7x96ug6Lf7TXkHYAuwQKg9nukj7Mbtu+STM= + 7aPJmNSvb0PU9QuIpstDY5FFkTJha0KgAda5cHJ/EmY= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index aeb67f2..297047c 100644 Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest index c1ee8e6..c254acc 100644 --- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest +++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest @@ -42,14 +42,14 @@ - + - JWof198lqXefS6pH4ig36S6GUjbUI/QvKFg5jbTmnbg= + AdXvML1+7dhzkhOLrDfLzxFquifXgqKvhOlSZBPwTYs= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - wvm1BlMSe9nAQYo7ZcoLVWdWr/+H8MmqJKiSr4t+aMo= + SYt9hOkA4o8cJOF41b8GOJLRrSJx0Gc+TbRhd+J7F5o= \ No newline at end of file diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb index e0126d6..a542f99 100644 Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb differ diff --git a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe index 6d95881..cb060d2 100644 Binary files a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ISBN_Check_test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 917d23f..6ac6954 100644 Binary files a/ISBN_Check_test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ISBN_Check_test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application index 2e40a15..a0f6b77 100644 --- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application +++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application @@ -21,7 +21,7 @@ - u4b91ibX7x96ug6Lf7TXkHYAuwQKg9nukj7Mbtu+STM= + 7aPJmNSvb0PU9QuIpstDY5FFkTJha0KgAda5cHJ/EmY= diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache index a521ebd..4ce7a14 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache index 9011fd2..f5bb0f6 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe index aeb67f2..297047c 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest index c1ee8e6..c254acc 100644 --- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest +++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest @@ -42,14 +42,14 @@ - + - JWof198lqXefS6pH4ig36S6GUjbUI/QvKFg5jbTmnbg= + AdXvML1+7dhzkhOLrDfLzxFquifXgqKvhOlSZBPwTYs= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - wvm1BlMSe9nAQYo7ZcoLVWdWr/+H8MmqJKiSr4t+aMo= + SYt9hOkA4o8cJOF41b8GOJLRrSJx0Gc+TbRhd+J7F5o= \ No newline at end of file diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb index e0126d6..a542f99 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb differ diff --git a/Setup1/Debug/Setup1.msi b/Setup1/Debug/Setup1.msi index 5f09e7b..0773318 100644 Binary files a/Setup1/Debug/Setup1.msi and b/Setup1/Debug/Setup1.msi differ diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index 47ebb03..1871eef 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -22,18 +22,18 @@ "Entry" { "MsmKey" = "8:_36AC4F62C92B6D0BCDD2C56761258591" - "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E5B8C9896AC806B09C2BF089A2B0DA2" - "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "MsmKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -46,7 +46,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -112,6 +112,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } } } } @@ -401,15 +409,15 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_41A5DB557A064A2E94DBAB9AFCBAC511" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_32CA64AF558A4FAEA0514A673174CC75" { - "Name" = "8:ISBN_Check" + "Name" = "8:ISBN 조회" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "Target" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" "Folder" = "8:_A66867392A5046CAB74023B14B8C3140" "WorkingFolder" = "8:_945325C397F845FB86F255B5AAC3663E" "Icon" = "8:_0D6062360C5F4D6BA7D1EBF485EEFF70" @@ -814,7 +822,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_ACC6E81358D94BAA91B2EE876A585013" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DA8C774840A942BC81BFF0E6B6623E5B" { "SourcePath" = "8:..\\ISBN_Check_test\\obj\\Debug\\ISBN_Check_test.exe" "TargetName" = "8:" diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index db18f99..ab43935 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ