xlsx reader now parses headerless objects

#44
fslaborg · Jul 25, 2023 · b2c3435 · b2c3435
1 parent 65174d9
commit b2c3435
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/src/FsSpreadsheet.ExcelIO/FsExtensions.fs b/src/FsSpreadsheet.ExcelIO/FsExtensions.fs
@@ -79,7 +79,8 @@ module FsExtensions =
             let topLeftBoundary, bottomRightBoundary = Table.getArea table |> Table.Area.toBoundaries
             let ra = FsRangeAddress(FsAddress(topLeftBoundary), FsAddress(bottomRightBoundary))
             let totalsRowShown = if table.TotalsRowShown = null then false else table.TotalsRowShown.Value
-            FsTable(table.Name, ra, totalsRowShown, true)
+            let showHeaderRow = if table.HeaderRowCount = null then false else table.HeaderRowCount.Value = 1u
+            FsTable(table.Name, ra, totalsRowShown, showHeaderRow)
 
         /// <summary>
         /// Returns the FsWorksheet associated with the FsTable in a given FsWorkbook.

diff --git a/src/FsSpreadsheet.ExcelIO/Table.fs b/src/FsSpreadsheet.ExcelIO/Table.fs
@@ -25,8 +25,13 @@ module Table =
 
         /// Given a "A1:A1"-style area, returns A1-based cell start and end cellReferences.
         let toBoundaries (area : StringValue) = 
+
             area.Value.Split ':'
-            |> fun a -> a.[0], a.[1]
+            |> fun a -> 
+                if a.Length = 1 then
+                    area.Value, area.Value
+                else 
+                    a.[0], a.[1]
 
         /// Gets the right boundary of the area.
         let rightBoundary (area : StringValue) = 

diff --git a/tests/FsSpreadsheet.ExcelIO.Tests/Table.fs b/tests/FsSpreadsheet.ExcelIO.Tests/Table.fs
@@ -14,7 +14,14 @@ let transformTable =
             Expect.isTrue (table.TotalsRowShown = null) "Check that field of interest is None"
             FsTable.fromXlsxTable table |> ignore
             )
-
+        testCase "handleNoHeaders" (fun () ->
+            let doc = Spreadsheet.fromFile TestObjects.headerLessTablePath false
+            let wsp = doc.WorkbookPart.WorksheetParts |> Seq.head
+            let t = wsp |> Worksheet.WorksheetPart.getTables |> Seq.head
+            let parsed = FsTable.fromXlsxTable t
+            Expect.equal (parsed.RangeAddress.ToString()) "B8:B8" "Range address should be B8:B8"
+            Expect.isFalse parsed.ShowHeaderRow "ShowHeaderRow should be false"
+        )
     ]
 
 

diff --git a/tests/FsSpreadsheet.ExcelIO.Tests/TestObjects.fs b/tests/FsSpreadsheet.ExcelIO.Tests/TestObjects.fs
@@ -37,4 +37,7 @@ let sheet2() =
         FsCell.createWithDataType DataType.Number 2 4 8     
     ]
     |> List.iter (fun c -> ws.Row(c.RowNumber).[c.ColumnNumber].SetValueAs c.Value)
-    ws
+    ws
+
+let headerLessTablePath = 
+    System.IO.Path.Combine(__SOURCE_DIRECTORY__, "data/headerLessTable.xlsx")
diff --git a/tests/FsSpreadsheet.ExcelIO.Tests/data/headerlessTable.xlsx b/tests/FsSpreadsheet.ExcelIO.Tests/data/headerlessTable.xlsx