aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tv/src/tv_db_search.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-10-27 12:27:33 +0200
committerBjörn Gustavsson <[email protected]>2011-10-27 12:27:33 +0200
commita971c9568ccebed4e8d00abf52faa59a2bcc1c18 (patch)
tree1a39c38bce2e27954ea772e80224069b41e5bcd9 /lib/tv/src/tv_db_search.erl
parent86e4b23fb4a11f18834e6b1be76642fbd71b9cf7 (diff)
parent3e8720728abe875683ad54fa4d93ba83df609f57 (diff)
downloadotp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.tar.gz
otp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.tar.bz2
otp-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.zip
Merge branch 'bjorn/eliminate-regexp-usage'
* bjorn/eliminate-regexp-usage: erl_tidy: Eliminate two references to 'regexp' in the documentation erts/z_SUITE: Eliminate use of deprecated regexp module erts/nt_SUITE: Eliminate use of deprecated regexp module erl_html_tools: Eliminate mention of deprecated regexp module erl_interface tests: Eliminate use of deprecated regexp module tools test suite: Eliminate compilation warnings for the eed module tools test suite: Eliminate use of deprecated regexp module xmerl test suite: Eliminate use of deprecated regexp module appmon: Eliminate use of deprecated regexp module tv: Eliminate use of deprecated regexp module gs: Eliminate use of deprecated regexp module inviso: Eliminate use of deprecated regexp module
Diffstat (limited to 'lib/tv/src/tv_db_search.erl')
-rw-r--r--lib/tv/src/tv_db_search.erl32
1 files changed, 5 insertions, 27 deletions
diff --git a/lib/tv/src/tv_db_search.erl b/lib/tv/src/tv_db_search.erl
index edd3c188e2..7634bc63b6 100644
--- a/lib/tv/src/tv_db_search.erl
+++ b/lib/tv/src/tv_db_search.erl
@@ -244,10 +244,10 @@ get_entry_text() ->
string_to_regexp(Str) ->
- case regexp:parse(Str) of
+ case re:compile(Str) of
{ok, RegExp} ->
{ok, RegExp};
- _Error ->
+ {error, _Error} ->
case get(error_msg_mode) of
normal ->
{error, {not_a_regexp, "Please enter a regular expression!"}};
@@ -410,33 +410,11 @@ search_for_regexp(Pattern, Elem, ListAsStr) ->
lists:flatten(tv_io_lib:write(Elem))
end,
- case regexp:first_match(ListToSearch, Pattern) of
- {match, _, _} ->
+ case re:run(ListToSearch, Pattern, [{capture,none}]) of
+ match ->
found;
- _Other ->
+ nomatch ->
not_found
- %% The code below shall be used instead if it is desired to
- %% compare each *element* in the tuples to the regular expression,
- %% i.e., treat each element as a new line/string.
- %% The difference is most easily explained through an example:
- %% If we treat each tuple as a new line/string, the regular expression
- %% "^{win" will match the string "{win, 1, 2, 3}", but not the string
- %% "{1, {win,2}}".
- %% If we treat each element as a new line/string, the RE "^{win" will match
- %% both strings above.
-
- %% SearchList = tuple_to_list(Elem),
- %% case lists:dropwhile(
- %% fun(H) ->
- %% nomatch == regexp:first_match(lists:flatten(io_lib:write(H)),
- %% Pattern)
- %% end,
- %% SearchList) of
- %% [] ->
- %% not_found;
- %% _AnyList ->
- %% found
- %% end
end.