ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/runtime/IBCustomDataSet.pas

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 138 by tony, Mon Jan 22 13:58:14 2018 UTC vs.
Revision 139 by tony, Wed Jan 24 16:16:29 2018 UTC

#	Line 1131 | Line 1131 | begin
1131		3, {Assume UNICODE_FSS is really UTF8}
1132		4: {Include GB18030 - assuming UTF8 routines work for this codeset}
1133		if DisplayWidth = 0 then
1134	<	Result := ValidUTF8String(TextToSingleLine(Result))
1134	>	Result := Utf8EscapeControlChars(TextToSingleLine(Result))
1135		else
1136		if UTF8Length(Result) > DisplayWidth then {Show truncation with elipses}
1137	<	Result := ValidUTF8String(TextToSingleLine(UTF8Copy(Result,1,DisplayWidth-3))) + '...';
1137	>	Result := Utf8EscapeControlChars(TextToSingleLine(UTF8Copy(Result,1,DisplayWidth-3))) + '...';
1138		end;
1139		end
1140		end;
#	Line 2769 | Line 2769 | var
2769		fn: string;
2770		st: RawByteString;
2771		OldBuffer: Pointer;
2772	–	ts: TTimeStamp;
2772		Param: ISQLParam;
2773		begin
2774		if (Buffer = nil) then
#	Line 3815 | Line 3814 | var
3814		FieldType: TFieldType;
3815		FieldSize: Word;
3816		FieldDataSize: integer;
3818	–	charSetID: short;
3817		CharSetSize: integer;
3818		CharSetName: RawByteString;
3819		FieldCodePage: TSystemCodePage;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines