diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 82827bd..28f4195 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index f843545..d8f27ae 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 0d65122..d73c4b1 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index b8d39e2..22f77b0 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index 83b6e0f..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index f843545..d8f27ae 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 0d65122..d73c4b1 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index b8d39e2..22f77b0 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index 5edd5ed..92d5937 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -88,15 +88,55 @@ namespace WindowsFormsApp1.Mac int SCount = Convert.ToInt32(SearchCount.Value); - if (URL is null) - { + if (URL is null) { webBrowser1.DocumentCompleted -= this.webBrowser1_DocumentCompleted; + return; } - else + else if (URL.IndexOf("lib.jeonnam.go.kr") > -1) { + for (int a = 0; a < SCount; a++) + { + if (dataGridView1.Rows[a].Cells["book_name"].Value == null) + continue; + + if (dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "") + continue; + + if (isStop) + break; + + string BookSearchCount = CopyCount(dataGridView1.Rows[a].Cells["book_name"].Value.ToString()); + + if (BookSearchCount == "false") + { + MessageBox.Show("검색대상이 설정되지않았습니다!"); + return; + } + + if (BookSearchCount == "0" || BookSearchCount == "" || BookSearchCount == "미소장") + { + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; + dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Red; + BookSearchCount = ""; + } + else + { + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; + dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Blue; + BookSearchCount = "소장"; + } + + int tmp = RowCount - 1; + if (tmp < 0) tmp = 0; + + BookSearchCount = IsHave(BookSearchCount, tmp); + dataGridView1.Rows[a].Cells["Count"].Value = BookSearchCount; + } + } + else { if (URL.IndexOf("218.157.123.2:9996/kcms/Main") > -1) webBrowser1.Navigate(URL + "/" + Code); - + else webBrowser1.Navigate(URL); @@ -108,6 +148,9 @@ namespace WindowsFormsApp1.Mac int RowCount = 0; private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e) { + if (RowCount < 0) + return; + if (RowCount == SearchCount.Value) { webBrowser1.DocumentCompleted -= this.webBrowser1_DocumentCompleted; @@ -187,14 +230,14 @@ namespace WindowsFormsApp1.Mac } // 전남 도립 TODO: 오류발생 (원인불명) [한번에 3개씩 검색결과가 표출됨] - else if (URL.IndexOf("lib.jeonnam.go.kr") > -1) - { - Delay(500); - if (URL.IndexOf("value") > -1) - BookCount = 전남도립결과(); - - 전남도립입력(text); - } + // else if (URL.IndexOf("lib.jeonnam.go.kr") > -1) + // { + // Delay(500); + // if (URL.IndexOf("value") > -1) + // BookCount = 전남도립결과(); + // + // 전남도립입력(text); + // } // 전남 고흥 (군립중앙, 군립남부, 군립북부 등 총 7개 도서관) else if (URL.IndexOf("ghlib.go.kr/BookSearch") > -1) @@ -816,20 +859,12 @@ namespace WindowsFormsApp1.Mac Delay(5000); - webBrowser1.Document.GetElementById("value1").SetAttribute("value", text); + 전남도립입력(text); - HtmlElementCollection hBtn = webBrowser1.Document.GetElementsByTagName("button"); - foreach (HtmlElement Btn in hBtn) - { - if (Btn.InnerText == "검색") - Btn.InvokeMember("click"); - } - Delay(1500); + Delay(8000); + + result = 전남도립결과(); - foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("font")) - { - result = Regex.Replace(he.InnerText, @"\D", ""); - } return result; }