From 9ab425d45d3aae36099bda5e438cb04bc718bd08 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 12 Apr 2018 16:38:31 +0200
Subject: [PATCH] FEAT Ban rest call
---
referential/ban/indexBan.php | 4 ++--
src/core/controllers/AutoCompleteController.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/referential/ban/indexBan.php b/referential/ban/indexBan.php
index e6d72273e5c..ff1d70b581f 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 51d814728c9..675fcf476c9 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})"
];
}
--
GitLab