From 088358ef9e7e2cbbcb4cd8c7e1e049f9af909b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=2E=20Garc=C3=ADa?= <70865364+ws-garcia@users.noreply.github.com> Date: Thu, 5 Jan 2023 17:52:27 -0400 Subject: [PATCH] Update CSVinterface.cls --- src/CSVinterface.cls | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/CSVinterface.cls b/src/CSVinterface.cls index de1050e..a62a129 100644 --- a/src/CSVinterface.cls +++ b/src/CSVinterface.cls @@ -479,8 +479,8 @@ CSVsubsetSplit_MissingCSVfile: End Function Public Function Dedupe(keys As String) As CSVArrayList On Error GoTo ErrHandler_Dedupe - Set Dedupe = New CSVArrayList - Dedupe.Dedupe keys, parseConfig.Headers + + Set Dedupe = P_CSV_DATA.Dedupe(keys, parseConfig.Headers) Exit Function ErrHandler_Dedupe: Set Dedupe = Nothing @@ -721,16 +721,15 @@ Public Function Filter(Pattern As String, Optional filePath As String = vbNullSt Optional ExcludeFirstRecord As Boolean = True, _ Optional Exclude As Boolean = False) As CSVArrayList - Dim CSVparser As CSVinterface - - Set Filter = New CSVArrayList If filePath <> vbNullString Then 'Filter CSV file + Dim CSVparser As CSVinterface Dim StreamReader As CSVTextStream Dim streamsCounter As Long Set CSVparser = New CSVinterface Set StreamReader = New CSVTextStream - + Set Filter = New CSVArrayList + With CSVparser.parseConfig .delimitersGuessing = True End With @@ -749,7 +748,7 @@ Public Function Filter(Pattern As String, Optional filePath As String = vbNullSt Set CSVparser = Me If CSVparser.importSuccess Then ExcludeFirstRecord = (CSVparser.parseConfig.Headers = True) - Filter.Concat2 CSVparser.items.Filter(Pattern, 1 + Abs(ExcludeFirstRecord), Exclude) + Set Filter = P_CSV_DATA.Filter(Pattern, 1 + Abs(ExcludeFirstRecord), Exclude) End If End If End Function