Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -74,6 +74,7 @@ } return RunActivities(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, locations.Select(location => new DesignWaterLevelCalculationActivity(new DesignWaterLevelCalculation(location), hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, @@ -98,16 +99,19 @@ } return RunActivities(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, locations.Select(location => new WaveHeightCalculationActivity(new WaveHeightCalculation(location), hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, norm, messageProvider)).ToArray()); } - private bool RunActivities(string hydraulicBoundaryDatabasePath, IList activities) where TActivity : Activity + private bool RunActivities(string hydraulicBoundaryDatabasePath, string preprocessorDirectory, + IList activities) where TActivity : Activity { - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabasePath); + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabasePath, + preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) { ActivityProgressDialogRunner.Run(viewParent, activities); Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs =================================================================== diff -u -rc230da5631e073c87657dd0f32aa7c3651c427df -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision c230da5631e073c87657dd0f32aa7c3651c427df) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -153,7 +153,7 @@ } catch (ConversionException) { - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } } @@ -195,7 +195,7 @@ } catch (ConversionException) { - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } } @@ -230,7 +230,7 @@ } catch (ConversionException) { - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } } @@ -275,7 +275,7 @@ } catch (ConversionException) { - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } } @@ -314,7 +314,7 @@ } catch (ConversionException) { - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } @@ -328,7 +328,7 @@ if (!ContainsRequiredTables(GetColumnDefinitions(Connection))) { CloseConnection(); - throw new CriticalFileReadException(Resources.HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema); + throw new CriticalFileReadException(Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema); } } Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -45,9 +45,10 @@ /// database with a Hydraulic Location Configurations database next to it. /// /// The path of the Hydraulic Boundary Locations database file. + /// The preprocessor directory. /// A describing the problem when trying to connect to the /// or null if a connection could be correctly made. - public static string ValidatePathForCalculation(string filePath) + public static string ValidatePathForCalculation(string filePath, string preprocessorDirectory) { try { @@ -78,14 +79,19 @@ } string hlcdFilePath = Path.Combine(directoryName, hlcdFileName); using (new HydraulicLocationConfigurationSqLiteDatabaseReader(hlcdFilePath)) {} - using (new DesignTablesSettingsProvider(settingsDatabaseFileName)) {} - using (new TimeIntegrationSettingsProvider(settingsDatabaseFileName)) {} - using (new NumericsSettingsProvider(settingsDatabaseFileName)) {} } catch (CriticalFileReadException e) { return e.Message; } + + using (var validator = new HydraRingSettingsDatabaseValidator(settingsDatabaseFileName, preprocessorDirectory)) + { + if (!validator.ValidateSchema()) + { + return Resources.HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema; + } + } return null; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r7fdb9ddecbc7af4274481b403f0cf6c7fe78b868 -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7fdb9ddecbc7af4274481b403f0cf6c7fe78b868) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -902,10 +902,10 @@ /// /// Looks up a localized string similar to De rekeninstellingen database heeft niet het juiste schema.. /// - public static string HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_database_has_invalid_schema { + public static string HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_schema { get { - return ResourceManager.GetString("HydraRingSettingsDatabaseReader_ValidateSchema_Hydraulic_calculation_settings_dat" + - "abase_has_invalid_schema", resourceCulture); + return ResourceManager.GetString("HydraRingSettingsDatabase_Hydraulic_calculation_settings_database_has_invalid_sch" + + "ema", resourceCulture); } } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -r7fdb9ddecbc7af4274481b403f0cf6c7fe78b868 -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 7fdb9ddecbc7af4274481b403f0cf6c7fe78b868) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -465,7 +465,7 @@ Kon het rekeninstellingen bestand niet openen. {0} - + De rekeninstellingen database heeft niet het juiste schema. Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -61,7 +61,8 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { CalculationServiceHelper.LogMessagesAsError(Resources.Hydraulic_boundary_database_connection_failed_0_, Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -42,7 +42,8 @@ return Resources.HydraulicBoundaryDatabaseConnectionValidator_No_hydraulic_boundary_database_imported; } - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(database.FilePath); + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(database.FilePath, + database.EffectivePreprocessorDirectory()); if (!string.IsNullOrEmpty(validationProblem)) { return string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, Index: Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -339,13 +339,15 @@ { var validationResults = new List(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath); + string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { validationResults.Add(databaseFilePathValidationProblem); } - string preprocessorDirectoryValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePreprocessorDirectory(assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + string preprocessorDirectoryValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePreprocessorDirectory(preprocessorDirectory); if (!string.IsNullOrEmpty(preprocessorDirectoryValidationProblem)) { validationResults.Add(preprocessorDirectoryValidationProblem); Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -62,7 +62,8 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { CalculationServiceHelper.LogMessagesAsError(Resources.Hydraulic_boundary_database_connection_failed_0_, Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -42,7 +42,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, ""); // Assert Assert.IsNull(result); @@ -56,7 +56,7 @@ string filePath = Path.Combine(testDataPath, nonexistingSqlite); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, ""); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -70,7 +70,7 @@ invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidPath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidPath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{invalidPath}':", result); @@ -83,7 +83,7 @@ string filePath = Path.Combine(testDataPath, "/"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -96,7 +96,7 @@ string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); @@ -109,7 +109,7 @@ string validFilePath = Path.Combine(testDataPath, "withoutSettings", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); @@ -122,7 +122,7 @@ string validFilePath = Path.Combine(testDataPath, "invalidSettingsSchema", "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert Assert.AreEqual("De rekeninstellingen database heeft niet het juiste schema.", result); @@ -138,7 +138,7 @@ "\\followedbythefile"; // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidFilePath, testDataPath); // Assert Assert.AreEqual($"Het opgegeven bestandspad ({invalidFilePath}) is niet geldig.", result); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -77,7 +77,8 @@ throw new ArgumentNullException(nameof(locations)); } - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath); + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(validationProblem)) { log.ErrorFormat(RingtoetsCommonFormsResources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_, Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -60,7 +60,8 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -772,13 +772,15 @@ { var validationResults = new List(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath); + string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { validationResults.Add(databaseFilePathValidationProblem); } - string preprocessorDirectoryValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePreprocessorDirectory(assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + string preprocessorDirectoryValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePreprocessorDirectory(preprocessorDirectory); if (!string.IsNullOrEmpty(preprocessorDirectoryValidationProblem)) { validationResults.Add(preprocessorDirectoryValidationProblem); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -836,8 +836,8 @@ IEnumerable sectionsWithDatabase = ringtoetsProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase != null); foreach (AssessmentSection section in sectionsWithDatabase) { - string selectedFile = section.HydraulicBoundaryDatabase.FilePath; - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(selectedFile); + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(section.HydraulicBoundaryDatabase.FilePath, + section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); if (validationProblem != null) { log.WarnFormat( Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -re2892835ceb1c916be9a9122ba372858f20b981a -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision e2892835ceb1c916be9a9122ba372858f20b981a) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -205,7 +205,8 @@ { var validationResults = new List(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath); + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { validationResults.Add(databaseFilePathValidationProblem);