Skip to content

Commit 0fae2c7

Browse files
committed
Bug fixed: import CSV file segment when .parseConfig.endingRecord and .parseConfig.endingRecord properties are specified.
1 parent 24fdc77 commit 0fae2c7

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/Access_version.zip

41 Bytes
Binary file not shown.

src/All_Host_version.zip

42 Bytes
Binary file not shown.

src/CSVinterface.cls

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,6 +2278,7 @@ Private Sub ParseCSVstring(ByRef CSVtext As String, _
22782278
Dim RecordEndReached As Boolean
22792279
Dim RecordsCount As Long
22802280
Dim RecordToken As CSVArrayList
2281+
Dim SavedRecords As Long
22812282
Dim SearchBeginningMark As Long
22822283
Dim SplittedToken As Boolean
22832284
Dim StartRecord As Long
@@ -2294,6 +2295,7 @@ Private Sub ParseCSVstring(ByRef CSVtext As String, _
22942295
SearchBeginningMark = 1&
22952296
EscapeChrCount = 0&
22962297
RecordsCount = 0&
2298+
SavedRecords = 0&
22972299
P_VECTORS_REGULAR_BOUND = 0&
22982300
P_VECTORS_MAX_BOUND = 0&
22992301
Set tmpToken = New CSVArrayList
@@ -2766,6 +2768,7 @@ Private Sub ParseCSVstring(ByRef CSVtext As String, _
27662768
'Start saving on given record
27672769
If IncludeRecord Then
27682770
outputList.Add RecordToken.items
2771+
SavedRecords = SavedRecords + 1&
27692772
RaiseEvent AfterImportRecord
27702773
RecordToken.Reinitialize P_VECTORS_REGULAR_BOUND + 1
27712774
End If
@@ -2781,7 +2784,7 @@ Private Sub ParseCSVstring(ByRef CSVtext As String, _
27812784
Case False
27822785
ImportSwitch = EndOfString
27832786
Case Else
2784-
ImportSwitch = (RecordsCount = ImportDepth) Or EndOfString
2787+
ImportSwitch = (SavedRecords = ImportDepth) Or EndOfString
27852788
End Select
27862789
Loop While Not ImportSwitch
27872790
'@----------------------------------------------------------------------------
@@ -3337,6 +3340,7 @@ Private Sub StreamParseCSV(configObj As CSVparserConfig, _
33373340
Dim RecordEndReached As Boolean
33383341
Dim RecordsCount As Long
33393342
Dim RecordToken As CSVArrayList
3343+
Dim SavedRecords As Long
33403344
Dim SearchBeginningMark As Long
33413345
Dim SplittedToken As Boolean
33423346
Dim StartRecord As Long
@@ -3352,6 +3356,7 @@ Private Sub StreamParseCSV(configObj As CSVparserConfig, _
33523356
SearchBeginningMark = 1&
33533357
EscapeChrCount = 0&
33543358
RecordsCount = 0&
3359+
SavedRecords = 0&
33553360
P_VECTORS_REGULAR_BOUND = 0&
33563361
P_VECTORS_MAX_BOUND = 0&
33573362
Set tmpToken = New CSVArrayList
@@ -3894,6 +3899,7 @@ Private Sub StreamParseCSV(configObj As CSVparserConfig, _
38943899
'Start saving on given record
38953900
If IncludeRecord Then
38963901
outputList.Add RecordToken.items
3902+
SavedRecords = SavedRecords + 1&
38973903
RaiseEvent AfterImportRecord
38983904
RecordToken.Reinitialize P_VECTORS_REGULAR_BOUND + 1
38993905
End If
@@ -3917,7 +3923,7 @@ Private Sub StreamParseCSV(configObj As CSVparserConfig, _
39173923
Case False
39183924
ImportSwitch = EndOF
39193925
Case Else
3920-
ImportSwitch = (RecordsCount = ImportDepth) Or EndOF
3926+
ImportSwitch = (SavedRecords = ImportDepth) Or EndOF
39213927
End Select
39223928
Loop While Not ImportSwitch
39233929
'@----------------------------------------------------------------------------

0 commit comments

Comments
 (0)