PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-03-29 23:07:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

format

Browse source
This commit is contained in:
Liam P. White 2019-08-26 20:00:48 -04:00
parent a0fa66628a
commit b5a9660fd0
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/philomena/search/lexer.ex
View file

@ -181,11 +181,13 @@ defmodule Philomena.Search.Lexer do
]) ])
|> reduce({List, :to_string, []}) |> reduce({List, :to_string, []})
# choice([
# ,
ip_address = ip_address =
#choice([ ipv4_address
ipv4_address |> optional(ipv4_prefix)#, |> optional(ipv4_prefix)
#ipv6_address |> optional(ipv6_prefix) # ipv6_address |> optional(ipv6_prefix)
#]) # ])
|> reduce({Enum, :join, []}) |> reduce({Enum, :join, []})
|> label("a valid IPv4 or IPv6 address and optional CIDR prefix") |> label("a valid IPv4 or IPv6 address and optional CIDR prefix")
|> unwrap_and_tag(:ip) |> unwrap_and_tag(:ip)

32
lib/philomena/search/parser.ex
View file

@ -120,15 +120,37 @@ defmodule Philomena.Search.Parser do
defp search_fuzz(ctx, tokens) do defp search_fuzz(ctx, tokens) do
case tokens do case tokens do
[{:int_field, field}, {:eq, _}, {:int, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [{:int_field, field}, {:eq, _}, {:int, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] ->
{%{range: %{try_alias(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}}}, r_tokens} {%{
range: %{try_alias(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}}
}, r_tokens}
[{:float_field, field}, {:eq, _}, {:float, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [
{%{range: %{try_alias(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}}}, r_tokens} {:float_field, field},
{:eq, _},
{:float, value},
{:fuzz, _},
{:number, fuzz} | r_tokens
] ->
{%{
range: %{try_alias(field) => %{gte: trunc(value - fuzz), lte: trunc(value + fuzz)}}
}, r_tokens}
[{:literal_field, field}, {:eq, _}, {:text, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [
{:literal_field, field},
{:eq, _},
{:text, value},
{:fuzz, _},
{:number, fuzz} | r_tokens
] ->
{%{fuzzy: %{try_alias(field) => %{value: value, fuzziness: fuzz}}}, r_tokens} {%{fuzzy: %{try_alias(field) => %{value: value, fuzziness: fuzz}}}, r_tokens}
[{:ngram_field, field}, {:eq, _}, {:text, value}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [
{:ngram_field, field},
{:eq, _},
{:text, value},
{:fuzz, _},
{:number, fuzz} | r_tokens
] ->
{%{fuzzy: %{try_alias(field) => %{value: value, fuzziness: fuzz}}}, r_tokens} {%{fuzzy: %{try_alias(field) => %{value: value, fuzziness: fuzz}}}, r_tokens}
[{:default, [text: value]}, {:fuzz, _}, {:number, fuzz} | r_tokens] -> [{:default, [text: value]}, {:fuzz, _}, {:number, fuzz} | r_tokens] ->