From e38debca7d6825fcc0c889f2748d5e92e2c2dacc Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Fri, 6 Dec 2019 09:49:15 +0100
Subject: [PATCH] - Fix search case

---
 app/Http/Controllers/MediaController.php |  1 -
 app/Models/Media.php                     | 28 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php
index 16bacfb..c6b40ad 100644
--- a/app/Http/Controllers/MediaController.php
+++ b/app/Http/Controllers/MediaController.php
@@ -347,7 +347,6 @@ class MediaController extends Controller
                     break;
                 }
             }else if (strpos($search, '+') !== false){
-                $search = strtolower(trim($filters->search->value));
                 $tmpSearch = explode('+', $search);
 
                 $mustLib = [];
diff --git a/app/Models/Media.php b/app/Models/Media.php
index e3facb5..4219aa6 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -51,19 +51,30 @@ class Media extends Model
                     ],
                     'tokenizer' => 'whitespace',
                     'filter' => [
-                        'word_delimiter'
+                        'lowercase',
+                        'word_delimiter',
                     ],
                 ],
             ],
+            'normalizer' => [
+                'my_normalizer' => [
+                    'type' => 'custom',
+                    'char_filter' => [],
+                    'filter' => [
+                        'lowercase'
+                    ]
+                ]
+            ]
         ],
     ];
     protected $mappingProperties = array(
         'libelle' => array(
             'type' => 'text',
-            'analyzer' => 'standard',
+            'analyzer' => 'default',
             'fields' => array(
                 'keyword' => array(
-                    'type' => 'keyword'
+                    'type' => 'keyword',
+                    'normalizer' => 'my_normalizer'
                 )
             ),
             'fielddata' => true
@@ -87,6 +98,17 @@ class Media extends Model
         'articles.noArt' => array(
             'type' => 'text',
             'analyzer' => 'standard'
+        ),
+        'articles.libCcial' => array(
+            'type' => 'text',
+            'analyzer' => 'default',
+            'fields' => array(
+                'keyword' => array(
+                    'type' => 'keyword',
+                    'normalizer' => 'my_normalizer'
+                )
+            ),
+            'fielddata' => true
         )
     );