From ef4e0399988da7c0c9e8bad9cd6209ceaccd0f95 Mon Sep 17 00:00:00 2001 From: Bob Harper Date: Wed, 26 Apr 2017 20:51:58 +0100 Subject: [PATCH] allow more than 2 AND and OR conditions --- .../google/refine/expr/functions/booleans/And.java | 14 +++++++------- .../google/refine/expr/functions/booleans/Or.java | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/src/com/google/refine/expr/functions/booleans/And.java b/main/src/com/google/refine/expr/functions/booleans/And.java index 431ef584a..8794cb865 100644 --- a/main/src/com/google/refine/expr/functions/booleans/And.java +++ b/main/src/com/google/refine/expr/functions/booleans/And.java @@ -23,8 +23,8 @@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -46,7 +46,7 @@ public class And implements Function { @Override public Object call(Properties bindings, Object[] args) { - if (args.length == 2 && args[0] instanceof Boolean && args[1] instanceof Boolean) { + if (args.length >= 2 && args[0] instanceof Boolean && args[1] instanceof Boolean) { for (Object o : args) { if (!Not.objectToBoolean(o)) { return false; @@ -54,15 +54,15 @@ public class And implements Function { } return true; } - return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects two booleans"); + return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects two or more booleans"); } - + @Override public void write(JSONWriter writer, Properties options) throws JSONException { - + writer.object(); - writer.key("description"); writer.value("ANDs two boolean values"); + writer.key("description"); writer.value("AND two or more booleans to yield a boolean"); writer.key("params"); writer.value("boolean a, boolean b"); writer.key("returns"); writer.value("boolean"); writer.endObject(); diff --git a/main/src/com/google/refine/expr/functions/booleans/Or.java b/main/src/com/google/refine/expr/functions/booleans/Or.java index 58944f278..0b1b10b0e 100644 --- a/main/src/com/google/refine/expr/functions/booleans/Or.java +++ b/main/src/com/google/refine/expr/functions/booleans/Or.java @@ -23,8 +23,8 @@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -46,7 +46,7 @@ public class Or implements Function { @Override public Object call(Properties bindings, Object[] args) { - if (args.length == 2 && args[0] instanceof Boolean && args[1] instanceof Boolean) { + if (args.length >= 2 && args[0] instanceof Boolean && args[1] instanceof Boolean) { for (Object o : args) { if (Not.objectToBoolean(o)) { return true; @@ -54,15 +54,15 @@ public class Or implements Function { } return false; } - return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects two booleans"); + return new EvalError(ControlFunctionRegistry.getFunctionName(this) + " expects two or more booleans"); } - + @Override public void write(JSONWriter writer, Properties options) throws JSONException { - + writer.object(); - writer.key("description"); writer.value("Returns a OR b"); + writer.key("description"); writer.value("OR two or more booleans to yield a boolean"); writer.key("params"); writer.value("boolean a, boolean b"); writer.key("returns"); writer.value("boolean"); writer.endObject();