diff --git a/unimarc/.vs/unimarc/FileContentIndex/96c0044e-f26c-4c19-815c-2b43691aea9b.vsidx b/unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx similarity index 82% rename from unimarc/.vs/unimarc/FileContentIndex/96c0044e-f26c-4c19-815c-2b43691aea9b.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx index daccd80..2a26a53 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/96c0044e-f26c-4c19-815c-2b43691aea9b.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/217551f0-df85-4052-950e-139eeb32fc48.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/5cb773e0-eca0-4c5a-8cf2-d9c2071057e4.vsidx b/unimarc/.vs/unimarc/FileContentIndex/5b896a2e-b895-464f-859c-48f62f30cd6e.vsidx similarity index 63% rename from unimarc/.vs/unimarc/FileContentIndex/5cb773e0-eca0-4c5a-8cf2-d9c2071057e4.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/5b896a2e-b895-464f-859c-48f62f30cd6e.vsidx index a99a582..e3cf0f7 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/5cb773e0-eca0-4c5a-8cf2-d9c2071057e4.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/5b896a2e-b895-464f-859c-48f62f30cd6e.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/6dd2f0b8-07a9-4453-aee5-5bd62c17b2e4.vsidx b/unimarc/.vs/unimarc/FileContentIndex/b8926f63-e13a-4e80-8400-21332bfbb8e9.vsidx similarity index 100% rename from unimarc/.vs/unimarc/FileContentIndex/6dd2f0b8-07a9-4453-aee5-5bd62c17b2e4.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/b8926f63-e13a-4e80-8400-21332bfbb8e9.vsidx diff --git a/unimarc/.vs/unimarc/FileContentIndex/bedaddd2-a207-45d9-8c04-25efe81849f7.vsidx b/unimarc/.vs/unimarc/FileContentIndex/bedaddd2-a207-45d9-8c04-25efe81849f7.vsidx deleted file mode 100644 index 62f185d..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/bedaddd2-a207-45d9-8c04-25efe81849f7.vsidx and /dev/null 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 new file mode 100644 index 0000000..e99ed2e Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/ecd536b0-ac79-4fcd-a58a-3e22234c1e09.vsidx differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 3ac0e30..91c1c58 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/Setup_UniMarc/Debug/setup.exe b/unimarc/Setup_UniMarc/Debug/setup.exe deleted file mode 100644 index 29091de..0000000 Binary files a/unimarc/Setup_UniMarc/Debug/setup.exe and /dev/null differ diff --git a/unimarc/Setup_UniMarc/Debug/unimarc.zip b/unimarc/Setup_UniMarc/Debug/unimarc.zip deleted file mode 100644 index 6cb1ce8..0000000 Binary files a/unimarc/Setup_UniMarc/Debug/unimarc.zip and /dev/null differ diff --git a/unimarc/Setup_UniMarc/Setup_UniMarc.zip b/unimarc/Setup_UniMarc/Setup_UniMarc.zip deleted file mode 100644 index 3fec8de..0000000 Binary files a/unimarc/Setup_UniMarc/Setup_UniMarc.zip and /dev/null differ diff --git a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi b/unimarc/UniMarcSetup/Debug/UniMarcSetup.msi similarity index 55% rename from unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi rename to unimarc/UniMarcSetup/Debug/UniMarcSetup.msi index e211a26..c3d572f 100644 Binary files a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi and b/unimarc/UniMarcSetup/Debug/UniMarcSetup.msi differ diff --git a/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj b/unimarc/UniMarcSetup/UniMarcSetup.vdproj similarity index 81% rename from unimarc/Setup_UniMarc/Setup_UniMarc.vdproj rename to unimarc/UniMarcSetup/UniMarcSetup.vdproj index e17d9e1..034eda2 100644 --- a/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj +++ b/unimarc/UniMarcSetup/UniMarcSetup.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:Setup_UniMarc" +"ProjectName" = "8:UniMarcSetup" "LanguageId" = "3:1042" "CodePage" = "3:949" "UILanguageId" = "3:1042" @@ -15,26 +15,26 @@ { "Entry" { - "MsmKey" = "8:_C0D91E30A1E44E66A4EEA4BF161D7237" + "MsmKey" = "8:_30910C6D846D44E6AE488D5CFB73A8E8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C9E9660E517B4B2EBF42BDAD9C6DB38D" + "MsmKey" = "8:_D9A06225265F449AB2166678B3772613" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC6E313CD6974E298DD274D14C737326" + "MsmKey" = "8:_DB613D3560F844F89E088F109623E80F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C9E9660E517B4B2EBF42BDAD9C6DB38D" + "OwnerKey" = "8:_DB613D3560F844F89E088F109623E80F" "MsmSig" = "8:_UNDEFINED" } } @@ -45,7 +45,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\Setup_UniMarc.msi" + "OutputFilename" = "8:Debug\\UniMarcSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -55,29 +55,13 @@ "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" { "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\Setup_UniMarc.msi" + "OutputFilename" = "8:Release\\UniMarcSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -87,22 +71,6 @@ "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" - } - } - } } } "Deployable" @@ -120,7 +88,7 @@ { "LaunchCondition" { - "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_859A541232874316AA25556C4704F09F" + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_8F2265264B8040D79F0EB8FCF793D0D9" { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" @@ -132,12 +100,12 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C0D91E30A1E44E66A4EEA4BF161D7237" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_30910C6D846D44E6AE488D5CFB73A8E8" { - "SourcePath" = "8:..\\UniMarc\\Update.inf" - "TargetName" = "8:Update.inf" + "SourcePath" = "8:..\\Factory_Client\\UniMarc.ico" + "TargetName" = "8:UniMarc.ico" "Tag" = "8:" - "Folder" = "8:_5AFD85B9101B47DB9537A694229E7941" + "Folder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -152,12 +120,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC6E313CD6974E298DD274D14C737326" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D9A06225265F449AB2166678B3772613" { - "SourcePath" = "8:..\\..\\..\\..\\Downloads\\3700474-address-agenda-book-bookmark-business-interface-notebook_108749.ico" - "TargetName" = "8:3700474-address-agenda-book-bookmark-business-interface-notebook_108749.ico" + "SourcePath" = "8:..\\Factory_Client\\Update.inf" + "TargetName" = "8:Update.inf" "Tag" = "8:" - "Folder" = "8:_5AFD85B9101B47DB9537A694229E7941" + "Folder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -178,19 +146,18 @@ } "Folder" { - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_5AFD85B9101B47DB9537A694229E7941" + "{1525181F-901A-416C-8A58-119130FE478E}:_3D727FC4A8BB41DABE294210589BB7CD" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" - "Name" = "8:#1925" + "Name" = "8:#1916" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:TARGETDIR" + "Property" = "8:DesktopFolder" "Folders" { } } - "{1525181F-901A-416C-8A58-119130FE478E}:_74D25C29FA384AD0AAE9D733594F6B6A" + "{1525181F-901A-416C-8A58-119130FE478E}:_7289ABD2FB4B45B68B477B86A524EE33" { "Name" = "8:#1919" "AlwaysCreate" = "11:FALSE" @@ -201,13 +168,14 @@ { } } - "{1525181F-901A-416C-8A58-119130FE478E}:_C702D9CCA84A4CB990260A30151CE064" + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_A364675CFF7847C09ACEC7EAA54B96DD" { - "Name" = "8:#1916" + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" - "Property" = "8:DesktopFolder" + "Property" = "8:TARGETDIR" "Folders" { } @@ -227,22 +195,22 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:UniMarc" - "ProductCode" = "8:{EDF26337-7213-4095-8192-47B207DA1D2E}" - "PackageCode" = "8:{C23807CC-B509-4669-83CB-9EDC060EFB71}" - "UpgradeCode" = "8:{497EEF84-0C88-4876-92B4-F89BC45D47C4}" + "ProductName" = "8:UniMarcSetup" + "ProductCode" = "8:{62E4D8A3-7F37-4828-9238-D6FB49959200}" + "PackageCode" = "8:{3984A08A-DE01-47F3-BFC3-552DE33D5621}" + "UpgradeCode" = "8:{2D549369-04D2-49C2-94AB-EC5FC472D5F6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:GloriaBook" + "Manufacturer" = "8:Microsoft Corporation" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:UniMarc" + "Title" = "8:UniMarcSetup" "Subject" = "8:" - "ARPCONTACT" = "8:GloriaBook" + "ARPCONTACT" = "8:Microsoft Corporation" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" @@ -261,7 +229,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_3A8E60C26E4D4C5AAA8BB53CEF123936" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_19AF8825D45F48E5B7D887D3E89F054B" { "Name" = "8:Software" "Condition" = "8:" @@ -270,7 +238,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_372E1CA4BC4641F1A4F76556954DE577" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_C60C19081F8D47E09C5DA294C1E43313" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -295,7 +263,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_F658799EF7054A6B8BADC52A5505C512" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_452A1DCEB1F943DEAEC35D5A474B681B" { "Name" = "8:Software" "Condition" = "8:" @@ -304,7 +272,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_9DA2931BEE474E1C857EF2751921FAFA" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_9AF4D625822548E1925CDD6CEC1E7847" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -349,7 +317,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4E728D6345A04482BB3C40FF8A5FC5DD" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_241AF677901B496384371820B6FFF937" { "Name" = "8:UniMarc" "Arguments" = "8:" @@ -357,13 +325,13 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_C9E9660E517B4B2EBF42BDAD9C6DB38D" - "Folder" = "8:_74D25C29FA384AD0AAE9D733594F6B6A" - "WorkingFolder" = "8:_5AFD85B9101B47DB9537A694229E7941" - "Icon" = "8:_EC6E313CD6974E298DD274D14C737326" + "Target" = "8:_DB613D3560F844F89E088F109623E80F" + "Folder" = "8:_7289ABD2FB4B45B68B477B86A524EE33" + "WorkingFolder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD" + "Icon" = "8:_30910C6D846D44E6AE488D5CFB73A8E8" "Feature" = "8:" } - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_8596342268F74CD084556BCA65072910" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_55E2D093148047B69FD538E883FBE888" { "Name" = "8:UniMarc" "Arguments" = "8:" @@ -371,237 +339,29 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_C9E9660E517B4B2EBF42BDAD9C6DB38D" - "Folder" = "8:_C702D9CCA84A4CB990260A30151CE064" - "WorkingFolder" = "8:_5AFD85B9101B47DB9537A694229E7941" - "Icon" = "8:_EC6E313CD6974E298DD274D14C737326" + "Target" = "8:_DB613D3560F844F89E088F109623E80F" + "Folder" = "8:_3D727FC4A8BB41DABE294210589BB7CD" + "WorkingFolder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD" + "Icon" = "8:_30910C6D846D44E6AE488D5CFB73A8E8" "Feature" = "8:" } } "UserInterface" { - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_00BAAF639041445D8758EE49845E82AE" - { - "Name" = "8:#1900" - "Sequence" = "3:1" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_300D49211A7F4ACD964346ACC585FADB" - { - "Sequence" = "3:300" - "DisplayName" = "8:설치 확인" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_81722C49799946BFB4197D6B650A0243" - { - "Sequence" = "3:100" - "DisplayName" = "8:환영" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_FF1B5CB7BFBB4EA8AD0EEBA2681A4F4B" - { - "Sequence" = "3:200" - "DisplayName" = "8:설치 폴더" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "InstallAllUsersVisible" - { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_5101E816B053471AACEEABFF24F6534B" - { - "Name" = "8:#1902" - "Sequence" = "3:1" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E658AA1E4A7D4A098DE825E2542D3CE2" - { - "Sequence" = "3:100" - "DisplayName" = "8:마침" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "UpdateText" - { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_60E5E22247614D74AEB2B4020288338B" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_951DCADFFCA244C197B30AFED878CB64" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_26D1FDED57584A828B2F152FCA68B84E" { "UseDynamicProperties" = "11:FALSE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdBasicDialogs.wim" } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9689451EAF9C477483462B0739A3EA1F" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_28EFEDF2FEEE4B948CD5C37B483E1F1D" { "Name" = "8:#1900" "Sequence" = "3:2" "Attributes" = "3:1" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_72582A6007D64F14BF296A79EE0E9F70" - { - "Sequence" = "3:200" - "DisplayName" = "8:설치 폴더" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_81D486D09D8D46A9AF28FD7B729ABB6C" - { - "Sequence" = "3:300" - "DisplayName" = "8:설치 확인" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F7CF387B7EF5459A8BEC3F7E4F20AF4A" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_093E8F781E8E460D8FE59794CC147AEB" { "Sequence" = "3:100" "DisplayName" = "8:환영" @@ -649,22 +409,13 @@ } } } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B2B91BC49E58401E8A5627F9172C30AD" - { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B0201949CA8C42138CFEF8642419239D" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9B9E09F406474B7C8691A1E673095890" { - "Sequence" = "3:100" - "DisplayName" = "8:진행률" + "Sequence" = "3:200" + "DisplayName" = "8:설치 폴더" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" "Properties" { "BannerBitmap" @@ -678,31 +429,46 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "ShowProgress" + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D78735E62E0545AABC0F45E31884F3FE" + { + "Sequence" = "3:300" + "DisplayName" = "8:설치 확인" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } } } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_BDD453D8457841AE8CE633D56FB6922C" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_4BC51CE20DFD40CF9CD1F50C269B918D" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8DB1B92FAD734F3F960D918A5806E22E" { "Name" = "8:#1901" "Sequence" = "3:1" "Attributes" = "3:2" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_FF9D943C901542BD8E778F35DF83AE17" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B3F7CD17C0684E94BB3792147E4B594F" { "Sequence" = "3:100" "DisplayName" = "8:진행률" @@ -739,14 +505,14 @@ } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_CCE77E92471C4142837F53EDB76D187E" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B3C367B5515947F78BCB163FB7E72A4C" { "Name" = "8:#1902" "Sequence" = "3:2" "Attributes" = "3:3" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BC51797D2C7148BCBABD220A51062DCA" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A98EA94A96D749138181EE264DBBBC99" { "Sequence" = "3:100" "DisplayName" = "8:마침" @@ -770,18 +536,220 @@ } } } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_CF3C04DF2791409896D1FC4D2D5E69BF" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7C484F01E0274AFE9FCACDF79A64A1DC" + { + "Sequence" = "3:100" + "DisplayName" = "8:진행률" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D25DB151BEC64DF781F30A07DE6EB050" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F342B6CB07A74C0C93C9E9C8784FC5C1" + { + "Sequence" = "3:100" + "DisplayName" = "8:마침" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_F5EB2BF652344C4396450EFD7D813B19" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1D31CA2C29934B3F87DAB023B3F65ED2" + { + "Sequence" = "3:100" + "DisplayName" = "8:환영" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BD9DDF47ACC943E3B8F2DBFD651A2C76" + { + "Sequence" = "3:300" + "DisplayName" = "8:설치 확인" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_EA8DCEC06D294244A018D2263F272DC4" + { + "Sequence" = "3:200" + "DisplayName" = "8:설치 폴더" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } } "MergeModule" { } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C9E9660E517B4B2EBF42BDAD9C6DB38D" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DB613D3560F844F89E088F109623E80F" { "SourcePath" = "8:..\\Factory_Client\\obj\\Debug\\Factory_Client.exe" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_5AFD85B9101B47DB9537A694229E7941" + "Folder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" diff --git a/unimarc/unimarc.sln b/unimarc/unimarc.sln index f7a8d5e..8840ad2 100644 --- a/unimarc/unimarc.sln +++ b/unimarc/unimarc.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniMarc", "UniMarc\UniMarc. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Factory_Client", "Factory_Client\Factory_Client.csproj", "{380772D6-8825-4008-9F46-AE9F8AA8EE7B}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "UniMarcSetup", "UniMarcSetup\UniMarcSetup.vdproj", "{B0A88F76-DC68-44F9-90B4-CD94625CC1F4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,8 @@ Global {380772D6-8825-4008-9F46-AE9F8AA8EE7B}.Debug|Any CPU.Build.0 = Debug|Any CPU {380772D6-8825-4008-9F46-AE9F8AA8EE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {380772D6-8825-4008-9F46-AE9F8AA8EE7B}.Release|Any CPU.Build.0 = Release|Any CPU + {B0A88F76-DC68-44F9-90B4-CD94625CC1F4}.Debug|Any CPU.ActiveCfg = Debug + {B0A88F76-DC68-44F9-90B4-CD94625CC1F4}.Release|Any CPU.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/unimarc/unimarc/Login.cs b/unimarc/unimarc/Login.cs index 25f00c9..dabc0cd 100644 --- a/unimarc/unimarc/Login.cs +++ b/unimarc/unimarc/Login.cs @@ -107,18 +107,24 @@ namespace WindowsFormsApp1 { get { - string url = "http://checkip.dyndns.org/"; - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); - request.Method = "GET"; + string externalIp = new WebClient().DownloadString("http://ipinfo.io/ip").Trim(); // http://icanhazip.com - string resResult = string.Empty; - using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) - { - StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8, true); - resResult = reader.ReadToEnd(); - } - string realip = Parsing(Parsing(resResult, "Current IP Address:")[1], "")[0].Trim(); - return realip; + if (string.IsNullOrWhiteSpace(externalIp)) + externalIp = GetIP; + return externalIp; + + // string url = "http://checkip.dyndns.org/"; + // HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + // request.Method = "GET"; + // + // string resResult = string.Empty; + // using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) + // { + // StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8, true); + // resResult = reader.ReadToEnd(); + // } + // string realip = Parsing(Parsing(resResult, "Current IP Address:")[1], "")[0].Trim(); + // return realip; } } diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 477935e..da953b5 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -140,12 +140,13 @@ namespace WindowsFormsApp1 private Image SetPicture(string Text) { Image[] source_Home = { - Resources._1_2_사용자관리, Resources._1_3_납품처관리 + Resources._1_2_사용자관리, Resources._1_3_납품처관리, Resources._1_4_주문처관리, Resources._1_5_도서정보관리 }; Image[] source_Marc = { Resources._3_1_1_마크작성, Resources._3_1_2_마크목록, Resources._3_1_3_소장자료검색, Resources._3_1_4_마크정리, Resources._3_1_5_복본조사, Resources._3_1_6_ISBN조회, + Resources._3_2_1_목록, Resources._3_2_2_편목, Resources._3_2_1_반입, Resources._3_2_2_반출, Resources._3_3_1_전집관리, Resources._3_3_2_저자기호, Resources._3_4_1_DLS조회입력, Resources._3_4_2_DLS복본조사, @@ -158,6 +159,7 @@ namespace WindowsFormsApp1 string[] Marc = { "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회", + "DVD/CD/LP 목록", "DVD/CD/LP 편목", "반입", "반출", "전집관리", "저자기호", "DLS 조회 입력", "DLS 복본 조사", @@ -211,18 +213,19 @@ namespace WindowsFormsApp1 }; string[] Marc = { - "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입", - "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리", + "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", + "DVD/CD/LP 목록", "DVD/CD/LP 편목", + "반입", "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리", "검수", "저자기호", "DLS 조회 입력", "서류작성", "마크통계", "장비관리" }; ToolStripMenuItem[] MarcT = { - 마크작성, 마크목록, 소장자료검색, 마크정리, iSBN조회, 마크반입, + 마크작성, 마크목록, 소장자료검색, 마크정리, iSBN조회, 목록, 편목, 마크반입, 마크반출, 복본조사1, dLS복본조사, 마크수집, 전집관리, 검수, 저자기호, DLS조회, 서류작성, 마크통계, 장비관리 }; ToolStripMenuItem[] TempMarc = { - 마크작업, 마크작업, 마크작업, 마크작업, 마크작업, 반입및반출, + 마크작업, 마크작업, 마크작업, 마크작업, 마크작업, dVDCDLPToolStripMenuItem, dVDCDLPToolStripMenuItem, 반입및반출, 반입및반출, 마크작업, DLS, 부가기능, 부가기능, 부가기능, 부가기능, DLS, 마크기타, 마크기타, 마크기타 diff --git a/unimarc/unimarc/Properties/Resources.Designer.cs b/unimarc/unimarc/Properties/Resources.Designer.cs index d80955c..1bf8282 100644 --- a/unimarc/unimarc/Properties/Resources.Designer.cs +++ b/unimarc/unimarc/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace UniMarc.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -100,6 +100,26 @@ namespace UniMarc.Properties { } } + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap _1_4_주문처관리 { + get { + object obj = ResourceManager.GetObject("_1_4_주문처관리", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap _1_5_도서정보관리 { + get { + object obj = ResourceManager.GetObject("_1_5_도서정보관리", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. /// @@ -160,6 +180,16 @@ namespace UniMarc.Properties { } } + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap _3_2_1_목록 { + get { + object obj = ResourceManager.GetObject("_3_2_1_목록", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. /// @@ -180,6 +210,16 @@ namespace UniMarc.Properties { } } + /// + /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. + /// + internal static System.Drawing.Bitmap _3_2_2_편목 { + get { + object obj = ResourceManager.GetObject("_3_2_2_편목", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. /// diff --git a/unimarc/unimarc/Properties/Resources.resx b/unimarc/unimarc/Properties/Resources.resx index 80e089a..ac1320a 100644 --- a/unimarc/unimarc/Properties/Resources.resx +++ b/unimarc/unimarc/Properties/Resources.resx @@ -169,4 +169,16 @@ ..\Resources\3_1_6_ISBN조회.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\1_4_주문처관리.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\1_5_도서정보관리.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\3_2_1_목록.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\3_2_2_편목.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/unimarc/unimarc/Resources/1_4_주문처관리.png b/unimarc/unimarc/Resources/1_4_주문처관리.png new file mode 100644 index 0000000..dc8219d Binary files /dev/null and b/unimarc/unimarc/Resources/1_4_주문처관리.png differ diff --git a/unimarc/unimarc/Resources/1_5_도서정보관리.png b/unimarc/unimarc/Resources/1_5_도서정보관리.png new file mode 100644 index 0000000..513f1f7 Binary files /dev/null and b/unimarc/unimarc/Resources/1_5_도서정보관리.png differ diff --git a/unimarc/unimarc/Resources/3_2_1_목록.png b/unimarc/unimarc/Resources/3_2_1_목록.png new file mode 100644 index 0000000..f929c7f Binary files /dev/null and b/unimarc/unimarc/Resources/3_2_1_목록.png differ diff --git a/unimarc/unimarc/Resources/3_2_2_편목.png b/unimarc/unimarc/Resources/3_2_2_편목.png new file mode 100644 index 0000000..7bf02fd Binary files /dev/null and b/unimarc/unimarc/Resources/3_2_2_편목.png differ diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 1148546..9f506d4 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -1402,12 +1402,18 @@ + + + + + + \ No newline at end of file diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index e1c6c1e..29d5932 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 9d5e60b..0986613 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 4d1d298..dce615a 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/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6fec9f6..d9faa7b 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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 0aa24cb..13003c4 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.Properties.Resources.resources b/unimarc/unimarc/obj/Debug/UniMarc.Properties.Resources.resources index 37b1b64..d049fea 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.Properties.Resources.resources and b/unimarc/unimarc/obj/Debug/UniMarc.Properties.Resources.resources differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index beb3553..f3b215f 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index e1c6c1e..29d5932 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 9d5e60b..0986613 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 4d1d298..dce615a 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.cs b/unimarc/unimarc/마크/CD_LP.cs index 810eff9..1929cc5 100644 --- a/unimarc/unimarc/마크/CD_LP.cs +++ b/unimarc/unimarc/마크/CD_LP.cs @@ -29,7 +29,7 @@ namespace UniMarc.마크 compidx = main.com_idx; name = main.User; - string[] Site = { "교보문고", "알라딘(미구현)" }; + string[] Site = { "교보문고", "알라딘" }; cb_SiteCon.Items.AddRange(Site); cb_SiteCon.SelectedIndex = 0; @@ -41,10 +41,6 @@ namespace UniMarc.마크 private void Btn_Connect_Click(object sender, EventArgs e) { int site = cb_SiteCon.SelectedIndex; - - // if (site < 0) - if (site != 0) // 알라딘 미구현으로 인해 알라딘 막아놓음 - return; CD_LP_Sub sub = new CD_LP_Sub(this); sub.Show(); @@ -75,7 +71,7 @@ namespace UniMarc.마크 lbl_date.Text = date; string Table = "DVD_List_Product"; - string Area = "`idx`, `num`, `code`, `title`, `author`, `comp`, `price`, `marc`"; + string Area = "`idx`, `num`, `code`, `title`, `artist`, `comp`, `price`, `marc`"; string[] Search_Table = { "compidx", "listname", "date" }; string[] Search_Column = { compidx, ListName, date }; @@ -83,7 +79,7 @@ namespace UniMarc.마크 string res = db.DB_Send_CMD_Search(cmd); string[] ary_res = res.Split('|'); - // idx num code title author comp price marc + // idx num code title artist comp price marc string[] grid = { "", "", "", "", "", "", "", "" }; for (int a = 0; a < ary_res.Length; a++) { @@ -151,26 +147,26 @@ namespace UniMarc.마크 string[] SearchTag = { "020a", "020c", "245a", "260b" }; string[] ContentTag = st.Take_Tag(orimarc, SearchTag); - string[] AuthorTag = { "100a", "110a", "111a" }; - string[] ContentAuthor = st.Take_Tag(orimarc, AuthorTag); - string Author = TakeAuthor(ContentAuthor); + string[] artistTag = { "100a", "110a", "111a" }; + string[] Contentartist = st.Take_Tag(orimarc, artistTag); + string artist = Takeartist(Contentartist); if (isAdd) { - // idx num code title author comp price marc - string[] Grid = { "", num, ContentTag[0], ContentTag[2], Author, ContentTag[3], ContentTag[1], orimarc }; + // idx num code title artist comp price marc + string[] Grid = { "", num, ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], orimarc }; dataGridView1.Rows.Add(Grid); // DB INSERT 준비 string Table = "DVD_List_Product"; string[] InsertTbl = { "compidx", "listname", "date", "user", "num", - "code", "title", "author", "comp", "price", + "code", "title", "artist", "comp", "price", "marc", "type" }; string[] InsertCol = { compidx, listtitle, date, name, num, - ContentTag[0], ContentTag[2], Author, ContentTag[3], ContentTag[1], + ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], orimarc, Type }; string cmd = db.DB_INSERT(Table, InsertTbl, InsertCol); @@ -187,7 +183,7 @@ namespace UniMarc.마크 marcidx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); dataGridView1.Rows[a].Cells["code"].Value = ContentTag[0]; dataGridView1.Rows[a].Cells["title"].Value = ContentTag[2]; - dataGridView1.Rows[a].Cells["author"].Value = Author; + dataGridView1.Rows[a].Cells["artist"].Value = artist; dataGridView1.Rows[a].Cells["comp"].Value = ContentTag[3]; dataGridView1.Rows[a].Cells["price"].Value = ContentTag[1]; dataGridView1.Rows[a].Cells["marc"].Value = orimarc; @@ -206,8 +202,8 @@ namespace UniMarc.마크 SearchTbl = new string[] { "idx" }; SearchCol = new string[] { marcidx }; } - string[] UpdateTbl = { "num", "code", "title", "author", "comp", "price", "marc", "type" }; - string[] UpdateCol = { num, ContentTag[0], ContentTag[2], Author, ContentTag[3], ContentTag[1], orimarc, Type }; + string[] UpdateTbl = { "num", "code", "title", "artist", "comp", "price", "marc", "type" }; + string[] UpdateCol = { num, ContentTag[0], ContentTag[2], artist, ContentTag[3], ContentTag[1], orimarc, Type }; string cmd = db.More_Update(Table, UpdateTbl, UpdateCol, SearchTbl, SearchCol); db.DB_Send_CMD_reVoid(cmd); @@ -220,7 +216,7 @@ namespace UniMarc.마크 /// /// 태그 100, 110, 111 /// 값이 들어있는 태그의 내용 - string TakeAuthor(string[] ValueArray) + string Takeartist(string[] ValueArray) { string result = ""; foreach (string value in ValueArray) diff --git a/unimarc/unimarc/마크/CD_LP_Sub.cs b/unimarc/unimarc/마크/CD_LP_Sub.cs index b702975..4c61f7f 100644 --- a/unimarc/unimarc/마크/CD_LP_Sub.cs +++ b/unimarc/unimarc/마크/CD_LP_Sub.cs @@ -1,4 +1,6 @@ -using System; +using Microsoft.VisualBasic; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -28,8 +30,6 @@ namespace UniMarc.마크 private void CD_LP_Sub_Load(object sender, EventArgs e) { db.DBcon(); - // 알라딘 비활성화 (사유 : 개발중) - Btn_Aladin.Enabled = false; } public void Btn_KyoBo_Click(object sender, EventArgs e) @@ -51,29 +51,58 @@ namespace UniMarc.마크 private void Btn_Marc_Click(object sender, EventArgs e) { + string result = ""; if (isKyoBo) { - // Code, Name, Author, Comp, Price, PubDate - string[] Data = KyoBoInfor(); - - string[] Track = KyoBoGetTrack(); - - cp.richTextBox1.Text = MakeMarc(Data, Track); + 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); + } + cp.richTextBox1.Text = result; } #region Marc_Sub + #region KyoBo + + bool KyoBo_trDVD_flCD() + { + bool result = false; + foreach (HtmlElement ul in webBrowser1.Document.GetElementsByTagName("ul")) + { + if (ul.GetAttribute("className").IndexOf("main") > -1) + { + if (ul.InnerText.IndexOf("DVD") > -1) + { + result = true; + } + } + } + return result; + } + + #region Music /// /// 앨범의 기본 정보를 가져옴. /// /// [0]Code [1]Name [2]Author [3]Comp [4]Price [5]PubDate - string[] KyoBoInfor() + string[] KyoBoInfor_Music() { string tmp = ""; string Code = ""; string Name = ""; - string Author = ""; + string Artist = ""; string Comp = ""; string Price = ""; string PubDate = ""; @@ -127,19 +156,19 @@ namespace UniMarc.마크 } // div foreach string[] ArrayTmp = tmp.Split('|'); - Author = ArrayTmp[0]; + Artist = ArrayTmp[0]; Comp = ArrayTmp[1]; - Name = Name.Replace(Author + " - ", ""); + Name = Name.Replace(Artist + " - ", ""); Name = Name.Substring(0, Name.IndexOf(" [")); PubDate = Regex.Replace(PubDate, @"[^0-9]", "").Substring(0, 4); Price = Regex.Replace(Price, @"[^0-9]", ""); - string[] result = { Code, Name, Author, Comp, Price, PubDate }; + string[] result = { Code, Name, Artist, Comp, Price, PubDate }; return result; } - string[] KyoBoGetTrack() + string[] KyoBoGetTrack_Music() { // CD,LP구분 디스크갯수 foreach (HtmlElement dl in webBrowser1.Document.GetElementsByTagName("dl")) @@ -176,7 +205,7 @@ namespace UniMarc.마크 /// /// [0]Code [1]Name [2]Author [3]Comp [4]Price [5]PubDate /// - string MakeMarc(string[] Data, string[] Track) + string MakeMarcKyoBo_Music(string[] Data, string[] Track) { string Marc = "020\t \t▼a" + Data[0] + ":▼c\\" + Data[4] + "▲\n"; @@ -204,6 +233,379 @@ namespace UniMarc.마크 } #endregion + #region DVD + + /// + /// DVD 기본 데이터 추출 + /// + /// [0]title, [1]artist, [2]comp, [3]code, [4]price, [5]PubDate, [6]synopsis, [7]actor, [8]data + string[] KyoboInfor_DVD() + { + string title = ""; + string artist = ""; + string comp = ""; + string code = ""; + string price = ""; + string PubDate = ""; + string synopsis = ""; + string actor = ""; + + // 타이틀 가져오기 + foreach (HtmlElement p in webBrowser1.Document.GetElementsByTagName("p")) + { + if (p.GetAttribute("className").IndexOf("subject") > -1) + { + title = p.InnerText; + break; + } + } + + // 제작사, 출시일 가져오기 + string tmpCategory = ""; + string tmp = ""; + foreach (HtmlElement ul in webBrowser1.Document.GetElementsByTagName("ul")) + { + if (ul.GetAttribute("className").IndexOf("newdf") > -1) + { + foreach (HtmlElement em in ul.GetElementsByTagName("em")) + { + tmpCategory += em.InnerText + "|"; + } + foreach (HtmlElement span in ul.GetElementsByTagName("span")) + { + tmp += span.InnerText + "|"; + } + foreach (HtmlElement li in ul.GetElementsByTagName("li")) + { + if (li.GetAttribute("className").IndexOf("date") > -1) + { + PubDate = Regex.Replace(li.InnerText, @"[^0-9]", "").Substring(0, 4); + } + } + } + } + string[] cateArray = tmpCategory.Split('|'); + string[] tmpArray = tmp.Split('|'); + int a = 0; + foreach (string t in cateArray) + { + if (t == "") continue; + + if (t.IndexOf("제작사") > -1) + comp = tmpArray[a]; + + a++; + } + + // 가격, 상품 코드 가져오기 + foreach (HtmlElement dd in webBrowser1.Document.GetElementsByTagName("dd")) + { + if (dd.GetAttribute("className").IndexOf("sale-price") > -1) + price = Regex.Replace(dd.InnerText, @"[^0-9]", ""); // 가격 + + if (dd.GetAttribute("className").IndexOf("product-code") > -1) + code = dd.InnerText.Split(' ')[0]; // 코드 + } + + // 출연진 가져오기 + foreach (HtmlElement p in webBrowser1.Document.GetElementsByTagName("p")) + { + if (p.GetAttribute("className").IndexOf("actor") > -1) + { + actor = p.InnerText; + } + } + + // 시놉시스 & 기타 정보 가져오기 + string tmp_SYNOP = ""; + string data = ""; + foreach (HtmlElement div in webBrowser1.Document.GetElementsByTagName("div")) + { + if (div.GetAttribute("className").IndexOf("product_add") > -1) + { + data = div.InnerText.Replace(actor, "").Replace("\n", " | "); + } + if (div.GetAttribute("className").IndexOf("album_information_content_real") > -1) + { + tmp_SYNOP = div.InnerText; + } + } + + bool isSYNOP = false; + foreach (string t in tmp_SYNOP.Split('\n')) + { + if (isSYNOP) + { + synopsis = t; + break; + } + if (t.IndexOf("SYNOPSIS") > -1) + isSYNOP = true; + } + string[] result = { title, artist, comp, code, price, PubDate, synopsis, actor, data }; + return result; + } + + /// + /// 종합하여 마크를 만드는 함수 + /// + /// [0]title, [1]artist, [2]comp, [3]code, [4]price, [5]PubDate, [6]synopsis, [7]actor, [8]data + /// + string MakeMarcKyoBo_DVD(string[] Data) + { + String_Text st = new String_Text(); + + string title = Data[0].Substring(0, Data[0].IndexOf("[")).Trim(); + string OriTitle = st.GetMiddelString(Data[0], "[", "]"); + string 언어 = MiddleData(Data[8], "언어"); + string 자막 = MiddleData(Data[8], "자막"); + string 화면 = MiddleData(Data[8], "화면"); + string 음향 = MiddleData(Data[8], "음향"); + string 등급 = MiddleData(Data[8], "등급"); + string 상영시간 = MiddleData(Data[8], "상영시간"); + string 디스크수 = MiddleData(Data[8], "디스크수"); + + 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 += "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", 디스크수, 상영시간); + + if (언어 != "") Marc += String.Format("500\t \t▼a언어 : {0}▲\n", 언어); + if (자막 != "") Marc += String.Format("500\t \t▼a자막 : {0}▲\n", 자막); + if (화면 != "") Marc += String.Format("500\t \t▼a화면 : {0}▲\n", 화면); + if (음향 != "") Marc += String.Format("500\t \t▼a음향 : {0}▲\n", 음향); + Marc += "500\t \t▼a지역코드, 3 NTSC▲\n"; + if(OriTitle != null || OriTitle != "") + Marc += "507\t10\t▼a" + OriTitle + "▲\n"; + Marc += String.Format("508\t \t▼제작진 : 감독 {0}▲\n", Data[1]); + + foreach (string Value in Data[7].Split(',')) + { + if (Value == "") + continue; + Marc += "507\t8 \t▼a" + Value.Trim() + "▲\n"; + } + Marc += "520\t \t▼a" + Data[6] + "▲\n"; + Marc += "521\t \t▼a" + 등급 + "▲\n"; + Marc += "538\t \t▼aDVD 전용 플레이어▲\n"; + foreach (string Value in Data[7].Split(',')) + { + if (Value == "") + continue; + Marc += "700\t1 \t▼a" + Value.Trim() + "▲\n"; + } + Marc += "950\t0 \t▼b\\" + Data[4] + "▲\n"; + + return Marc; + } + + string KyoBoMake049(string Lang, string Text) + { + string Marc = ""; // "049\t0 \t"; + //▼a" + Data[3] + ":▼c\\" + Data[4] + "▲\n" + string[] combo6 = { + "한국어", "영어", "일본어", "중국어", "독일어", + "프랑스어", "러시아어", "스페인어", "이탈리아어", "네덜란드어", + "핀란드어", "스웨덴어", "포르투갈어", "노르웨이어", "그리스어", + "체코어", "폴란드어", "다국어", "말레이시아어", "몽골어", + "버마어", "베트남어", "슬로베니아어", "아랍어", "아프리카어", + "에스토니아어", "우즈베키스탄어", "우크라이나어", "마라티어", "캄보디아어", + "태국어", "터키어", "투르크메니스탄어", "티베르어", "타갈로그어", + "헝가리어" }; + + string[] combo6_res = { + "kor", "eng", "jpn", "chi", "ger", + "fre", "rus", "spa", "ita", "dut", + "fin", "swe", "por", "nor", "grc", + "cze", "pol", "mul", "may", "mon", + "bur", "vie", "slv", "ara", "afr", + "est", "uzb", "ukr", "mar", "cam", + "tha", "tur", "tuk", "tib", "tag", + "hun" }; + + foreach (string s in Lang.Split(',')) + { + int count = 0; + foreach (string s2 in combo6) + { + if (s.Trim() == s2) + { + Marc += "▼a" + combo6_res[count]; + } + count++; + } + } + foreach (string s in Text.Split(',')) + { + int count = 0; + foreach (string s2 in combo6) + { + if (s.Trim() == s2) + { + Marc += "▼b" + combo6_res[count]; + } + count++; + } + } + + if (Marc == "") + return ""; + return "049\t0 \t" + Marc + "▲\n"; + } + + string MiddleData(string Data, string Search) + { + Search += " : "; + Data = Data.Replace(" │ ", "│"); + if (Data.IndexOf(Search) > -1) + { + string tmp = Data.Substring(Data.IndexOf(Search) + Search.Length); + + if (tmp.IndexOf("│") > -1) + return tmp.Substring(0, tmp.IndexOf("│")); + else + return tmp.Replace("│", ""); + } + return ""; + } + + #endregion + + #endregion + + #region Aladin + + string[] AladinInfor_Music() + { + string title = ""; + string tmp = ""; + string artist = ""; + string subArtist = ""; + string comp = ""; + string price = ""; + string PubYear = ""; + + string tmpMsg = ""; + + foreach (HtmlElement a in webBrowser1.Document.GetElementsByTagName("a")) + { + if (a.GetAttribute("className").IndexOf("Ere_bo_title") > -1) + title = a.InnerText; + + if (a.GetAttribute("className").IndexOf("Ere_sub2_title") > -1) + { + if (a.GetAttribute("href").IndexOf("Publisher") > -1) + { + comp = a.InnerText; + continue; + } + tmp += a.InnerText + "|"; + } + } + string tmp2 = ""; + foreach (HtmlElement li in webBrowser1.Document.GetElementsByTagName("li")) + { + if (li.GetAttribute("className").IndexOf("Ere_sub2_title") > -1) + { + tmp2 += li.InnerText; + } + } + foreach (HtmlElement div in webBrowser1.Document.GetElementsByTagName("div")) + { + if (div.GetAttribute("className").IndexOf("Ritem") > -1) + { + price = Regex.Replace(div.InnerText, @"[^0-9]", ""); + break; + } + } + + string[] arytmp = tmp.Split('|'); + foreach (string t in arytmp) + { + if (t == "") + continue; + + tmp2 = tmp2.Replace(t, ""); + } + artist = arytmp[0]; + subArtist = string.Join("|", arytmp).Replace(artist, ""); + PubYear = Regex.Replace(tmp2, @"[^0-9]", "").Substring(0, 4); + //PubYear = tmp2.Substring(0, 4); + + isCD = AladinIsCD_Music(); + + string[] result = { title, artist, subArtist, comp, price, PubYear }; + return result; + } + + bool AladinIsCD_Music() + { + foreach (HtmlElement ul in webBrowser1.Document.GetElementsByTagName("ul")) + { + if (ul.Id != null && ul.Id.IndexOf("ulCategory") > -1) + { + if (ul.InnerText.Contains("LP")) + { + return false; + } + } + } + return true; + } + + /// + /// 종합하여 마크를 만드는 함수 + /// + /// [0]title, [1]artist, [2]subArtist, [3]comp, [4]price, [5]PubYear + /// + string MakeMarcAladin_Music(string[] Data) + { + string Marc = "056\t \t▼a▼25▲\n"; + Marc += "100\t1 \t▼a" + Data[1] + "▲\n"; + Marc += "245\t10\t▼a" + Data[0] + "▼h[녹음자료]/▼d" + Data[1] + MakeSubArtist(Data[2]) + "▲\n"; + Marc += "260\t \t▼a서울:▼b" + Data[3] + "▼c" + Data[5] + "▲\n"; + Marc += "300\t \t▼a음반 1매"; + if (isCD) Marc += "▼b디지털, 스테레오▼c12 cm▲\n500\t \t▼a컴팩트 디스크▲\n"; + else Marc += "▼c30 cm▲\n"; + Marc += "508\t \t▼a제작진 : " + Data[1] + "▲\n"; + Marc += "521\t \t▼a전체이용가▲\n"; + Marc += "653\t \t▼a" + Data[0].Replace(" ", "▼a") + "▲\n"; + Marc += "950\t0 \t▼b\\" + Data[4] + "▲\n"; + + return Marc; + } + + /// + /// 245e에 들어갈 자리를 만듦. + /// + /// 메인 아티스트를 제외한 서브 아티스트들 + /// + string MakeSubArtist(string SubArtist) + { + if (SubArtist == "") + return ""; + string[] ary = SubArtist.Split('|'); + + string result = ""; + foreach (string t in ary) + { + if (t == "") + continue; + result += "▼e" + t; + } + return result; + } + #endregion + + #region DVD + + #endregion + + #endregion + private void Btn_Close_Click(object sender, EventArgs e) { this.Close(); diff --git a/unimarc/unimarc/마크/DLS_Copy.cs b/unimarc/unimarc/마크/DLS_Copy.cs index 676065b..c6a8b92 100644 --- a/unimarc/unimarc/마크/DLS_Copy.cs +++ b/unimarc/unimarc/마크/DLS_Copy.cs @@ -157,7 +157,7 @@ namespace WindowsFormsApp1.Mac private bool SearchCopy(bool isISBN) { - if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA")) { + if (!webBrowser1.Url.AbsoluteUri.Contains("collectionFormMA")) { MessageBox.Show("자료관리 창이 아닙니다!"); return false; } @@ -166,7 +166,7 @@ namespace WindowsFormsApp1.Mac for(int a = 0; a < count; a++) { - string Check = ""; + string Check; if (isISBN) { string Target = dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(); Check = SearchISBN(Target); @@ -178,6 +178,10 @@ namespace WindowsFormsApp1.Mac if (Check == "0") Check = ""; dataGridView1.Rows[a].Cells["Check"].Value = Check; + if (Check == "") + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; + else + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; } return true; } diff --git a/unimarc/unimarc/편의기능/Quick_menu.cs b/unimarc/unimarc/편의기능/Quick_menu.cs index 42435e0..c4b54e7 100644 --- a/unimarc/unimarc/편의기능/Quick_menu.cs +++ b/unimarc/unimarc/편의기능/Quick_menu.cs @@ -228,6 +228,7 @@ namespace WindowsFormsApp1.Convenience }; string[] Marc = { "마크 추가", "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회", + "DVD/CD/LP 목록", "DVD/CD/LP 편목", "반입", "반출", "전집관리", "저자기호", "DLS 복본 조사", "DLS 조회 입력", "마크통계"