Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 46ac67d4 authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

Merge branch 'feature/VECTO_GUI' of git+ssh://129.27.107.191:2211/vecto-dev into VECTO_GUI

parents 7c99427a 496567ac
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment