diff --git a/VectoCore/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs index 8361802d1eab79cfda036cc57c79641f2d2819b0..7d30e8762630cc38e763218054de0a419b578371 100644 --- a/VectoCore/VectoCore/Models/Declaration/LookupData.cs +++ b/VectoCore/VectoCore/Models/Declaration/LookupData.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.IO; using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Utils; @@ -61,13 +62,15 @@ namespace TUGraz.VectoCore.Models.Declaration protected static DataTable ReadCsvResource(string resourceId) { -#if USE_EXTENAL_DECLARATION_DATA +//#if USE_EXTENAL_DECLARATION_DATA + var tmp = resourceId.Replace(DeclarationData.DeclarationDataResourcePrefix + ".", ""); + var parts = tmp.Split('.'); return - VectoCSVFile.Read(Path.Combine("Declaration", - resourceId.Replace(DeclarationData.DeclarationDataResourcePrefix + ".", ""))); -#else - return VectoCSVFile.ReadStream(RessourceHelper.ReadStream(resourceId), source: resourceId); -#endif + VectoCSVFile.Read(Path.Combine("Declaration", string.Join(".", parts[parts.Length - 2], parts[parts.Length - 1]) + )); +//#else +// return VectoCSVFile.ReadStream(RessourceHelper.ReadStream(resourceId), source: resourceId); +//#endif } protected static void NormalizeTable(DataTable table)