From 48e8e109714f4a9dbfd12aab82147b95b3db6561 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Thu, 5 Apr 2018 13:30:07 +0200 Subject: [PATCH] Added != operator to filter. (#1930) * Added != operator to filter. * Update cli_helper.rb (cherry picked from commit 5447d8a367d71b63c2522722e03526098f85309e) --- src/cli/cli_helper.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cli/cli_helper.rb b/src/cli/cli_helper.rb index e8da396f00..bdddbca1fa 100644 --- a/src/cli/cli_helper.rb +++ b/src/cli/cli_helper.rb @@ -369,7 +369,7 @@ module CLIHelper def filter_data!(data, filter) # TBD: add more operators # operators=/(==|=|!=|<|<=|>|>=)/ - operators=/(=)/ + operators=/(=|!=)/ stems=filter.map do |s| m=s.match(/^(.*?)#{operators}(.*?)$/) @@ -394,11 +394,12 @@ module CLIHelper end end - data.reject! do |d| + data.select! do |d| pass=true stems.each do |s| - if d[s[:index]]!=s[:right] + + if d[s[:index]].public_send(s[:operator] == "=" ? "==" : s[:operator], s[:right]) pass=false break end