From 187be64edfb24511c1717aa83e09545f58c4dda6 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Tue, 11 Aug 2015 14:53:04 -0300
Subject: [PATCH] Fix operator instantiation/selection

---
 src/operators/operator.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/operators/operator.cc b/src/operators/operator.cc
index c1c8e3ee..d9c6cef5 100644
--- a/src/operators/operator.cc
+++ b/src/operators/operator.cc
@@ -128,7 +128,9 @@ Operator *Operator::instantiate(std::string op_string) {
     std::string op_ = op;
     if (op_.length() > 2) {
         op_.erase(0, 1);
-        op_.pop_back();
+        if (op_.back() == ' ') {
+            op_.pop_back();
+        }
     }
 
     IF_MATCH(beginswith) { return new BeginsWith(op, param, negation); }
@@ -139,7 +141,7 @@ Operator *Operator::instantiate(std::string op_string) {
     IF_MATCH(endswith) { return new EndsWith(op, param, negation); }
     IF_MATCH(eq) { return new Eq(op, param, negation); }
     IF_MATCH(fuzzyhash) { return new FuzzyHash(op, param, negation); }
-    IF_MATCH(geolooku) { return new GeoLookup(op, param, negation); }
+    IF_MATCH(geolookup) { return new GeoLookup(op, param, negation); }
     IF_MATCH(ge) { return new Ge(op, param, negation); }
     IF_MATCH(gsblookup) { return new GsbLookup(op, param, negation); }
     IF_MATCH(gt) { return new Gt(op, param, negation); }