diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index f6f0fd7..d2eacfd 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 b4c7908..979fb43 100644 --- a/ISBN_Check_test/Form1.Designer.cs +++ b/ISBN_Check_test/Form1.Designer.cs @@ -29,8 +29,8 @@ namespace ISBN_Check_test /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.cb_filter = new System.Windows.Forms.ComboBox(); this.button1 = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); @@ -75,14 +75,14 @@ namespace ISBN_Check_test // // dataGridView1 // - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.book_name, this.author, @@ -97,19 +97,19 @@ namespace ISBN_Check_test this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; this.dataGridView1.Location = new System.Drawing.Point(12, 38); this.dataGridView1.Name = "dataGridView1"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.dataGridView1.Size = new System.Drawing.Size(892, 466); this.dataGridView1.TabIndex = 3; - this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); + this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); diff --git a/ISBN_Check_test/Form1.cs b/ISBN_Check_test/Form1.cs index ab0725e..63a7c2b 100644 --- a/ISBN_Check_test/Form1.cs +++ b/ISBN_Check_test/Form1.cs @@ -13,6 +13,7 @@ namespace ISBN_Check_test { public partial class Form1 : Form { + private int rowidx; public Form1() { InitializeComponent(); @@ -34,6 +35,7 @@ namespace ISBN_Check_test } private void button1_Click(object sender, EventArgs e) { + button2_Click(null, null); if(cb_api.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } if(cb_filter.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } @@ -64,9 +66,13 @@ namespace ISBN_Check_test string elapsedTime = String.Format("{0:00}:{1:00}:{2:00}.{3:00}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds / 10); label1.Text = elapsedTime; + rowidx = 0; // 총 검색 횟수, 일치, 중복 MessageBox.Show("검색이 완료되었습니다!"); + + dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells[0]; + this.ActiveControl = dataGridView1; } /// /// 알라딘 API @@ -110,23 +116,73 @@ namespace ISBN_Check_test } private void Naver_API(DataGridView gridview, int start, int end) { - API api = new API(); // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 string[] param = { "title", "author", "publisher", "isbn", "price", "pubdate", "discount" }; + API api = new API(); + List L_type = new List(); + List L_Array = new List(); for(int a = start; a < end; a++) { + L_type.Clear(); + L_Array.Clear(); 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; - string[] ArrayValue = { gridview.Rows[a].Cells["book_name"].Value.ToString(), - gridview.Rows[a].Cells["author"].Value.ToString(), - gridview.Rows[a].Cells["book_comp"].Value.ToString() }; - string result = api.Naver(ArrayValue, param); + switch (cb_filter.SelectedIndex) + { + case 0: + L_type.Add("d_titl"); + L_Array.Add(gridview.Rows[a].Cells["book_name"].Value.ToString()); + break; + + case 1: + L_type.Add("d_auth"); + L_Array.Add(gridview.Rows[a].Cells["author"].Value.ToString()); + break; + + case 2: + L_type.Add("d_publ"); + L_Array.Add(gridview.Rows[a].Cells["book_comp"].Value.ToString()); + break; + + case 3: + L_type.Add("d_titl"); + L_type.Add("d_auth"); + L_Array.Add(gridview.Rows[a].Cells["book_name"].Value.ToString()); + L_Array.Add(gridview.Rows[a].Cells["author"].Value.ToString()); + break; + + case 4: + L_type.Add("d_titl"); + L_type.Add("d_publ"); + L_Array.Add(gridview.Rows[a].Cells["book_name"].Value.ToString()); + L_Array.Add(gridview.Rows[a].Cells["book_comp"].Value.ToString()); + break; + + case 5: + L_type.Add("d_auth"); + L_type.Add("d_publ"); + L_Array.Add(gridview.Rows[a].Cells["author"].Value.ToString()); + L_Array.Add(gridview.Rows[a].Cells["book_comp"].Value.ToString()); + break; + + case 6: + L_type.Add("d_titl"); + L_type.Add("d_auth"); + L_type.Add("d_publ"); + L_Array.Add(gridview.Rows[a].Cells["book_name"].Value.ToString()); + 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); } } @@ -286,6 +342,9 @@ namespace ISBN_Check_test else if (e.KeyCode == Keys.Delete) { 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++; } end_idx.Text = dataGridView1.Rows.Count.ToString(); } private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) @@ -296,17 +355,18 @@ namespace ISBN_Check_test } private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { + rowidx = e.RowIndex; if(dataGridView1.Rows[e.RowIndex].Cells["Column1"].Value == null) - { dataGridView1.Rows[e.RowIndex].Cells["Column1"].Value = ""; - } + richTextBox1.Text = dataGridView1.Rows[e.RowIndex].Cells["Column1"].Value.ToString(); } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if(dataGridView1.Rows[e.RowIndex].Cells["Column1"].Value == null) { return; } + if (dataGridView1.Rows[rowidx].Cells["Column1"].Value == null || + dataGridView1.Rows[rowidx].Cells["Column1"].Value == "") { return; } Form2 f2 = new Form2(this); - f2.row = e.RowIndex; + f2.row = rowidx; f2.Call_API = cb_api.Text; f2.Show(); } @@ -324,7 +384,9 @@ namespace ISBN_Check_test cb_filter.Items.AddRange(aladin); } else if (cb_api.SelectedIndex == 1) { - string[] naver = { "도서명+출판사" }; + string[] naver = { "도서명", "저자", "출판사", + "도서명 + 저자", "도서명 + 출판사", "저자 + 출판사", + "도서명 + 저자 + 출판사" }; cb_filter.Items.AddRange(naver); } } diff --git a/ISBN_Check_test/Form1_Sub.cs b/ISBN_Check_test/Form1_Sub.cs index 9de5dd9..a416e34 100644 --- a/ISBN_Check_test/Form1_Sub.cs +++ b/ISBN_Check_test/Form1_Sub.cs @@ -100,23 +100,17 @@ namespace ISBN_Check_test } return result; } - public string Naver(string[] Query, string[] Param) + public string Naver(string[] Query, string[] QueryType, string[] Param) { string result = string.Empty; string json = string.Empty; // url 생성 string url = "https://openapi.naver.com/v1/search/book_adv?"; - - if(Query[0] != null || Query[0] != "") - url += "d_titl=" + Query[0] + "&"; - if(Query[1] != null || Query[1] != "") - url += "d_auth=" + Query[1] + "&"; - - if(Query[2] != null || Query[2] != "") - url += "d_publ=" + Query[2] + "&"; - - // + for(int a = 0; a < Query.Length; a++) + { + url += string.Format("{0}={1}&", QueryType[a], Query[a]); + } HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); request.Headers.Add("X-Naver-Client-Id", "wYr0JczCBoDopq1NKTyQ"); // 클라이언트 아이디 @@ -179,6 +173,62 @@ namespace ISBN_Check_test } return result; } + public string Daum(string[] Query, 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"); + WebRequest request = WebRequest.Create(query); + + string rKey = "e3935565b731a2a6f32880c90d76403a"; + string header = "KakaoAK " + rKey; + + request.Headers.Add("Authorization", header); + + WebResponse response = request.GetResponse(); + Stream stream = response.GetResponseStream(); + StreamReader reader = new StreamReader(stream, Encoding.UTF8); + string json = reader.ReadToEnd(); + stream.Close(); + + JavaScriptSerializer js = new JavaScriptSerializer(); + dynamic dob = js.Deserialize(json); + dynamic docs = dob["documents"]; + object[] buf = docs; + + int length = buf.Length; + int ID_length = Param.Length; + + for(int a = 0; a < length; a++) + { + List tmp_data = new List(); + for(int b = 0; b < ID_length; b++) + { + if (Param[b] == "authors") { + object[] tmp = docs[a][Param[b]]; + string tmp_str = string.Empty; + for(int j = 0; j < tmp.Length; j++) + { + tmp_str += tmp[j]; + if (j < tmp.Length - 1) { + tmp_str += ", "; + } + } + tmp_data.Add(tmp_str); + result += tmp_data[b] + "|"; + tmp_str = ""; + } + else { + tmp_data.Add(docs[a][Param[b]]); + result += tmp_data[b] + "|"; + } + } + result += "\n"; + } + return result; + } } class Skill_Grid { diff --git a/ISBN_Check_test/Form2.cs b/ISBN_Check_test/Form2.cs index 8b5bd60..a248f0f 100644 --- a/ISBN_Check_test/Form2.cs +++ b/ISBN_Check_test/Form2.cs @@ -91,7 +91,6 @@ namespace ISBN_Check_test } private string change_Date_type(string date) { - MessageBox.Show(date); if (Call_API == "알라딘") return String.Format("{0:yyyy/MM/dd}", DateTime.Parse(date.Remove(date.IndexOf(" G")))); else if (Call_API == "네이버") @@ -106,7 +105,7 @@ namespace ISBN_Check_test tb_author.Text, tb_book_comp.Text, tb_isbn.Text, - tb_price.Text }; + tb_price.Text.Replace(",","") }; for(int a= 0; a < dataGridView1.Rows.Count - 1; a++) @@ -124,7 +123,15 @@ namespace ISBN_Check_test } if (chk_idx >= 2) { - dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; + int price = Convert.ToInt32(ori_data[4]); + int pay = Convert.ToInt32(dataGridView1.Rows[a].Cells["price"].Value.ToString()); + + if(price-5000 <= pay && pay <= price + 5000) + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; + + else + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; + } } } diff --git a/ISBN_Check_test/Form3.Designer.cs b/ISBN_Check_test/Form3.Designer.cs index e6e3ac1..e0dbca2 100644 --- a/ISBN_Check_test/Form3.Designer.cs +++ b/ISBN_Check_test/Form3.Designer.cs @@ -113,7 +113,7 @@ namespace ISBN_Check_test this.dataGridView1.Location = new System.Drawing.Point(318, 12); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(763, 242); + this.dataGridView1.Size = new System.Drawing.Size(763, 241); this.dataGridView1.TabIndex = 5; // // Column1 @@ -185,7 +185,7 @@ namespace ISBN_Check_test // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1093, 266); + this.ClientSize = new System.Drawing.Size(1093, 265); this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); diff --git a/ISBN_Check_test/Form3.cs b/ISBN_Check_test/Form3.cs index dfa5c3d..b5162ae 100644 --- a/ISBN_Check_test/Form3.cs +++ b/ISBN_Check_test/Form3.cs @@ -30,54 +30,36 @@ namespace ISBN_Check_test // 도서명 / 저자 / 출판사 / isbn / 정가 // 발행일 / 도서분류 / 재고 - string[] param = { "title", "author", "publisher", "isbn", "price", - "pubdate", "discount" }; - string result = api.Naver(ArrayValue, param); + string[] param = { "title", "authors", "publisher", "isbn", "price", + "datetime", "status" }; + string result = api.Daum(ArrayValue, param); richTextBox1.Text = result; input_Grid(result); } private void input_Grid(string value) { - value = value.Replace("", ""); - value = value.Replace("", ""); + string[] sp_data = value.Split('|'); - string[] sp_data = value.Split('\t'); - - string[] grid = { "", "", "", "", "", "", "" }; + string[] grid = { "", "", "", "", "", "" }; for (int a = 0; a < sp_data.Length; a++) { - string[] data = sp_data[a].Split('|'); - label3.Text = data.Length.ToString(); - if (data.Length > 8) { - int idx = data.Length - 2; - grid[0] = data[0]; - grid[1] = data[1]; - for (int b = 2; b < idx - 4; b++) { - grid[1] += ", " + data[b]; - } - grid[2] = data[idx-4]; - if(data[idx-3].Contains(" ") == true) { - string[] isbn = data[idx - 3].Split(' '); - grid[3] = isbn[1]; - } - else - grid[3] = data[idx -3]; - - grid[4] = data[idx - 2]; - grid[5] = data[idx - 1]; - - if(data[idx] == "") - grid[6] = "절판"; - else - grid[6] = data[idx]; + if (a % 7 == 0) { grid[0] = sp_data[a]; } // 도서명 + if (a % 7 == 1) { grid[1] = sp_data[a]; } // 저자 + if (a % 7 == 2) { grid[2] = sp_data[a]; } // 출판사 + if (a % 7 == 3) { + string[] tmp_isbn = sp_data[a].Split('|'); + if (tmp_isbn.Length < 2) + grid[3] = sp_data[a].Replace(" ", ""); - dataGridView1.Rows.Add(grid); - } - else if (data.Length > 3) { - dataGridView1.Rows.Add(data); - } + else + grid[3] = tmp_isbn[1]; } // isbn + if (a % 7 == 4) { grid[4] = sp_data[a]; } // 가격 + 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]; } // 판매여부 } } private void tb_book_name_KeyDown(object sender, KeyEventArgs e) diff --git a/ISBN_Check_test/Program.cs b/ISBN_Check_test/Program.cs index 2f7dbe3..72612a2 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 Form1()); + Application.Run(new Form3()); } } } diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index 48e5d71..2e40a15 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 @@ - +/QFnMzikEHHL4QMbvyi8MOGF+umK+kzVlyKoBJTe6s= + u4b91ibX7x96ug6Lf7TXkHYAuwQKg9nukj7Mbtu+STM= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index d26e25b..aeb67f2 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 9920aeb..c1ee8e6 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 @@ - + - SOOnX22POSHiraDFCNYxppjMF3ygF/gf8T7aM7xUdtY= + JWof198lqXefS6pH4ig36S6GUjbUI/QvKFg5jbTmnbg= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - 8uDbux/zJosoV9pNNPCtMQxz9juWuhf/xOl2Kksa8aw= + wvm1BlMSe9nAQYo7ZcoLVWdWr/+H8MmqJKiSr4t+aMo= \ 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 2bc57de..e0126d6 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 e7506bf..6d95881 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/ISBN_Check_test.application b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application index 48e5d71..2e40a15 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 @@ - +/QFnMzikEHHL4QMbvyi8MOGF+umK+kzVlyKoBJTe6s= + u4b91ibX7x96ug6Lf7TXkHYAuwQKg9nukj7Mbtu+STM= diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.FileListAbsolute.txt b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.FileListAbsolute.txt index fe4c3e8..11a5f4b 100644 --- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.FileListAbsolute.txt +++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.FileListAbsolute.txt @@ -29,5 +29,5 @@ C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\bin\Debug\ISBN_Check_test C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\bin\Debug\ISBN_Check_test.application C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\obj\Debug\ISBN_Check_test.exe.manifest C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\obj\Debug\ISBN_Check_test.application -C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\obj\Debug\ISBN_Check_test.csprojAssemblyReference.cache C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\obj\Debug\ISBN_Check_test.Form3.resources +C:\Users\Administrator\Desktop\unimarc\ISBN_Check_test\obj\Debug\ISBN_Check_test.csprojAssemblyReference.cache 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 7718370..a521ebd 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 3aa4a5d..9011fd2 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 d26e25b..aeb67f2 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 9920aeb..c1ee8e6 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 @@ - + - SOOnX22POSHiraDFCNYxppjMF3ygF/gf8T7aM7xUdtY= + JWof198lqXefS6pH4ig36S6GUjbUI/QvKFg5jbTmnbg= @@ -74,13 +74,13 @@ R+Wg8QGvQVHX8T0ta/qbhH1bXkqY0fRnS3wBV3J0bN8= - + - 8uDbux/zJosoV9pNNPCtMQxz9juWuhf/xOl2Kksa8aw= + wvm1BlMSe9nAQYo7ZcoLVWdWr/+H8MmqJKiSr4t+aMo= \ 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 2bc57de..e0126d6 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 c9d8b0a..5f09e7b 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 006bcf1..47ebb03 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -22,19 +22,19 @@ "Entry" { "MsmKey" = "8:_36AC4F62C92B6D0BCDD2C56761258591" - "OwnerKey" = "8:_3994D85E6BEE4E93B2ABE7AE9F04183B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3994D85E6BEE4E93B2ABE7AE9F04183B" - "OwnerKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E5B8C9896AC806B09C2BF089A2B0DA2" - "OwnerKey" = "8:_3994D85E6BEE4E93B2ABE7AE9F04183B" + "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -46,7 +46,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3994D85E6BEE4E93B2ABE7AE9F04183B" + "OwnerKey" = "8:_ACC6E81358D94BAA91B2EE876A585013" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -73,6 +73,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "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" + } + } + } } "Release" { @@ -89,6 +105,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -257,7 +281,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Setup1" "ProductCode" = "8:{A8A04035-B337-4B41-88F1-8A5982917757}" - "PackageCode" = "8:{128C2446-33F9-4EDC-B9E1-4B0890E236C8}" + "PackageCode" = "8:{E8137EB0-3234-42B5-B209-18D17ACB496F}" "UpgradeCode" = "8:{26ED5F40-94B6-454E-894F-FE448A69CB2D}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -377,7 +401,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_EE25221C8E8E4CD383F545BD5700D647" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_41A5DB557A064A2E94DBAB9AFCBAC511" { "Name" = "8:ISBN_Check" "Arguments" = "8:" @@ -385,7 +409,7 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_3994D85E6BEE4E93B2ABE7AE9F04183B" + "Target" = "8:_ACC6E81358D94BAA91B2EE876A585013" "Folder" = "8:_A66867392A5046CAB74023B14B8C3140" "WorkingFolder" = "8:_945325C397F845FB86F255B5AAC3663E" "Icon" = "8:_0D6062360C5F4D6BA7D1EBF485EEFF70" @@ -790,7 +814,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3994D85E6BEE4E93B2ABE7AE9F04183B" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_ACC6E81358D94BAA91B2EE876A585013" { "SourcePath" = "8:..\\ISBN_Check_test\\obj\\Debug\\ISBN_Check_test.exe" "TargetName" = "8:"