pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

csvdocument: performance improvements for QuoteCSVString

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1625 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
vvzh
2011-05-10 11:48:22 +00:00
parent c9863cb2e6
commit ef62720766
1 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/csvdocument/csvdocument.pas
View File

@ -53,11 +53,18 @@ type
TCSVChar = Char;
TCSVHandler = class(TObject)
private
procedure SetDelimiter(const AValue: TCSVChar);
procedure SetQuoteChar(const AValue: TCSVChar);
procedure UpdateCachedChars;
protected
// special chars
FDelimiter: TCSVChar;
FQuoteChar: TCSVChar;
FLineEnding: string;
FLineEnding: String;
// cached values to speed up special chars operations
FSpecialChars: TSysCharSet;
FDoubleQuote: String;
// parser settings
FIgnoreOuterWhitespace: Boolean;
// builder settings
@ -67,8 +74,8 @@ type
public
constructor Create;
procedure AssignCSVProperties(ASource: TCSVHandler);
property Delimiter: TCSVChar read FDelimiter write FDelimiter;
property QuoteChar: TCSVChar read FQuoteChar write FQuoteChar;
property Delimiter: TCSVChar read FDelimiter write SetDelimiter;
property QuoteChar: TCSVChar read FQuoteChar write SetQuoteChar;
property LineEnding: String read FLineEnding write FLineEnding;
property IgnoreOuterWhitespace: Boolean read FIgnoreOuterWhitespace write FIgnoreOuterWhitespace;
property QuoteOuterWhitespace: Boolean read FQuoteOuterWhitespace write FQuoteOuterWhitespace;
@ -252,6 +259,30 @@ end;
{ TCSVHandler }
procedure TCSVHandler.SetDelimiter(const AValue: TCSVChar);
begin
if FDelimiter <> AValue then
begin
FDelimiter := AValue;
UpdateCachedChars;
end;
end;
procedure TCSVHandler.SetQuoteChar(const AValue: TCSVChar);
begin
if FQuoteChar <> AValue then
begin
FQuoteChar := AValue;
UpdateCachedChars;
end;
end;
procedure TCSVHandler.UpdateCachedChars;
begin
FDoubleQuote := FQuoteChar + FQuoteChar;
FSpecialChars := [CR, LF, FDelimiter, FQuoteChar];
end;
constructor TCSVHandler.Create;
begin
inherited Create;
@ -261,6 +292,7 @@ begin
FIgnoreOuterWhitespace := False;
FQuoteOuterWhitespace := True;
FEqualColCountPerRow := True;
UpdateCachedChars;
end;
procedure TCSVHandler.AssignCSVProperties(ASource: TCSVHandler);
@ -271,6 +303,7 @@ begin
FIgnoreOuterWhitespace := ASource.FIgnoreOuterWhitespace;
FQuoteOuterWhitespace := ASource.FQuoteOuterWhitespace;
FEqualColCountPerRow := ASource.FEqualColCountPerRow;
UpdateCachedChars;
end;
{ TCSVParser }
@ -462,7 +495,6 @@ function TCSVBuilder.QuoteCSVString(const AValue: String): String;
var
I: Integer;
ValueLen: Integer;
SpecialChars: TSysCharSet;
NeedQuotation: Boolean;
begin
ValueLen := Length(AValue);
@ -470,11 +502,10 @@ begin
NeedQuotation := (AValue <> '') and FQuoteOuterWhitespace
and ((AValue[1] in WhitespaceChars) or (AValue[ValueLen] in WhitespaceChars));
SpecialChars := [CR, LF, FDelimiter, FQuoteChar];
if not NeedQuotation then
for I := 1 to ValueLen do
begin
if AValue[I] in SpecialChars then
if AValue[I] in FSpecialChars then
begin
NeedQuotation := True;
Break;
@ -484,9 +515,9 @@ begin
if NeedQuotation then
begin
// double existing quotes
Result := StringReplace(AValue, FQuoteChar,
FQuoteChar + FQuoteChar, [rfReplaceAll]);
Result := FQuoteChar + Result + FQuoteChar;
Result := FDoubleQuote;
Insert(StringReplace(AValue, FQuoteChar, FDoubleQuote, [rfReplaceAll]),
Result, 2);
end else
Result := AValue;
end;