OSDN Git Service
(root)
/
winbottle
/
winbottle.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
正規表現検索系を再修正 (ToDo #389)
[winbottle/winbottle.git]
/
bottleclient
/
SearchLog.pas
diff --git
a/bottleclient/SearchLog.pas
b/bottleclient/SearchLog.pas
index
0afb70e
..
3f8122b
100644
(file)
--- a/
bottleclient/SearchLog.pas
+++ b/
bottleclient/SearchLog.pas
@@
-204,7
+204,7
@@
begin
end;
procedure TfrmSearchLog.btnOkClick(Sender: TObject);
end;
procedure TfrmSearchLog.btnOkClick(Sender: TObject);
-var tmpScriptPattern
,tmpStringReplace
: String;
+var tmpScriptPattern : String;
begin
tmpScriptPattern := edtScriptPattern.Text;
begin
tmpScriptPattern := edtScriptPattern.Text;
@@
-214,12
+214,10
@@
begin
begin
try
//Perl
\82
Ì
\90
³
\8b
K
\95
\
\8c
»
\8d
\
\95
¶
\82
É
\83
}
\83
b
\83
`
\82
·
\82
é
\90
³
\8b
K
\95
\
\8c
»
\82
Å
\83
`
\83
F
\83
b
\83
N
begin
try
//Perl
\82
Ì
\90
³
\8b
K
\95
\
\8c
»
\8d
\
\95
¶
\82
É
\83
}
\83
b
\83
`
\82
·
\82
é
\90
³
\8b
K
\95
\
\8c
»
\82
Å
\83
`
\83
F
\83
b
\83
N
+ //k
\83
I
\83
v
\83
V
\83
\87
\83
\93
\82
Í
\8a
¿
\8e
\9a
\91
Î
\89
\9e
+ //#255(0xFF)
\82
Í
\82
\82
è
\82
¦
\82
È
\82
¢
\82
Ì
\82
Å
\82
±
\82
±
\82
Å
\97
\98
\97
p
if not brx.Match('m/^m?(.).+\1\w*$/k',tmpScriptPattern) then
if not brx.Match('m/^m?(.).+\1\w*$/k',tmpScriptPattern) then
- begin
- tmpStringReplace := tmpScriptPattern;
- tmpStringReplace := StringReplace(tmpStringReplace, '/', '\/', [rfReplaceAll]);
- tmpScriptPattern := 'm/' + tmpStringReplace + '/k'; //k
\83
I
\83
v
\83
V
\83
\87
\83
\93
\82
Í
\8a
¿
\8e
\9a
\91
Î
\89
\9e
- end;
+ tmpScriptPattern := 'm'#255 + tmpScriptPattern + #255'k';
except
tmpScriptPattern := '';
end;
except
tmpScriptPattern := '';
end;