Simplify keeping first row XML for later type and format analysis

the-carlisle-group · Feb 9, 2022 · 5ba8cb3 · 5ba8cb3
1 parent 48af8f4
commit 5ba8cb3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/APLSource/Main/GetColumnFormatCodes.aplf b/APLSource/Main/GetColumnFormatCodes.aplf
@@ -1,16 +1,13 @@
  GetColumnFormatCodes←{
-     wi←⍵.WorkbookInfo
-     h←wi.HeaderRows
-     n←(2*19)⌊≢⍵.FirstBlock
-     p←{(+\'<row '⍷⍵)⊆⍵}n↑⍵.FirstBlock
-     h≥≢p:0
-     m←{(⍵[;1]∊⊂,'c')⌿⍵}⎕XML h⊃p
+     0=≢⍵.FirstRow:0
+     m←{(⍵[;1]∊⊂,'c')⌿⍵}⍵.FirstRow
      ca←m GetAttribute'r'
      ch←ca~¨⊂⎕D
      b←{(⍵⍳⍵)=⍳≢⍵}ch
      ch←b/ch
      s t←(b⌿m)∘GetAttribute¨'st'
      ci←¯1+26⊥⍉{⍵{(+/⍵)⌽⍵×⍺}⍵≠27}1+⎕A⍳↑ch
+     wi←⍵.WorkbookInfo
      c←wi.StyleFormatCodeID
      fc←(c,⊂,'0')[(⍕¨⍳≢c)⍳s]
      j←wi.FormatCodeID⍳fc

diff --git a/APLSource/Main/GetSheetData.aplf b/APLSource/Main/GetSheetData.aplf
@@ -13,14 +13,14 @@
      p.File←z OpenZipFile f
      p.BlockSize←⍺.BlockSize
      p.Buffer←CreateBuffer p.BlockSize
+     p.FirstRow←⍬
      p.Fragment←''
      p.Blocks←0
      p.EndOfRows←0
      p.(Data Rows Columns Header)←⊂⍬
      _←ProcessBlocks p
      _←Dispose¨z p.File
      p.UniqueColumns←{⍵[⍋⍵]}∪∊p.Columns
-     0=p.Blocks:p
      _←GetColumnFormatCodes p
      1=p.Blocks:p
      p.Data←p AssembleColumn¨p.UniqueColumns

diff --git a/APLSource/Main/ProcessBlock.aplf b/APLSource/Main/ProcessBlock.aplf
@@ -28,6 +28,7 @@
      d[j]←v                           ⍝ Scatter point
      p.Blocks>1:uc(↑¨↓⍉d)
      h←wi.HeaderRows
+     p.FirstRow←(h=¯1++\0=m[;0])⌿m
      p.Header←h↑d
      uc(↑¨↓⍉h↓d)                      ⍝ Column Indices , Inverted Data
  }
diff --git a/APLSource/Main/ReadRowBlock.aplf b/APLSource/Main/ReadRowBlock.aplf
@@ -1,5 +1,5 @@
  ReadRowBlock←{
      ⍵.EndOfRows:''
-     0=⍵.Blocks:⍵.FirstBlock←ReadRowBlockFirst ⍵
+     0=⍵.Blocks:ReadRowBlockFirst ⍵
      ⍵ TrimRowBlock ReadBlock ⍵
  }