From f1883613c94612ee0a3f3ee6117da66aa5f7117e Mon Sep 17 00:00:00 2001 From: ypermitin Date: Fri, 17 Nov 2023 23:31:46 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Исправлено построение пути к каталогам данных --- .../FIASDistributionLoader.cs | 44 +++++++++---------- .../FIASDistributionReader.cs | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Libs/YPermitin.FIASToolSet.DistributionLoader/FIASDistributionLoader.cs b/Libs/YPermitin.FIASToolSet.DistributionLoader/FIASDistributionLoader.cs index 3105271..8540357 100644 --- a/Libs/YPermitin.FIASToolSet.DistributionLoader/FIASDistributionLoader.cs +++ b/Libs/YPermitin.FIASToolSet.DistributionLoader/FIASDistributionLoader.cs @@ -195,7 +195,7 @@ public string ExtractDataForRegion(Region region) distributionFileType = DistributionFileType.GARFIASXmlDelta; var availableRegions = Distribution.GetAvailableRegions(distributionFileType); - var regionItem = availableRegions.FirstOrDefault(e => e == region.Code.ToString()); + var regionItem = availableRegions.FirstOrDefault(e => e == region.Code.ToString("00")); if (regionItem == null) { throw new RegionNotFoundException( @@ -203,7 +203,7 @@ public string ExtractDataForRegion(Region region) region.ToString()); } - Distribution.ExtractDistributionRegionFiles(distributionFileType, region.Code.ToString()); + Distribution.ExtractDistributionRegionFiles(distributionFileType, region.Code.ToString("00")); return GetDataDirectoryForRegion(region); } @@ -215,7 +215,7 @@ public string ExtractDataForRegion(Region region) /// Путь к каталогу с данными по региону public string GetDataDirectoryForRegion(Region region) { - return Path.Combine(_distributionDirectory, region.Code.ToString()); + return Path.Combine(_distributionDirectory, region.Code.ToString("00")); } /// @@ -230,7 +230,7 @@ public void RemoveDistributionRegionDirectory(Region region) else distributionFileType = DistributionFileType.GARFIASXmlDelta; - Distribution.RemoveDistributionRegionDirectory(distributionFileType, region.Code.ToString()); + Distribution.RemoveDistributionRegionDirectory(distributionFileType, region.Code.ToString("00")); } public async Task SetInstallationToStatusNew() @@ -992,7 +992,7 @@ public async Task LoadAddressObjects(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } AddressObjectCollection fiasAddressObjects; @@ -1036,7 +1036,7 @@ public async Task LoadAddressObjectDivisions(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } AddressObjectDivisionCollection fiasAddressObjectDivisions; @@ -1080,7 +1080,7 @@ public async Task LoadAddressObjectParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } AddressObjectParameterCollection fiasAddressObjectParameters; @@ -1124,7 +1124,7 @@ public async Task LoadAddressObjectsAdmHierarchy(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } AddressObjectAdmHierarchyCollection fiasAddressObjectsAdmHierarchy; @@ -1168,7 +1168,7 @@ public async Task LoadAddressObjectsMunHierarchy(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } MunHierarchyCollection fiasAddressObjectsMunHierarchy; @@ -1212,7 +1212,7 @@ public async Task LoadApartments(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } ApartmentCollection fiasApartments; @@ -1256,7 +1256,7 @@ public async Task LoadApartmentParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } ApartmentParameterCollection fiasApartmentParameters; @@ -1300,7 +1300,7 @@ public async Task LoadCarPlaces(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } CarPlaceCollection fiasCarPlaces; @@ -1344,7 +1344,7 @@ public async Task LoadCarPlaceParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } CarPlaceParameterCollection fiasCarPlaceParameters; @@ -1388,7 +1388,7 @@ public async Task LoadHouses(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } HouseCollection fiasHouses; @@ -1432,7 +1432,7 @@ public async Task LoadHouseParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } HouseParameterCollection fiasHouseParameters; @@ -1476,7 +1476,7 @@ public async Task LoadRooms(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } RoomCollection fiasRooms; @@ -1520,7 +1520,7 @@ public async Task LoadRoomParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } RoomParameterCollection fiasRoomParameters; @@ -1564,7 +1564,7 @@ public async Task LoadSteads(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } SteadCollection fiasSteads; @@ -1608,7 +1608,7 @@ public async Task LoadSteadParameters(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } SteadParameterCollection fiasSteadParameters; @@ -1652,7 +1652,7 @@ public async Task LoadNormativeDocuments(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } NormativeDocumentCollection fiasNormativeDocuments; @@ -1696,7 +1696,7 @@ public async Task LoadChangeHistory(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } ChangeHistoryCollection fiasChangeHistory; @@ -1740,7 +1740,7 @@ public async Task LoadObjectsRegistry(Region region) .FirstOrDefault(e => e.Code == region.Code); if (fiasDistributionRegion == null) { - throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString()); + throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00")); } ObjectRegistryCollection fiasObjectsRegistry; diff --git a/Libs/YPermitin.FIASToolSet.DistributionReader/FIASDistributionReader.cs b/Libs/YPermitin.FIASToolSet.DistributionReader/FIASDistributionReader.cs index f300ca1..6811123 100644 --- a/Libs/YPermitin.FIASToolSet.DistributionReader/FIASDistributionReader.cs +++ b/Libs/YPermitin.FIASToolSet.DistributionReader/FIASDistributionReader.cs @@ -521,7 +521,7 @@ private T GetInternalCollection(Region region = null) if (region == null) workingDirectory = _workingDirectory; else - workingDirectory = Path.Combine(_workingDirectory, region.Code.ToString()); + workingDirectory = Path.Combine(_workingDirectory, region.Code.ToString("00")); string dataFile; string[] foundFiles;