Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -rf641389e854a4ca3746c260a48bf71f89108311a -r857a6665a3a10a1e18d2747d3494c66dec1b6dcd --- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision f641389e854a4ca3746c260a48bf71f89108311a) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 857a6665a3a10a1e18d2747d3494c66dec1b6dcd) @@ -94,7 +94,7 @@ return false; } - string hlcdFilePath = GetHlcdFilePath(); + string hlcdFilePath = ImportTarget.HydraulicLocationConfigurationDatabase.FilePath; ReadResult readHydraulicLocationConfigurationDatabaseResult = ReadHydraulicLocationConfigurationDatabase( hlcdFilePath); @@ -105,6 +105,7 @@ } ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = readHydraulicLocationConfigurationDatabaseResult.Items.Single(); + IEnumerable readHydraulicLocationConfigurationSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings; if (readHydraulicLocationConfigurationSettings != null && readHydraulicLocationConfigurationSettings.Count() != 1) @@ -128,7 +129,7 @@ } AddHydraulicBoundaryDatabaseToDataModel(readHydraulicBoundaryDatabase, readHydraulicLocationConfigurationDatabase, - readExcludedLocationsResult.Items.Single()); + readExcludedLocationsResult.Items.Single(), hlcdFilePath); return true; } @@ -244,11 +245,12 @@ private void AddHydraulicBoundaryDatabaseToDataModel(ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase, ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase, - IEnumerable excludedLocationIds) + IEnumerable excludedLocationIds, + string hlcdFilePath) { NotifyProgress(RiskeerCommonIOResources.Importer_ProgressText_Adding_imported_data_to_AssessmentSection, 4, numberOfSteps); changedObservables.AddRange(updateHandler.Update(ImportTarget, readHydraulicBoundaryDatabase, readHydraulicLocationConfigurationDatabase, - excludedLocationIds, FilePath, GetHlcdFilePath())); + excludedLocationIds, FilePath, hlcdFilePath)); } private ReadResult HandleCriticalFileReadError(Exception e) @@ -271,11 +273,6 @@ Log.Error(errorMessage); } - private string GetHlcdFilePath() - { - return Path.Combine(Path.GetDirectoryName(FilePath), "hlcd.sqlite"); - } - private string BuildErrorMessage(string message) { return BuildErrorMessage(FilePath, message);