issue #0001970 : Replace the WsScore class

application/controllers/DocumentationController.php

@@ -225,8 +225,7 @@ class DocumentationController extends Zend_Controller_Action
      */
     public function erreurAction()
     {
-		require_once 'WsScore/WsScore.php';
+    	$ws = new Scores_Ws_Server();
-    	$ws = new WsScore();
 		$erreurs = $ws->listError;
     	$this->view->assign('erreurs', $erreurs);
     }

library/Scores/Ws/Server.php

@@ -390,13 +390,19 @@ class Scores_Ws_Server
 		    $nic='';
 		}
 
-		$rs = '';
+		$dataInsert = array(
-		$cp = '';
+		    'login'			=> $this->tabInfoUser['login'],
-		$vil = '';
+		    'idClient'		=> $this->tabInfoUser['idClient'],
+		    'page'			=> $service,
+		    'siren'			=> $siren,
+		    'nic'			=> $nic,
+		    'params'		=> $ref,
+		    'test'			=> $test,
+		    'ipClient'		=> $this->tabInfoUser['ipConnexion'],
+		);
 
-		$db = Zend_Db_Table::getDefaultAdapter();
+		$db = Zend_Db_Table_Abstract::getDefaultAdapter();
 
-		$dataInsee = array();
 		if ( in_array($service, array('identite', 'greffe_bilans', 'greffe_actes', 'liens',
 		    'dirigeants', 'etablissements', 'dirigeantsOp', 'kbis', 'indiscore', 'indiscore2',
 		    'indiscore3', 'rapport2', 'rapport3')) ) {
@@ -414,44 +420,43 @@ class Scores_Ws_Server
                 return;
 			}
 
-			$result = $db->fetchRow($sql);
+			try {
+                $result = $db->fetchRow($sql, null, Zend_Db::FETCH_OBJ);
+			} catch(Zend_Db_Exception $e) {
+			    //@todo : log exception
+                //file_put_contents('test.log', $e->getMessage());
+			}
+
 		    if ( $result !== null ) {
-		        $rs = $result->raisonSociale;
+
-		        $cp = $result->adr_cp;
+		        //file_put_contents('lecture.log', print_r($result,1));
-		        $vil = $result->adr_ville;
+
-		        $dataInsee['source'] = $result->source;
+		        $dataInsert['raisonSociale'] = $result->raisonSociale;
+		        $dataInsert['cp']			 = $result->adr_cp;
+		        $dataInsert['ville']		 = $result->adr_ville;
+
+		        $dataInsert['source'] = $result->source;
 		        if ( $result->actif == 0 ) {
-		            $dataInsee['actifInsee'] = 0;
+                    $dataInsert['actifInsee'] = 0;
 		        } elseif ( intval($siren)>1000 ) {
-		            $dataInsee['actifInsee'] = 1;
+                    $dataInsert['actifInsee'] = 1;
                     $sql = $db->select()->from('jo.rncs_entrep', 'count(*) AS nb')->where('siren=?', $siren);
-                    $result = $db->fetchRow($sql);
+                    $result = $db->fetchRow($sql, null, Zend_Db::FETCH_OBJ);
                     if ( $result !== null ) {
                     	if ($result->nb>0 ) {
-                    	    $dataInsee['source'] = 5;
+                    	    $dataInsert['source'] = 5;
                     	}
                     }
 		        }
 		    }
 		}
 
-		$dataInsert = array(
-			'login'			=> $this->tabInfoUser['login'],
-			'idClient'		=> $this->tabInfoUser['idClient'],
-			'page'			=> $service,
-			'siren'			=> $siren,
-			'nic'			=> $nic,
-			'params'		=> $ref,
-			'test'			=> $test,
-			'raisonSociale'	=> $rs,
-			'cp'			=> $cp,
-			'ville'			=> $vil,
-			'ipClient'		=> $this->tabInfoUser['ipConnexion'],
-		);
 		try {
-            $db->insert('sdv1.log', array_merge($dataInsert,$dataInsee));
+		    //file_put_contents('insert.log', print_r($dataInsert,1));
-		} catch(Zend_Db_Adapter_Exception $e) {
+            $db->insert('sdv1.logs', $dataInsert);
+		} catch(Zend_Db_Exception $e) {
 		    //@todo : log exception
+		    //file_put_contents('test.log', $e->getMessage());
 		}
 	}
 
@@ -461,6 +466,11 @@ class Scores_Ws_Server
 	 */
 	protected function authenticate()
 	{
+		/**
+		 * @todo : Detect auth method
+		 * Basic - Digest - Key - Cert
+		 */
+
 	    $auth = $this->checkAuth($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'], $_SERVER['REMOTE_ADDR']);
 		if ( $auth === false ) {
 			$this->sendError('0900');

library/Scores/autoload_classmap.php

@@ -6,4 +6,5 @@ return array(
     'Scores_Wkhtml_Pdf'          => dirname(__FILE__) . '/Wkhtml/Pdf.php',
     'Scores_Ws_Doc'              => dirname(__FILE__) . '/Ws/Doc.php',
     'Scores_Ws_Form_GetIdentite' => dirname(__FILE__) . '/Ws/Form/GetIdentite.php',
+    'Scores_Ws_Server'           => dirname(__FILE__) . '/Ws/Server.php',
 );

library/SdMetier/README

@@ -6,10 +6,13 @@ List of libraries and description
 
  Graydon
 
- Scoring
-
- Sphinx
-
  Infogreffe
 
+ Scoring
+
+ Search
+ 
+ Sfr
+
+
 

library/SdMetier/autoload_classmap.php

@@ -0,0 +1,9 @@
+<?php
+// Generated by ZF's ./bin/classmap_generator.php
+return array(
+    'SdMetier_Graydon_Service' => dirname(__FILE__) . '/Graydon/Service.php',
+    'SdMetier_Scoring_Vars'    => dirname(__FILE__) . '/Scoring/Vars.php',
+    'SdMetier_Search_Engine'   => dirname(__FILE__) . '/Search/Engine.php',
+    'SdMetier_Sfr_Compile'     => dirname(__FILE__) . '/Sfr/Compile.php',
+    'SdMetier_Sfr_Scoring'     => dirname(__FILE__) . '/Sfr/Scoring.php',
+);

library/WsScore/Catalog/v0.1/Catalog.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Catalog extends WsScore
+class Catalog extends Scores_Ws_Server
 {
     /**
      * Naf5

library/WsScore/Clients/Afnic/v2.2/Entreprise.php

@@ -1,9 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once 'WsScore/functions.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
     public function __construct()
     {

library/WsScore/Clients/Sfr/v0.1/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
     public function __construct()
     {

library/WsScore/Clients/Veolia/v0.1/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
     public function __construct()
     {

library/WsScore/Clients/Veolia/v0.2/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
     public function __construct()
     {

library/WsScore/Clients/Vwbank/v0.1/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
     public function __construct()
     {

library/WsScore/Clients/Vwbank/v0.2/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 
     public function __construct()

library/WsScore/Entreprise/v0.2/Entreprise.php

@@ -1,9 +1,8 @@
 <?php
-require_once 'WsScore/WsScore.php';
 require_once 'WsScore/functions.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
+require_once __DIR__ . '/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	protected $wsdl = null;
 	protected $wsdlOptions = array();

library/WsScore/Entreprise/v0.3/Entreprise.php

@@ -1,9 +1,8 @@
 <?php
-require_once 'WsScore/WsScore.php';
 require_once 'WsScore/functions.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
+require_once __DIR__ . '/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	public function __construct()
 	{

library/WsScore/Entreprise/v0.4/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	public function __construct()
 	{

library/WsScore/Entreprise/v0.5/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	public function __construct()
 	{

library/WsScore/Entreprise/v0.6/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	/**
 	 * Retourne les informations identitaires de l'entreprise ou de l'établissement demandé

library/WsScore/Entreprise/v0.7/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 
 	/**

library/WsScore/Entreprise/v0.8/Entreprise.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Entreprise extends WsScore
+class Entreprise extends Scores_Ws_Server
 {
 	/**
 	 * Retourne les informations identitaires de l'entreprise ou de l'établissement demandé

library/WsScore/Gestion/v0.1/Gestion.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Gestion extends WsScore
+class Gestion extends Scores_Ws_Server
 {
 	/**
 	 * Récupère les informations du profil connecté

library/WsScore/Gestion/v0.2/Gestion.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Gestion extends WsScore
+class Gestion extends Scores_Ws_Server
 {
 	/**
 	 * Récupère les informations du profil connecté

library/WsScore/Gestion/v0.3/Gestion.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Gestion extends WsScore
+class Gestion extends Scores_Ws_Server
 {
 	/**
 	 * Récupère les informations du profil connecté

library/WsScore/Interne/v0.2/Interne.php

@@ -1,9 +1,8 @@
 <?php
-require_once 'WsScore/WsScore.php';
 require_once 'WsScore/functions.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
+require_once __DIR__ . '/Types.php';
 
-class Interne extends WsScore
+class Interne extends Scores_Ws_Server
 {
 	/**
 	 *

library/WsScore/Interne/v0.3/Interne.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Interne extends WsScore
+class Interne extends Scores_Ws_Server
 {
 	/**
 	 * Retourne le détails des privilèges

library/WsScore/Interne/v0.4/Interne.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Interne extends WsScore
+class Interne extends Scores_Ws_Server
 {
 	/**
 	 * Retourne le détails des privilèges

library/WsScore/Interne/v0.5/Interne.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Interne extends WsScore
+class Interne extends Scores_Ws_Server
 {
 	/**
 	 * Retourne le détails des privilèges

library/WsScore/Interne/v0.6/Interne.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Interne extends WsScore
+class Interne extends Scores_Ws_Server
 {
 	/**
 	 * Retourne le détails des privilèges

library/WsScore/Pieces/v0.1/Pieces.php

@@ -1,5 +1,5 @@
 <?php
-require_once realpath(dirname(__FILE__)).'/Types.php';
+require_once __DIR__ . '/Types.php';
 
 class Pieces extends Scores_Ws_Server
 {

library/WsScore/Saisie/v0.1/Saisie.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Saisie extends WsScore
+class Saisie extends Scores_Ws_Server
 {
 	/**
 	 * Liste les mandataires correspondant à un nom donné
@@ -31,7 +30,6 @@ class Saisie extends WsScore
 			$mandataire->id = 'm'.$i;
 			$mandataire->mand = utf8_encode($mand);
 			$tabRet[] = $mandataire;
-	
 		}
 		$output = new SearchMandatairesReturn();
 		$output->result = $tabRet;

library/WsScore/Saisie/v0.2/Saisie.php

@@ -1,8 +1,7 @@
 <?php
-require_once 'WsScore/WsScore.php';
+require_once __DIR__ . '/Types.php';
-require_once realpath(dirname(__FILE__)).'/Types.php';
 
-class Saisie extends WsScore
+class Saisie extends Scores_Ws_Server
 {
 	/**
 	 * Liste les mandataires correspondant à un nom donné

public/index.php

@@ -24,14 +24,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../library/Zend/autoload_classmap.php',
         __DIR__ . '/../library/Application/autoload_classmap.php',
-        __DIR__ . '/../library/Scores/autoload_classmap.php',
         __DIR__ . '/../application/autoload_classmap.php',
+        __DIR__ . '/../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../library/Zend',
             'Application'   => __DIR__ . '/../library/Application',
             'Scores'        => __DIR__ . '/../library/Scores',
+            'SdMetier'      => __DIR__ . '/../library/SdMetier',
             'Metier'        => __DIR__ . '/../library/Metier',
         ),
         'fallback_autoloader' => true

scripts/build/configure.php

@@ -35,14 +35,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../../library/Zend/autoload_classmap.php',
         __DIR__ . '/../../library/Application/autoload_classmap.php',
-        __DIR__ . '/../../library/Scores/autoload_classmap.php',
         __DIR__ . '/../../application/autoload_classmap.php',
+        __DIR__ . '/../../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../../library/Zend',
             'Application'   => __DIR__ . '/../../library/Application',
             'Scores'        => __DIR__ . '/../../library/Scores',
+            'SdMetier'      => __DIR__ . '/../../library/SdMetier',
             'Metier'        => __DIR__ . '/../../library/Metier',
         ),
         'fallback_autoloader' => true

scripts/build/genCache.php

@@ -20,14 +20,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../../library/Zend/autoload_classmap.php',
         __DIR__ . '/../../library/Application/autoload_classmap.php',
-        __DIR__ . '/../../library/Scores/autoload_classmap.php',
         __DIR__ . '/../../application/autoload_classmap.php',
+        __DIR__ . '/../../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../../library/Zend',
             'Application'   => __DIR__ . '/../../library/Application',
             'Scores'        => __DIR__ . '/../../library/Scores',
+            'SdMetier'      => __DIR__ . '/../../library/SdMetier',
             'Metier'        => __DIR__ . '/../../library/Metier',
         ),
         'fallback_autoloader' => true

scripts/build/genCodeRatios.php

@@ -20,14 +20,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../../library/Zend/autoload_classmap.php',
         __DIR__ . '/../../library/Application/autoload_classmap.php',
-        __DIR__ . '/../../library/Scores/autoload_classmap.php',
         __DIR__ . '/../../application/autoload_classmap.php',
+        __DIR__ . '/../../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../../library/Zend',
             'Application'   => __DIR__ . '/../../library/Application',
             'Scores'        => __DIR__ . '/../../library/Scores',
+            'SdMetier'      => __DIR__ . '/../../library/SdMetier',
             'Metier'        => __DIR__ . '/../../library/Metier',
         ),
         'fallback_autoloader' => true

scripts/build/genCodeRatios2.php

@@ -20,14 +20,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../../library/Zend/autoload_classmap.php',
         __DIR__ . '/../../library/Application/autoload_classmap.php',
-        __DIR__ . '/../../library/Scores/autoload_classmap.php',
         __DIR__ . '/../../application/autoload_classmap.php',
+        __DIR__ . '/../../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../../library/Zend',
             'Application'   => __DIR__ . '/../../library/Application',
             'Scores'        => __DIR__ . '/../../library/Scores',
+            'SdMetier'      => __DIR__ . '/../../library/SdMetier',
             'Metier'        => __DIR__ . '/../../library/Metier',
         ),
         'fallback_autoloader' => true

scripts/build/genCodeSfr.php

@@ -20,14 +20,16 @@ Zend_Loader_AutoloaderFactory::factory(array(
     'Zend_Loader_ClassMapAutoloader' => array(
         __DIR__ . '/../../library/Zend/autoload_classmap.php',
         __DIR__ . '/../../library/Application/autoload_classmap.php',
-        __DIR__ . '/../../library/Scores/autoload_classmap.php',
         __DIR__ . '/../../application/autoload_classmap.php',
+        __DIR__ . '/../../library/Scores/autoload_classmap.php',
+        __DIR__ . '/../../library/SdMetier/autoload_classmap.php',
     ),
     'Zend_Loader_StandardAutoloader' => array(
         'prefixes' => array(
             'Zend'          => __DIR__ . '/../../library/Zend',
             'Application'   => __DIR__ . '/../../library/Application',
             'Scores'        => __DIR__ . '/../../library/Scores',
+            'SdMetier'      => __DIR__ . '/../../library/SdMetier',
             'Metier'        => __DIR__ . '/../../library/Metier',
         ),
         'fallback_autoloader' => true