Merge pull request #20 from dynamicweb/frn/unable-to-load-tables

Adding fallbacks to commercial license and properly skipping empty ce…
dynamicweb · Mar 25, 2024 · b3e9f80 · b3e9f80
2 parents 0833acf + fbc4268
commit b3e9f80
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Dynamicweb.DataIntegration.Providers.ExcelProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.ExcelProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.0.10</Version>
+		<Version>10.0.11</Version>
 		<AssemblyVersion>1.0.0</AssemblyVersion>
 		<Title>Excel Provider</Title>
 		<Description>Excel Provider</Description>

diff --git a/src/ExcelProvider.cs b/src/ExcelProvider.cs
@@ -363,6 +363,7 @@ public override string ValidateDestinationSettings()
 
         public override string ValidateSourceSettings()
         {
+            ExcelPackage.LicenseContext = LicenseContext.Commercial;
             if (SourceFile.EndsWith(".xlsx", StringComparison.OrdinalIgnoreCase) ||
                 SourceFile.EndsWith(".xls", StringComparison.OrdinalIgnoreCase) ||
                 SourceFile.EndsWith(".xlsm", StringComparison.OrdinalIgnoreCase))

diff --git a/src/ExcelReader.cs b/src/ExcelReader.cs
@@ -34,6 +34,7 @@ public ExcelReader(string filename)
 
         private void LoadExcelFile()
         {
+            ExcelPackage.LicenseContext = LicenseContext.Commercial;
             var fileInfo = new FileInfo(Filename);
             using var package = new ExcelPackage(fileInfo);
             var ds = new DataSet();
@@ -42,9 +43,15 @@ private void LoadExcelFile()
                 var emptyRows = new List<DataRow>();
                 var dataTable = new DataTable(worksheet.Name);
                 var hasHeader = true;
+                int i = 0;
                 foreach (var firstRowCell in worksheet.Cells[1, 1, 1, worksheet.Dimension.End.Column])
                 {
-                    dataTable.Columns.Add(hasHeader ? firstRowCell.Text : string.Format("Column {0}", firstRowCell.Start.Column));
+                    var header = hasHeader ? firstRowCell.Text : string.Format("Column {0}", firstRowCell.Start.Column);
+                    if (!dataTable.Columns.Contains(header) && !string.IsNullOrWhiteSpace(header))
+                        dataTable.Columns.Add(header);
+                    else
+                        dataTable.Columns.Add(header + i);
+                    i++;
                 }
 
                 var startRow = hasHeader ? 2 : 1;
@@ -53,12 +60,14 @@ private void LoadExcelFile()
                     var hasValue = false;
                     var wsRow = worksheet.Cells[rowNum, 1, rowNum, worksheet.Dimension.End.Column];
                     var row = dataTable.Rows.Add();
+                    var c = 0;
                     foreach (var cell in wsRow)
                     {
-                        row[cell.Start.Column - 1] = cell.Text;
+                        row[c] = cell.Text;
 
                         if (!string.IsNullOrWhiteSpace(cell.Text))
                             hasValue = true;
+                        c++;
                     }
 
                     if (!hasValue)