Library Update

This commit is contained in:
Michael RICOIS 2017-01-09 15:34:22 +01:00
parent 49b8c9396e
commit c6cc9f7fab
5 changed files with 7 additions and 7 deletions

View File

@ -6586,7 +6586,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
'Sigle' => $row['sigle'],
'Enseigne' => $row['enseigne'],
'Adresse' => trim(preg_replace('/ +/', ' ',
trim($row['adr_num'] .' '. $$row['adr_btq'] .' '. $row['adr_typeVoie']
trim($row['adr_num'] .' '. $row['adr_btq'] .' '. $row['adr_typeVoie']
.' '. $row['adr_libVoie']))),
'Adresse2' => trim(preg_replace('/ +/', ' ', $row['adr_comp'])),
'CP' => $row['adr_cp'],

View File

@ -5,7 +5,7 @@ class Metier_Partenaires_MRnvp
public $nomTronque = 0;
protected $tabAdrCQ=array(
protected $tabAdrCQ = array(
10 => 'Adresse correcte',
20 => 'Adresse correcte (Voie non reconue dans un CEDEX ou BP)',
21 => 'Adresse correcte mais numéro de facade hors borne (petite ville)',
@ -43,7 +43,7 @@ class Metier_Partenaires_MRnvp
{
$rep = $this->iDb->select('jo.tabDevises', 'devInpi, devIso', 'devInpi>0', false, MYSQL_ASSOC);
$tabDevises = array();
foreach ($rep as $k=>$dev) {
foreach ($rep as $k => $dev) {
$tabDevises[$dev['devInpi']*1] = $dev['devIso'];
}
@ -469,7 +469,7 @@ class Metier_Partenaires_MRnvp
public function normaliseRS($nomLong, $taille=38, $debug=false)
{
$nomCourt = preg_replace('/[^A-Z0-9%@&\'\(\)\"\-\*\/\s\+]/', '', trim(strtoupper($nomLong)));
$tabMots = split("[^[:alpha:]]+", $nomCourt);
$tabMots = preg_split("[^[:alpha:]]+", $nomCourt);
$passage = 0;
$this->nomTronque = 0;
while (strlen($nomCourt) > $taille) {

View File

@ -229,7 +229,7 @@ class Metier_Partenaires_MTva
array(15,52,46,26,24,82,49,36,25),
array(64,86,30,05,51,75,58,66,28),
array(16,23,14,81,78,68,67,96,31),
array(65,57,95,60,08,61,76,29,34),
array(65,57,95,60, 8,61,76,29,34),
array(17,91,79,39,35,54,85,59,37),
array(66,28,63,18,62,47,94,89,40),
);

View File

@ -3639,7 +3639,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
$timer['risquesBassins']=microtime(true);
/** INFOS Orias **/
$iOrias = new Metier_Partenaires_MOrias(false, $iDb);
$iOrias = new Metier_Partenaires_MOrias($iDb);
$tabTmp = $iOrias->getInfosOrias($SIREN);
$ORIASID=$ORIASCAT=$ORIASID_DATE='';
if (count($tabTmp)>0) {

View File

@ -3582,7 +3582,7 @@ class Metier_Scoring_Base extends Metier_Scoring_Vars
$timer['risquesBassins']=microtime(true);
/** INFOS Orias **/
$iOrias = new Metier_Partenaires_MOrias(false, $this->db);
$iOrias = new Metier_Partenaires_MOrias($this->db);
$tabTmp = $iOrias->getInfosOrias($this->SIREN);
$this->ORIASID=$this->ORIASCAT=$this->ORIASID_DATE='';
if (count($tabTmp)>0) {