From fbcbfed8ba05eda19d58a4acd527fb6e81d17c31 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 11 Apr 2018 09:20:40 +0100
Subject: [PATCH] FEAT ban address
---
addresses_ban/index_ban.php | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/addresses_ban/index_ban.php b/addresses_ban/index_ban.php
index 1b03ce591fc..7fd9ff82ac7 100755
--- a/addresses_ban/index_ban.php
+++ b/addresses_ban/index_ban.php
@@ -1,12 +1,9 @@
<?php
+require '../vendor/autoload.php';
$indexFileDirectory = __DIR__ . '/indexes/';
$banDirectory = __DIR__ . '/BAN/';
-set_include_path(__DIR__ . '/../apps/maarch_entreprise/tools/' . PATH_SEPARATOR . get_include_path());
-require_once('Zend/Search/Lucene.php');
-require("../core/class/class_functions.php");
-
$filesBan = scandir($banDirectory);
if (!is_dir($indexFileDirectory)) {
$index = Zend_Search_Lucene::create($indexFileDirectory);
@@ -34,13 +31,12 @@ foreach ($filesBan as $fileBan) {
if (!empty($data[9])) {
$doc = new Zend_Search_Lucene_Document();
- $func = new functions();
- $doc->addField(Zend_Search_Lucene_Field::UnIndexed('Id', $func->normalize($data[0])));
- $doc->addField(Zend_Search_Lucene_Field::Text('streetName', $func->normalize($data[1])));
+ $doc->addField(Zend_Search_Lucene_Field::UnIndexed('Id', \SrcCore\models\TextFormatModel::normalize(['string' => $data[0]])));
+ $doc->addField(Zend_Search_Lucene_Field::Text('streetName', \SrcCore\models\TextFormatModel::normalize(['string' => $data[1]])));
$doc->addField(Zend_Search_Lucene_Field::UnIndexed('streetNumber', $data[3] . ' ' . $data[4]));
$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', $func->normalize($data[10])));
+ $doc->addField(Zend_Search_Lucene_Field::Text('city', \SrcCore\models\TextFormatModel::normalize(['string' => $data[10]])));
$index->addDocument($doc);
--
GitLab