diff --git a/referential/ban/indexBan.php b/referential/ban/indexBan.php index e6d72273e5cb141c6128b729e9189346c01a5840..ff1d70b581f6fa14568c6a1619c9101513ddd22c 100644 --- a/referential/ban/indexBan.php +++ b/referential/ban/indexBan.php @@ -40,7 +40,7 @@ foreach ($filesBan as $fileBan) { if (empty($duplicateAddresses[$data[3] . $data[4] . $data[9] . $data[6]])) { $doc = new Zend_Search_Lucene_Document(); - $doc->addField(Zend_Search_Lucene_Field::UnIndexed('banId', \SrcCore\models\TextFormatModel::normalize(['string' => $data[0]]))); + $doc->addField(Zend_Search_Lucene_Field::UnIndexed('banId', $data[0])); if (!empty($data[1])) { $doc->addField(Zend_Search_Lucene_Field::Text('streetName', \SrcCore\models\TextFormatModel::normalize(['string' => $data[1]]))); } @@ -48,7 +48,7 @@ foreach ($filesBan as $fileBan) { $doc->addField(Zend_Search_Lucene_Field::Text('streetNumber', $streetNumber)); $doc->addField(Zend_Search_Lucene_Field::Text('postalCode', $data[6])); $doc->addField(Zend_Search_Lucene_Field::Text('afnorName', $data[9])); - $doc->addField(Zend_Search_Lucene_Field::Text('city', \SrcCore\models\TextFormatModel::normalize(['string' => $data[10]]))); + $doc->addField(Zend_Search_Lucene_Field::Text('city', $data[10])); $index->addDocument($doc); $duplicateAddresses[$data[3] . $data[4] . $data[9] . $data[6]] = true; diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php index 51d814728c968871b559b2dd6f9ef1a8e57289c0..675fcf476c9927c9d9f8888dc65a66d00716406a 100644 --- a/src/core/controllers/AutoCompleteController.php +++ b/src/core/controllers/AutoCompleteController.php @@ -142,7 +142,8 @@ class AutoCompleteController 'number' => $hit->streetNumber, 'afnorName' => $hit->afnorName, 'postalCode' => $hit->postalCode, - 'city' => $hit->city + 'city' => $hit->city, + 'address' => "{$hit->streetNumber} {$hit->afnorName}, {$hit->city} ({$hit->postalCode})" ]; }