scores/enrichissement
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Michael RICOIS 2016-07-18 15:57:47 +02:00
parent 2b3f4190ec
commit 96548b180b
27 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Metier/Bodacc/MBodacc.php
View File

@ -492,7 +492,7 @@ class Metier_Bodacc_MBodacc
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

6
library/Metier/Insee/MInsee.php
View File

@ -81,7 +81,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}
@ -276,7 +276,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
{
$tabAdr = $this->structureVoie(strtoupper($adresse));
$numAdresse = preg_replace('/^0+/','',''.$tabAdr['num']*1);
$adresse = trimAccent($tabAdr['libVoie']);
$adresse = Metier_Util_String::trimAccent($tabAdr['libVoie']);
$formR = array(
'type' => 'ent',
'siret' => '',
@ -784,7 +784,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
if ($strLigneDAdresse=='') return $tabRet;
$tabLignes=explode(',', preg_replace('/,$/', '', $strLigneDAdresse));
foreach ($tabLignes as $strLigneDAdresse) {
$strLigneDAdresse=trimAccent($strLigneDAdresse);
$strLigneDAdresse=Metier_Util_String::trimAccent($strLigneDAdresse);
$strLigneDAdresse=preg_replace('/[^0-9a-zA-Z]/', ' ', $strLigneDAdresse);
$strLigneDAdresse=trim(preg_replace('/ +/', ' ', $strLigneDAdresse));
//echo "1. Adresse nettoyées = $strLigneDAdresse".PHP_EOL;

2
library/Metier/Partenaires/MAmabis.php
View File

@ -10,7 +10,7 @@ class Metier_Partenaires_MAmabis
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MArtisanat.php
View File

@ -14,7 +14,7 @@ class Metier_Partenaires_MArtisanat
public $enCache=false;
function __construct() {
$this->iDb=new WDB();
$this->iDb=new Metier_Util_Db();
}
function getIdentite($siren, $refresh=false) {

2
library/Metier/Partenaires/MBanques.php
View File

@ -50,7 +50,7 @@ class Metier_Partenaires_MBanques
function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MBilans.php
View File

@ -275,7 +275,7 @@ class Metier_Partenaires_MBilans
public function __construct($siren, $db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MBourse.php
View File

@ -9,7 +9,7 @@ class Metier_Partenaires_MBourse
$this->siren = $siren;
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MCadastre.php
View File

@ -126,7 +126,7 @@ class Metier_Partenaires_MCadastre
{
$this->siren = $siren;
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MFacto.php
View File

@ -88,7 +88,7 @@ class Metier_Partenaires_MFacto
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MGreffes.php
View File

@ -6,7 +6,7 @@ class Metier_Partenaires_MGreffes
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MLiens.php
View File

@ -38,7 +38,7 @@ class Metier_Partenaires_MLiens
public function __construct($siren) {
$this->siren=$siren;
$this->iDb=new WDB();
$this->iDb=new Metier_Util_Db();
$this->iInsee=new Metier_Insee_MInsee();
}

2
library/Metier/Partenaires/MMap.php
View File

@ -517,7 +517,7 @@ class Metier_Partenaires_MMap {
public function __construct($accesDist=true, $db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MMarques.php
View File

@ -24,7 +24,7 @@ class Metier_Partenaires_MMarques
$this->partConnection();
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MOrias.php
View File

@ -21,7 +21,7 @@ class Metier_Partenaires_MOrias
$this->accesDist = $accesDist;
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MPrivileges.php
View File

@ -70,7 +70,7 @@ class Metier_Partenaires_MPrivileges
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MQualibat.php
View File

@ -18,7 +18,7 @@ class Metier_Partenaires_MQualibat {
function __construct($accesDist=true) {// $adresse, $cp, $ville, $pays='France') {
$this->accesDist=$accesDist;
$this->iDb=new WDB();
$this->iDb=new Metier_Util_Db();
$this->iBodacc=new Metier_Bodacc_MBodacc();
$this->$iInsee=new Metier_Insee_MInsee();
}

2
library/Metier/Partenaires/MRncs.php
View File

@ -56,7 +56,7 @@ class Metier_Partenaires_MRncs
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MRnvp.php
View File

@ -28,7 +28,7 @@ class Metier_Partenaires_MRnvp
);
function __construct() {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
$this->iInsee = new Metier_Insee_MInsee($this->iDb);
}

2
library/Metier/Partenaires/MTel.php
View File

@ -29,7 +29,7 @@ class Metier_Partenaires_MTel
$this->codeRetour=$page['code'];
}
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Partenaires/MTva.php
View File

@ -21,7 +21,7 @@ class Metier_Partenaires_MTva
}
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Scores/ICotation.php
View File

@ -24,7 +24,7 @@ class Metier_Scores_ICotation
function __construct($tabBilan, $retraitementAutomatique = true, $db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

2
library/Metier/Scores/MRatios.php
View File

@ -215,7 +215,7 @@ class Metier_Scores_MRatios
public function __construct($db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

6
library/Metier/Scores/MScores.php
View File

@ -19,7 +19,7 @@ function getIndiscoreHisto($siren)
WHERE siren=$siren
GROUP BY indiScoreDate
ORDER BY indiScoreDate DESC";
$iDb = new WDB();
$iDb = new Metier_Util_Db();
$ret = $iDb->query($query);
$tabRet = array();
while( $ret = $iDb->fetch(MYSQL_ASSOC) ) {
@ -73,7 +73,7 @@ function getIndiscoreCache($siren)
FROM jo.scores_surveillance
WHERE siren=$siren
ORDER BY indiScoreDate DESC";
$iDb = new WDB();
$iDb = new Metier_Util_Db();
$ret = $iDb->query($query);
$tabRet = array();
while( $ret = $iDb->fetch(MYSQL_ASSOC) ) {
@ -647,7 +647,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
$NIVEAU = $cycleClient; // 1, 2, 3 ou 5 Niveau de version des commentaires
if ( $db === null ) {
$iDb = new WDB();
$iDb = new Metier_Util_Db();
} else {
$iDb = $db;
}

2
library/Metier/Scores/MSolvabilite.php
View File

@ -1042,7 +1042,7 @@ class Metier_Scores_MSolvabilite
public function __construct($siren, $naf='', $trancheEff='', $effectifReel='', $depSiege_CodePosSiege='', $fj='', $capital='', $capitalDev='', $dateCreaEn='', $dateCreaSiege='', $singularite='', $recme=0, $db = null)
{
if ( $db === null ) {
$this->iDb = new WDB();
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}

4
library/Metier/Util/Log.php
View File

@ -18,7 +18,7 @@ class Metier_Util_Log
} else {
file_put_contents(LOG_PATH.'/debugError.log', date('Y/m/d-H:i:s') .';'. $level .';'. $_SERVER['PHP_SELF'] .';'. $_SERVER['PHP_AUTH_USER'] .';'. $_SERVER['PHP_AUTH_PW'] .';'.
$_SERVER['REMOTE_ADDR'] .';'. $_SERVER['HTTP_SOAPACTION'] .';'.$line.';'. $file.';'. $function.';'. $class .';'.
@gethostbyaddr($_SERVER['REMOTE_ADDR']) .';'. $HTTP_RAW_POST_DATA .';'. @memory_get_usage().';'. $message . PHP_EOL, FILE_APPEND);
@gethostbyaddr($_SERVER['REMOTE_ADDR']) .';'. 'php://input' .';'. @memory_get_usage().';'. $message . "\n", FILE_APPEND);
}
} else {
if (!file_exists(LOG_PATH.'/debug.log')) {
@ -28,7 +28,7 @@ class Metier_Util_Log
date('Y/m/d-H:i:s') .';'. $level .';'. $_SERVER['PHP_SELF'] .';'. $_SERVER['PHP_AUTH_USER'] .';'.
$_SERVER['PHP_AUTH_PW'] .';'. $_SERVER['REMOTE_ADDR'] .';'. $_SERVER['HTTP_SOAPACTION'] .';'.
$line.';'. $file.';'. $function.';'. $class .';'. @gethostbyaddr($_SERVER['REMOTE_ADDR']) .';'.
$HTTP_RAW_POST_DATA .';'. @memory_get_usage().';'. $message . PHP_EOL, FILE_APPEND);
'php://input' .';'. @memory_get_usage().';'. $message . "\n", FILE_APPEND);
}
}
}

4
library/SdMetier/Scoring/Base.php
View File

@ -72,7 +72,7 @@ class SdMetier_Scoring_Base extends SdMetier_Scoring_Vars
public function __construct($db = null)
{
if ( $db === null ) {
$this->db = new WDB();
$this->db = new Metier_Util_Db();
}
// --- Initialisation tableau libellé des variables
@ -124,7 +124,7 @@ class SdMetier_Scoring_Base extends SdMetier_Scoring_Vars
WHERE siren=$siren
GROUP BY indiScoreDate
ORDER BY indiScoreDate DESC";
$iDb = new WDB();
$iDb = new Metier_Util_Db();
$ret = $iDb->query($query);
$tabRet = array();
while( $ret = $iDb->fetch(MYSQL_ASSOC) ) {

4
scripts/jobs/enrichissement.php
View File

@ -589,7 +589,7 @@ if ( $opts->reprise ) {
$row = 0;
$doublonList = array();
$iDb = new WDB();
$iDb = new Metier_Util_Db();
//Vérification et création des données
foreach($tabIdentifiant as $item)
@ -1446,7 +1446,7 @@ function privilegeData($siren, $nic, $values = false)
if ($nbPrivileges>0) {
$return = 'Oui';
} else {
$iDb = new WDB('sdv1');
$iDb = new Metier_Util_Db();
$sql = "SELECT count(*) AS nbPriv FROM ge_cs2 WHERE cs = 'P' AND dateFin >= NOW() AND dateSuppr=0 AND siren='$siren';";
$ret = $iDb->query($sql);
if (count($ret) > 0) {