Simplify block reading

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

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/APLSource/Main/GetSheetData.aplf b/APLSource/Main/GetSheetData.aplf
@@ -15,14 +15,14 @@
      p.Buffer←CreateBuffer p.BlockSize
      p.FirstRow←⍬
      p.Fragment←''
-     p.Blocks←0
+     p.Block←0
      p.EndOfRows←0
      p.(Data Rows Columns Header)←⊂⍬
      _←ProcessBlocks p
      _←Dispose¨z p.File
      p.UniqueColumns←{⍵[⍋⍵]}∪∊p.Columns
      _←GetColumnFormatCodes p
-     1=p.Blocks:p
+     1=p.Block:p
      p.Data←p AssembleColumn¨p.UniqueColumns
      p.Header←(p.UniqueColumns∊↑p.Columns)\p.Header
      p

diff --git a/APLSource/Main/ProcessBlock.aplf b/APLSource/Main/ProcessBlock.aplf
@@ -26,7 +26,7 @@
      j←↓⍉↑ri rc                       ⍝ Scatter points
      d←(nr,≢uc)⍴⊂''                   ⍝ Default
      d[j]←v                           ⍝ Scatter point
-     p.Blocks>1:uc(↑¨↓⍉d)
+     p.Block>1:uc(↑¨↓⍉d)
      h←wi.HeaderRows
      p.FirstRow←(h=¯1++\0=m[;0])⌿m
      p.Header←h↑d

diff --git a/APLSource/Main/ReadBlock.aplf b/APLSource/Main/ReadBlock.aplf
diff --git a/APLSource/Main/ReadRowBlock.aplf b/APLSource/Main/ReadRowBlock.aplf
@@ -1,5 +1,10 @@
  ReadRowBlock←{
      ⍵.EndOfRows:''
-     0=⍵.Blocks:ReadRowBlockFirst ⍵
-     ⍵ TrimRowBlock ReadBlock ⍵
+     ⍵.Block+←1
+     r←⍵.File.ReadBlock ⍵.(Buffer 0 BlockSize)
+     v←⍵.Fragment,r↑⍵.Buffer.Clone
+     ⍵.Block>1:⍵ TrimRowBlock v
+     ∨/'<sheetData/>'⍷v:''
+     n←11+⊃⍸'<sheetData>'⍷v
+     ⍵ TrimRowBlock n↓v
  }
diff --git a/APLSource/Main/ReadRowBlockFirst.aplf b/APLSource/Main/ReadRowBlockFirst.aplf