Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small filter change

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-08-02 21:56:44 +02:00
parent e14279a78b
commit 673835c18b
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tabs/search/core.lua
+1 -1
View File
@@ -877,7 +877,7 @@ function private.add_post_component()
Aux.log('Invalid operator suffix') Aux.log('Invalid operator suffix')
return return
end end
filter = filter..Aux.filter.operator_suffix(arity) filter = filter..(arity or '')
end end
if Aux.filter.filters[name] and Aux.filter.filters[name].input_type ~= '' then if Aux.filter.filters[name] and Aux.filter.filters[name].input_type ~= '' then
filter = filter..'/'..m.filter_input:GetText() filter = filter..'/'..m.filter_input:GetText()
util/filter.lua
+7 -25
View File
@@ -209,19 +209,17 @@ function private.operator(str)
return 'not', 1 return 'not', 1
end end
local _, _, and_op, and_arity = strfind(str, '^(and)(.*)$') local _, _, and_op, and_arity = strfind(str, '^(and)(%d*)$')
local _, _, or_op, or_arity = strfind(str, '^(or)(.*)$') local _, _, or_op, or_arity = strfind(str, '^(or)(%d*)$')
local op = and_op or or_op local op = and_op or or_op
local arity = and_arity or or_arity local arity = and_arity or or_arity
if op then if op then
if arity == '' then if arity == '' then
return op, 2
elseif tonumber(arity) and tonumber(arity) > 2 then
return op, tonumber(arity)
elseif arity == '*' then
return op return op
elseif tonumber(arity) and tonumber(arity) >= 2 then
return op, tonumber(arity)
end end
end end
end end
@@ -518,7 +516,7 @@ function public.query_string(components)
for _, component in components.post do for _, component in components.post do
if component[1] == 'operator' then if component[1] == 'operator' then
prettified.append(component[2]..m.operator_suffix(component[3])) prettified.append(component[2]..(tonumber(component[3]) or ''))
elseif component[1] == 'filter' then elseif component[1] == 'filter' then
prettified.append(component[2]) prettified.append(component[2])
if component[3] then if component[3] then
@@ -547,7 +545,7 @@ function public.indented_post_query_string(components)
if component[1] == 'operator' and component[2] then if component[1] == 'operator' and component[2] then
no_line_break = component[2] == 'not' no_line_break = component[2] == 'not'
str = str..'|cffffff00'..component[2]..m.operator_suffix(component[3])..'|r' str = str..'|cffffff00'..component[2]..(tonumber(component[3]) or '')..'|r'
tinsert(stack, component[3] or '*') tinsert(stack, component[3] or '*')
elseif component[1] == 'filter' then elseif component[1] == 'filter' then
str = str..'|cffffff00'..component[2]..'|r' str = str..'|cffffff00'..component[2]..'|r'
@@ -590,13 +588,7 @@ function private.prettified_query_string(components)
for _, component in components.post do for _, component in components.post do
if component[1] == 'operator' then if component[1] == 'operator' then
local suffix = '' prettified.append('|cffffff00'..component[2]..(tonumber(component[3]) or '')..'|r')
if not component[3] then
suffix = '*'
elseif component[3] > 2 then
suffix = component[3]
end
prettified.append('|cffffff00'..component[2]..suffix..'|r')
elseif component[1] == 'filter' then elseif component[1] == 'filter' then
if component[2] ~= 'tooltip' then if component[2] ~= 'tooltip' then
prettified.append('|cffffff00'..component[2]..'|r') prettified.append('|cffffff00'..component[2]..'|r')
@@ -621,16 +613,6 @@ function public.unquote(name)
return name return name
end end
function public.operator_suffix(arity)
if not arity then
return '*'
elseif arity == 2 then
return ''
else
return arity
end
end
function private.blizzard_query(components) function private.blizzard_query(components)
local filters = {} local filters = {}
for _, filter in components.blizzard do for _, filter in components.blizzard do