diff --git a/unimarc/.vs/unimarc/FileContentIndex/5b896a2e-b895-464f-859c-48f62f30cd6e.vsidx b/unimarc/.vs/unimarc/FileContentIndex/6e2814d5-5312-4b6a-b852-242f0c80f830.vsidx similarity index 100% rename from unimarc/.vs/unimarc/FileContentIndex/5b896a2e-b895-464f-859c-48f62f30cd6e.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/6e2814d5-5312-4b6a-b852-242f0c80f830.vsidx diff --git a/unimarc/.vs/unimarc/FileContentIndex/b8926f63-e13a-4e80-8400-21332bfbb8e9.vsidx b/unimarc/.vs/unimarc/FileContentIndex/70ea73a4-3dbe-49ee-911a-19050906e911.vsidx similarity index 71% rename from unimarc/.vs/unimarc/FileContentIndex/b8926f63-e13a-4e80-8400-21332bfbb8e9.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/70ea73a4-3dbe-49ee-911a-19050906e911.vsidx index 2702446..9171f53 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/b8926f63-e13a-4e80-8400-21332bfbb8e9.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/70ea73a4-3dbe-49ee-911a-19050906e911.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx b/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx new file mode 100644 index 0000000..8f11398 Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx b/unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx similarity index 73% rename from unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx index 2a26a53..314cce1 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/ecd536b0-ac79-4fcd-a58a-3e22234c1e09.vsidx b/unimarc/.vs/unimarc/FileContentIndex/ecd536b0-ac79-4fcd-a58a-3e22234c1e09.vsidx deleted file mode 100644 index e99ed2e..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/ecd536b0-ac79-4fcd-a58a-3e22234c1e09.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 91c1c58..5587236 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 29d5932..bdce069 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 0986613..09a2681 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 dce615a..c3ac11e 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.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 29d5932..bdce069 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 0986613..09a2681 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 dce615a..c3ac11e 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/마크/CD_LP_Sub.cs b/unimarc/unimarc/마크/CD_LP_Sub.cs index 4c61f7f..92a231e 100644 --- a/unimarc/unimarc/마크/CD_LP_Sub.cs +++ b/unimarc/unimarc/마크/CD_LP_Sub.cs @@ -55,19 +55,18 @@ namespace UniMarc.마크 if (isKyoBo) { if (KyoBo_trDVD_flCD()) - { result = MakeMarcKyoBo_DVD(KyoboInfor_DVD()); - } + else - { result = MakeMarcKyoBo_Music(KyoBoInfor_Music(), KyoBoGetTrack_Music()); - } } else { - // title, artist, comp, price, PubYear - string[] Data = AladinInfor_Music(); - result = MakeMarcAladin_Music(Data); + if (Aladin_trDVD_flCD()) + AladinInfor_DVD(); + + else + result = MakeMarcAladin_Music(AladinInfor_Music()); } cp.richTextBox1.Text = result; } @@ -368,7 +367,7 @@ namespace UniMarc.마크 string Marc = "020\t \t▼a" + Data[3] + ":▼c\\" + Data[4] + "▲\n"; Marc += KyoBoMake049(언어, 자막); Marc += "056\t \t▼a▼25▲\n"; - Marc += "100\t1 \t▼a" + Data[1] + "▲\n"; + Marc += "100\t1 \t▼a" + Data[1] + "▲\n"; // 도치 필요 Marc += "245\t10\t▼a" + title + "▼h[비디오 녹화자료]/▼d" + Data[1] + "▲\n"; Marc += "260\t \t▼a서울:▼b" + Data[2] + " [제작],▼c" + Data[5] + "▲\n"; Marc += String.Format("300\t \t▼aDVD {0}매({1})▼b유성, 천연색▼c12cm▲\n", 디스크수, 상영시간); @@ -395,7 +394,7 @@ namespace UniMarc.마크 { if (Value == "") continue; - Marc += "700\t1 \t▼a" + Value.Trim() + "▲\n"; + Marc += "700\t1 \t▼a" + Value.Trim() + "▲\n"; // 도치 필요 } Marc += "950\t0 \t▼b\\" + Data[4] + "▲\n"; @@ -478,6 +477,20 @@ namespace UniMarc.마크 #region Aladin + bool Aladin_trDVD_flCD() + { + bool result = false; + foreach (HtmlElement ul in webBrowser1.Document.GetElementsByTagName("ul")) + { + if (ul.Id != null && ul.Id.IndexOf("ulCategory") > -1) + if (ul.InnerText.IndexOf("DVD") > -1) + result = true; + } + return result; + } + + #region Music + string[] AladinInfor_Music() { string title = ""; @@ -602,8 +615,72 @@ namespace UniMarc.마크 #region DVD - #endregion + void AladinInfor_DVD() + { + // 작품명, 제작사 + string title = ""; + string comp = ""; + foreach (HtmlElement a in webBrowser1.Document.GetElementsByTagName("a")) + { + if (a.GetAttribute("className").IndexOf("Ere_bo_title") > -1) + title = a.InnerText; + if (a.GetAttribute("href").IndexOf("Publisher") > -1) + comp = a.InnerText; + } + // 감독명 + // 출연진 + // 제작사 + // 제작년도 + // 작품원제 + string tmp = ""; + foreach (HtmlElement li in webBrowser1.Document.GetElementsByTagName("li")) + { + if (li.GetAttribute("className").IndexOf("Ere_sub2_title") > -1) + { + tmp = li.InnerText.Replace(comp, ""); + } + } + int start = 0, end = tmp.IndexOf("(감독)"); + string Artist = Substring_Sub(tmp, start, end); + + start = end + "(감독)".Length + 1; + end = tmp.IndexOf("(출연)") - start; + string Actor = Substring_Sub(tmp, start, end); + + start = tmp.IndexOf(comp) + comp.Length; + end = 4; + string Years = Substring_Sub(tmp, start, end); + + start = tmp.IndexOf("원제 : ") + "원제 : ".Length; + end = tmp.Length - start; + string oriTitle = Substring_Sub(tmp, start, end); + + + MessageBox.Show(string.Format("title\n{0}\nArtist\n{1}\nActor\n{2}\ncomp\n{3}\nYears\n{4}\noriTitle\n{5}", + title, Artist, Actor, comp, Years, oriTitle)); + + // DVD 갯수 + // 정가 + } + + string Substring_Sub(string Value, int start, int end) + { + if (start < 0 || end < 1) + return ""; + + return Value.Substring(start, end); + } + /* +주세페 토르나토레 (감독),살바토레 카치오,필립 느와레,마르코 레오나르디 (출연)그린나래미디어2015-01-20원제 : Cinema Paradiso, 1988 (Blu-ray/Nuovo Director's Cut) + */ + + string MakeMarcAladin_DVD() + { + return ""; + } + #endregion + #endregion #endregion private void Btn_Close_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index 1ba7457..ee21eb8 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -301,6 +301,12 @@ namespace WindowsFormsApp1.Mac 조대도서관입력(text); } + // 전북교육청 소재 도서관 + else if (URL.IndexOf("lib.jbe.go.kr") > -1) + { + BookCount = 전북교육청입력(text); + } + int tmp = RowCount - 1; if (tmp < 0) tmp = 0; @@ -974,6 +980,60 @@ namespace WindowsFormsApp1.Mac #endregion + #region 전북 교육청 + + bool isJBEClick = false; + string 전북교육청입력(string text) + { + + foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) + { + if (input.Id != null && input.Id == "search_text") + { + input.SetAttribute("value", text); + break; + } + } + if (!isJBEClick) + { + foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) + { + if (input.GetAttribute("value").IndexOf("ALL") > -1) + { + input.InvokeMember("click"); + isJBEClick = true; + } + if (input.GetAttribute("value").IndexOf(Code) > -1) + { + input.InvokeMember("click"); + isJBEClick = true; + } + } + } + + foreach (HtmlElement Btn in webBrowser1.Document.GetElementsByTagName("button")) + { + if (Btn.Id != null && Btn.Id == "do-search") + Btn.InvokeMember("click"); + } + + Delay(10000); + + string result = ""; + + foreach (HtmlElement div in webBrowser1.Document.GetElementsByTagName("div")) + { + if (div.GetAttribute("className").IndexOf("search-info") > -1) + { + result = Regex.Replace(div.InnerText, @"\D", ""); + break; + } + } + + return result; + } + #endregion + #endregion public string CopyCount(string Text)