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

RxDBGrid - fix partial search in find form

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2928 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2014-04-07 08:04:42 +00:00
parent c9266bbd58
commit 6f2c0baee5
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/rx/trunk/dbutils.pas
View File

@@ -395,15 +395,30 @@ var
begin
if Field.DataType = ftString then
begin
S := Field.AsString;
S1:=Value;
if (loPartialKey in Options) then
if loCaseInsensitive in Options then
begin
S := UTF8UpperCase(Field.AsString);
S1:=UTF8UpperCase(Value);
end
else
begin
S := Field.AsString;
S1:=Value;
end;
{ if (loPartialKey in Options) then
Delete(S, Length(S1) + 1, MaxInt);
if (loCaseInsensitive in Options) then
Result := UTF8CompareText(S, S1) = 0
else
Result := UTF8CompareStr(S, S1) = 0;}
if (loPartialKey in Options) then
Result := UTF8Pos(S1, S) > 0
else
begin
Result := UTF8CompareStr(S, S1) = 0;
end;
end
// else Result := false //(Field.Value = Value);
else Result := (Field.Value = Value);

4
components/rx/trunk/languages/rxdconst.es.po
View File

@@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "Valor nulo habilitado en '=' y '<>'"
#: rxdconst.sexprexpected

2
components/rx/trunk/languages/rxdconst.po
View File

@@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
msgstr ""
#: rxdconst.sexprbadnulltest
msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr ""
#: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.ru.po
View File

@@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
#: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.uk.po
View File

@@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
#: rxdconst.sexprexpected