From a666ce75c65cdb902c56c046303e98c5210a1ed0 Mon Sep 17 00:00:00 2001
From: Mathieu Darse <mdarse@jolicode.com>
Date: Wed, 4 Nov 2015 11:03:38 +0100
Subject: [PATCH] Use equality syntax on facet queries

---
 .../SearchEngine/Elastic/AST/FieldEqualsExpression.php        | 2 +-
 .../Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/FieldEqualsExpression.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/FieldEqualsExpression.php
index f306ac6b87..8a4b93ca0c 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/FieldEqualsExpression.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/FieldEqualsExpression.php
@@ -29,7 +29,7 @@ class FieldEqualsExpression extends Node
 
         $query = [
             'term' => [
-                $structure_field->getIndexField() => $this->value
+                $structure_field->getIndexField(true) => $this->value
             ]
         ];
 
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
index f15574be40..31d2f5cdb6 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
@@ -78,7 +78,9 @@ class FacetsResponse implements JsonSerializable
             case 'Type':
                 return sprintf('type:%s', $this->escaper->escapeWord($value));
             default:
-                return sprintf('r"%s" IN %s', $this->escaper->escapeRaw($value), $name);
+                return sprintf('%s = %s',
+                    $this->escaper->escapeWord($name),
+                    $this->escaper->escapeWord($value));
         }
     }