From 52261bafe479887956a0c6fcc4bc5a0383ab3d91 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 14 May 2020 09:12:17 +0200
Subject: [PATCH] if declaration-data file cannot be found, use included
resource
---
.../VectoCore/Models/Declaration/LookupData.cs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
index 7d30e87626..e388be473a 100644
--- a/VectoCore/VectoCore/Models/Declaration/LookupData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
@@ -65,12 +65,14 @@ namespace TUGraz.VectoCore.Models.Declaration
//#if USE_EXTENAL_DECLARATION_DATA
var tmp = resourceId.Replace(DeclarationData.DeclarationDataResourcePrefix + ".", "");
var parts = tmp.Split('.');
- return
- 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
+ var fileName = Path.Combine("Declaration", string.Join(".", parts[parts.Length - 2], parts[parts.Length - 1]));
+ if (File.Exists(fileName)) {
+ return VectoCSVFile.Read(fileName);
+ }
+
+ //#else
+ return VectoCSVFile.ReadStream(RessourceHelper.ReadStream(resourceId), source: resourceId);
+ //#endif
}
protected static void NormalizeTable(DataTable table)
--
GitLab