mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Wdx-plugin search using ft_fulltext, ft_fulltextw field

Browse source
This commit is contained in:
Alexander Koblov 2017-01-19 18:57:08 +00:00
commit 2202683f4e
2 changed files with 77 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ufindfiles.pas
View file

@ -345,23 +345,22 @@ begin
end;
// Find field index
FieldIndex:= Module.GetFieldIndex(ContentPlugin.Field);
Value:= Module.CallContentGetValue(FileName, FieldIndex, UnitIndex, 0);
Value:= Module.CallContentGetValue(FileName, FieldIndex, UnitIndex);
while Length(Value) > 0 do
begin
Old+= Value;
case ContentPlugin.Compare of
poContains: Result := UTF8Pos(FindText, Old) > 0;
poNotContains: Result := UTF8Pos(FindText, Old) = 0;
poContainsCase: Result := UTF8Pos(FindText, UTF8LowerCase(Old)) > 0;
poNotContainsCase: Result := UTF8Pos(FindText, UTF8LowerCase(Old)) = 0;
poContains: Result := Pos(FindText, Old) > 0;
poNotContains: Result := Pos(FindText, Old) = 0;
poContainsCase: Result := Pos(FindText, UTF8LowerCase(Old)) > 0;
poNotContainsCase: Result := Pos(FindText, UTF8LowerCase(Old)) = 0;
end;
if Result then begin
Module.CallContentGetValue(FileName, FieldIndex, -1, 0);
Exit;
end;
Inc(UnitIndex, WDX_MAX_LEN);
Old:= RightStr(Old, Length(FindText));
Value:= Module.CallContentGetValue(FileName, FieldIndex, UnitIndex, 0);
Value:= Module.CallContentGetValue(FileName, FieldIndex, UnitIndex);
end;
Result:= False;
end;

71
src/uwdxmodule.pas
View file

@ -88,6 +88,7 @@ type
function CallContentGetValueV(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): Variant; overload; virtual; abstract;
function CallContentGetValue(FileName: String; FieldName: String; UnitName: String; flags: Integer): String; overload; virtual; abstract;
function CallContentGetValue(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): String; overload; virtual; abstract;
function CallContentGetValue(FileName: String; FieldIndex: Integer; var UnitIndex: Integer): String; overload; virtual; abstract;
function CallContentGetSupportedFieldFlags(FieldIndex: Integer): Integer; virtual; abstract;
{ContentSetValue
ContentEditValue
@ -161,6 +162,7 @@ type
function CallContentGetValueV(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): Variant; overload; override;
function CallContentGetValue(FileName: String; FieldName: String; UnitName: String; flags: Integer): String; overload; override;
function CallContentGetValue(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): String; overload; override;
function CallContentGetValue(FileName: String; FieldIndex: Integer; var UnitIndex: Integer): String; overload; override;
function CallContentGetSupportedFieldFlags(FieldIndex: Integer): Integer; override;
{ContentSetValue
ContentEditValue
@ -220,6 +222,7 @@ type
function CallContentGetValueV(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): Variant; overload; override;
function CallContentGetValue(FileName: String; FieldName: String; UnitName: String; flags: Integer): String; overload; override;
function CallContentGetValue(FileName: String; FieldIndex, UnitIndex: Integer; flags: Integer): String; overload; override;
function CallContentGetValue(FileName: String; FieldIndex: Integer; var UnitIndex: Integer): String; overload; override;
function CallContentGetSupportedFieldFlags(FieldIndex: Integer): Integer; override;
//---------------------
property Force: Boolean read FForce write FForce;
@ -899,6 +902,44 @@ begin
end;
end;
function TPluginWDX.CallContentGetValue(FileName: String; FieldIndex: Integer; var UnitIndex: Integer): String;
var
Rez: Integer;
ValueA: AnsiString;
ValueW: UnicodeString;
Buf: array[0..WDX_MAX_LEN] of Byte;
begin
EnterCriticalSection(FMutex);
try
if Assigned(ContentGetValueW) then
Rez := ContentGetValueW(PWideChar(UTF8Decode(FileName)), FieldIndex, UnitIndex, @Buf, SizeOf(buf), 0)
else if Assigned(ContentGetValue) then
Rez := ContentGetValue(PAnsiChar(mbFileNameToSysEnc(FileName)), FieldIndex, UnitIndex, @Buf, SizeOf(buf), 0);
case Rez of
ft_fieldempty:
Result := EmptyStr;
ft_fulltext:
begin
ValueA:= AnsiString(PAnsiChar(@Buf[0]));
Inc(UnitIndex, Length(ValueA));
Result := CeSysToUtf8(ValueA);
end;
ft_fulltextw:
begin
ValueW:= UnicodeString(PWideChar(@Buf[0]));
Inc(UnitIndex, Length(ValueW) * SizeOf(WideChar));
Result := UTF16ToUTF8(ValueW);
end;
else begin
Result := EmptyStr;
end;
end;
finally
LeaveCriticalSection(FMutex);
end;
end;
function TPluginWDX.CallContentGetSupportedFieldFlags(FieldIndex: Integer): Integer;
begin
if assigned(ContentGetSupportedFieldFlags) then
@ -1270,6 +1311,36 @@ begin
end;
end;
function TLuaWdx.CallContentGetValue(FileName: String; FieldIndex: Integer; var UnitIndex: Integer): String;
begin
EnterCriticalSection(FMutex);
try
Result := EmptyStr;
if not Assigned(L) then
Exit;
lua_getglobal(L, 'ContentGetValue');
if not lua_isfunction(L, -1) then
Exit;
lua_pushstring(L, PChar(FileName));
lua_pushinteger(L, FieldIndex);
lua_pushinteger(L, UnitIndex);
lua_pushinteger(L, 0);
LuaPCall(L, 4, 1);
if not lua_isnil(L, -1) then
begin
Result := lua_tostring(L, -1);
Inc(UnitIndex, Length(Result));
end;
lua_pop(L, 1);
finally
LeaveCriticalSection(FMutex);
end;
end;
function TLuaWdx.CallContentGetSupportedFieldFlags(FieldIndex: Integer): Integer;
begin
Result := 0;