diff --git a/unimarc/.vs/unimarc/FileContentIndex/27c84db3-3024-4e40-94fb-6ea1fda488d5.vsidx b/unimarc/.vs/unimarc/FileContentIndex/27c84db3-3024-4e40-94fb-6ea1fda488d5.vsidx deleted file mode 100644 index 70b8916..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/27c84db3-3024-4e40-94fb-6ea1fda488d5.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/48e3c305-229a-4af0-85d5-6d0837295a3b.vsidx b/unimarc/.vs/unimarc/FileContentIndex/48e3c305-229a-4af0-85d5-6d0837295a3b.vsidx deleted file mode 100644 index d836622..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/48e3c305-229a-4af0-85d5-6d0837295a3b.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/d31c0a11-9cc3-43a6-a954-3b626a5d74d9.vsidx b/unimarc/.vs/unimarc/FileContentIndex/887c1825-e406-4535-a2e9-8221253971ca.vsidx similarity index 80% rename from unimarc/.vs/unimarc/FileContentIndex/d31c0a11-9cc3-43a6-a954-3b626a5d74d9.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/887c1825-e406-4535-a2e9-8221253971ca.vsidx index 8fe12b0..4e0d423 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/d31c0a11-9cc3-43a6-a954-3b626a5d74d9.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/887c1825-e406-4535-a2e9-8221253971ca.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/92a17bb4-d407-4c32-b936-112d0d6485eb.vsidx b/unimarc/.vs/unimarc/FileContentIndex/92a17bb4-d407-4c32-b936-112d0d6485eb.vsidx new file mode 100644 index 0000000..11072ab Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/92a17bb4-d407-4c32-b936-112d0d6485eb.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/a0682974-53dc-44ec-8a93-b11d35689906.vsidx b/unimarc/.vs/unimarc/FileContentIndex/a0682974-53dc-44ec-8a93-b11d35689906.vsidx new file mode 100644 index 0000000..8ca007e Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/a0682974-53dc-44ec-8a93-b11d35689906.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/4c9cd9ca-407b-458a-ad49-31f17e749efe.vsidx b/unimarc/.vs/unimarc/FileContentIndex/e04e7b4b-4cda-49cd-98fd-7ec6901060e4.vsidx similarity index 57% rename from unimarc/.vs/unimarc/FileContentIndex/4c9cd9ca-407b-458a-ad49-31f17e749efe.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/e04e7b4b-4cda-49cd-98fd-7ec6901060e4.vsidx index d520b82..7ceaed9 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/4c9cd9ca-407b-458a-ad49-31f17e749efe.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/e04e7b4b-4cda-49cd-98fd-7ec6901060e4.vsidx differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 4191eaa..dd8aa9f 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index ff93661..a1a8666 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -1650,7 +1650,7 @@ namespace WindowsFormsApp1 if (Tag.Length < 3) return ""; int TargetTagNum = Convert.ToInt32(Tag.Substring(0, 3)); - + string[] SplitView = TypeView.Split('\n'); List View = new List(SplitView); @@ -1660,12 +1660,7 @@ namespace WindowsFormsApp1 string LineTag = LineMarc.Substring(0, 3); int TagNum = Convert.ToInt32(LineTag); - if (TargetTagNum == TagNum) - { - View[ViewCount] = Tag; - break; - } - else if (TargetTagNum < TagNum) + if (TargetTagNum < TagNum) { View.Insert(ViewCount, Tag); break; diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 3f9644e..c1e1aca 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 8b39984..24ba070 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 0153d2d..54f76cc 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/TempPE/Connected Services.BaroService_API.Reference.cs.dll b/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll index 451d7cc..46dd88b 100644 Binary files a/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll and b/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll differ diff --git a/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 9e7c3e6..3693576 100644 Binary files a/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 3f9644e..c1e1aca 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 8b39984..24ba070 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 0153d2d..54f76cc 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 dedfb65..351ffff 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -401,14 +401,18 @@ namespace WindowsFormsApp1.Mac #endregion #region 광주 남구 - + bool isGwangJuNamGuClick = false; void 광주남구입력(string text) { foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("input")) { if (he.GetAttribute("id").IndexOf(Code) > -1) { - he.InvokeMember("click"); + if (!isGwangJuNamGuClick) + { + he.InvokeMember("click"); + isGwangJuNamGuClick = true; + } } } diff --git a/unimarc/unimarc/마크/Marc_Macro_Sub.cs b/unimarc/unimarc/마크/Marc_Macro_Sub.cs index 13f7df2..75a1f1a 100644 --- a/unimarc/unimarc/마크/Marc_Macro_Sub.cs +++ b/unimarc/unimarc/마크/Marc_Macro_Sub.cs @@ -88,8 +88,8 @@ namespace UniMarc.마크 { "55", "110", "태그삭제" }, ///////// - // { "52", "440", "440n p x -> 490v [p-n-v 순서]로 변환" }, - // { "53", "440", "440n p x -> 830 n p v로 변환" }, + { "56", "440", "440n p x -> 490v [p-n-v 순서]로 변환" }, + { "57", "440", "440n p x -> 830 n p v로 변환" }, }; @@ -130,6 +130,7 @@ namespace UniMarc.마크 continue; result.Add(Macro); } + ViewMarc = String.Join("\n", result); foreach (string i in idx) { @@ -137,7 +138,7 @@ namespace UniMarc.마크 } // 반출용 마크로 변환 - return st.made_Ori_marc(String.Join("\n", result)); + return st.made_Ori_marc(ViewMarc); } private string ChangeTagByIndex(string idx, string ViewMarc) @@ -148,20 +149,65 @@ namespace UniMarc.마크 // 440a를 830a로 복사 if (idx == "50") ViewMarc = TagToOtherTag("440", "a", "830", "a", ViewMarc); - // 440x를 490a로 복사 - if (idx == "51") + // 440x를 490a로 복사 + if (idx == "51") ViewMarc = TagToOtherTag("440", "a", "490", "a", ViewMarc); - // 049v를 090c로 복사 - if (idx == "52") + // 049v를 090c로 복사 + if (idx == "52") ViewMarc = TagToOtherTag("049", "v", "090", "c", ViewMarc); - // 020c를 950b로 복사 - if (idx == "53") + // 020c를 950b로 복사 + if (idx == "53") ViewMarc = TagToOtherTag("020", "c", "950", "b", ViewMarc); - + // 440n p x -> 490v [p-n-v 순서]로 변환 / 440n p x -> 830 n p v로 변환 + if (idx == "56" || idx == "57") + ViewMarc = Sub_440npv(ViewMarc, idx); return ViewMarc; } + #region ChangeTagByIndex_SUB + + private string Sub_440npv(string ViewMarc, string idx) + { + + string oriMarc = st.made_Ori_marc(ViewMarc); + string[] TakeMarc = { "440n", "440p", "440v" }; + string[] TakeTag = st.Take_Tag(oriMarc, TakeMarc); + + /// 해당 태그 내용 있는지 확인. + bool isEmpty = true; + if (TakeTag[0]!="") isEmpty = false; + if (TakeTag[1]!="") isEmpty = false; + if (TakeTag[2]!="") isEmpty = false; + if (isEmpty) return ViewMarc; + + if (idx == "56") // 440n p x -> 490v [p-n-v 순서]로 변환 + { + // 구분 , + string Tag = "490\t \t▼v"; + + if (TakeTag[0] != "") Tag += TakeTag[0] + ", "; + if (TakeTag[1] != "") Tag += TakeTag[1] + ", "; + if (TakeTag[2] != "") Tag += TakeTag[2]; + + Tag += "▲"; + ViewMarc = st.AddTagInMarc(Tag, ViewMarc); + } + + if (idx == "57") // 440n p x -> 830 n p v로 변환 + { + string Tag = "830\t \t"; + + if (TakeTag[0] != "") Tag += "▼n" + TakeTag[0]; + if (TakeTag[1] != "") Tag += "▼p" + TakeTag[1]; + if (TakeTag[2] != "") Tag += "▼v" + TakeTag[2]; + Tag += "▲"; + ViewMarc = st.AddTagInMarc(Tag, ViewMarc); + } + return ViewMarc; + } + #endregion + private string Macro_Index(string[] idx, string ContentTag, string Content) { string[] SplitContent = Content.Split('\t'); diff --git a/unimarc/unimarc/마크/Set_Macro.cs b/unimarc/unimarc/마크/Set_Macro.cs index 4315516..cc8551a 100644 --- a/unimarc/unimarc/마크/Set_Macro.cs +++ b/unimarc/unimarc/마크/Set_Macro.cs @@ -121,51 +121,6 @@ namespace WindowsFormsApp1.Mac count++; } MessageBox.Show("적용되었습니다!"); - /* - Macro_Gudu macro = new Macro_Gudu(FileType); - string Marc_data = ""; - List idxArray = new List(); - - for (int a = 0; a < MacroGrid.Rows.Count; a++) - { - if (MacroGrid.Rows[a].Cells["Check"].Value.ToString().Contains("T")) - { - idxArray.Add(MacroGrid.Rows[a].Cells["idx"].Value.ToString()); - } - } - - foreach (string t in ViewMarcArray) - { - Marc_data += macro.MacroMarc(t, idxArray); - } - - string FileName; - SaveFileDialog saveFileDialog = new SaveFileDialog(); - saveFileDialog.Title = "저장 경로를 지정하세요."; - saveFileDialog.OverwritePrompt = true; - saveFileDialog.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*"; - - if (saveFileDialog.ShowDialog() == DialogResult.OK) - { - if (FileType == "ANSI") - { - FileName = saveFileDialog.FileName; - File.WriteAllText(FileName, Marc_data, Encoding.Default); - } - else if (FileType == "UTF-8") - { - FileName = saveFileDialog.FileName; - File.WriteAllText(FileName, Marc_data, Encoding.UTF8); - } - else if (FileType == "UniCode") - { - FileName = saveFileDialog.FileName; - File.WriteAllText(FileName, Marc_data, Encoding.Unicode); - } - } - - MessageBox.Show("반출되었습니다!"); - */ } private void btn_AddList_Click(object sender, EventArgs e)