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

SphinxAPI, et quelques corrections

Browse Source
This commit is contained in:
Michael RICOIS 2015-08-14 20:08:02 +00:00
parent 7f3bb2c3fb
commit ff8d4f5068
12 changed files with 1865 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Metier/partenaires/classMTel.php
View File

@ -280,12 +280,13 @@ class MTel
}
}
if ($last)
{
$tabRet=array();
foreach($tabLast as $typeTel=>$tabPriorite) {
ksort($tabPriorite);
$tabRet[]=current($tabPriorite);
if ($last) {
$tabRet = array();
if ($tabLast != null && count($tabLast) > 0 ) {
foreach($tabLast as $typeTel=>$tabPriorite) {
ksort($tabPriorite);
$tabRet[]=current($tabPriorite);
}
}
}

2
library/Metier/sphinx/rechercheFonc.php
View File

@ -655,7 +655,7 @@ function clientSphinx(&$formR)
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
break;
case 2:
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
break;
}

2
library/SdMetier/Search/Engine.php
View File

@ -16,7 +16,7 @@ class SdMetier_Search_Engine
if ($version == 1){
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
} elseif ($version == 2){
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
}
}

1832
library/Vendors/sphinxapi/sphinxapi-2.2.9.php Normal file
View File

File diff suppressed because it is too large Load Diff

8
library/WsScore/Entreprise/v0.9/Service.php
View File

@ -205,6 +205,7 @@ class Entreprise extends Scores_Ws_Server
$identite->dir2LieuNaiss = prepareString($entrep['dir2LieuNaiss']);
$identite->Rivoli = $entrep['Rivoli'];
$identite->InfosIris = new stdClass();
$identite->InfosIris->codIris = $entrep['InfosIris']['codIris'];
$identite->InfosIris->codComIris = $entrep['InfosIris']['codComIris'];
$identite->InfosIris->libIris = prepareString($entrep['InfosIris']['libIris']);
@ -212,6 +213,7 @@ class Entreprise extends Scores_Ws_Server
$identite->InfosIris->evoIris = $entrep['InfosIris']['evoIris'];
$identite->InfosIris->trIris = $entrep['InfosIris']['trIris'];
$identite->InfosIris->grdQuartier = $entrep['InfosIris']['grdQuartier'];
$identite->NatureActivite = $entrep['NatureActivite']; // Nature de l'activité
$identite->OrigineCreation = $entrep['OrigineCreation']; // Origine de la création
$identite->TypeExploitation = $entrep['TypeExploitation'];
@ -219,6 +221,8 @@ class Entreprise extends Scores_Ws_Server
$identite->Saisonnalite = $entrep['Saisonnalite']; // P=Activité permanente / S=Activité saisonnière
$identite->SurfaceMagasin = $entrep['ACTISURF']*1; // 0=N/D, 1=inf. à 300m2,2=300 à 400m2, 3=400 à 2500m2, 4=sup. à 2500m2
$identite->SituationJuridique = $entrep['SituationJuridique'];
$identite->Bilan = new stdClass();
$identite->Bilan->Millesime = $entrep['bilanAnnee'];
$identite->Bilan->Cloture = $entrep['bilanDate']; //@todo : date
$identite->Bilan->Duree = $entrep['bilanMois'];
@ -246,7 +250,7 @@ class Entreprise extends Scores_Ws_Server
$autreSiren->type = $entrep['AutreSiren']['listeSiren']['type'];
$tabAutreSiren[] = $autreSiren;
}
$identite->AutreSiren = $tabAutreSiren;
$identite->AutreSiren = $tabAutreSiren;
$tabAutreSiret = array();
if (count($entrep['AutreSiret'])) {
@ -274,7 +278,7 @@ class Entreprise extends Scores_Ws_Server
$tabAutreSiret[] = $autreSiret;
}
}
$identite->AutreSiret = $tabAutreSiret;
$identite->AutreSiret = $tabAutreSiret;
$identite->DateMajINSEE = $entrep['DateMajINSEE']; //@todo : date
$identite->DateMajRCS = $entrep['DateMajRCS']; //@todo : date

3
library/WsScore/Gestion/v0.4/Service.php
View File

@ -328,6 +328,7 @@ class Gestion extends Scores_Ws_Server
$sql = $serviceM->select()
->from($serviceM, array('id', 'Code', 'Label', 'Editable', 'Active'))
->where('Deleted=?', 0)
->where('Active=?', 1)
->where('IdClient=?', $id);
$result = $serviceM->fetchAll($sql);
$services = array();
@ -545,7 +546,7 @@ class Gestion extends Scores_Ws_Server
}
if ( count($dataToUpdate) > 0 ) {
$dataToUpdate['DateUpdate'] = date('Y-m-d H:i:s');
$dataToUpdate['DateUpdate'] = date('YmdHis');
try {
$serviceM->update($dataToUpdate, 'id='.$id);
return true;

2
library/WsScore/Interne/v0.3/Service.php
View File

@ -2370,7 +2370,7 @@ class Interne extends Scores_Ws_Server
if (SPHINX_HISTO_VERSION == 1){
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
} elseif (SPHINX_HISTO_VERSION == 2){
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
}
$cl = new SphinxClient();

2
library/WsScore/Interne/v0.4/Service.php
View File

@ -2328,7 +2328,7 @@ class Interne extends Scores_Ws_Server
if (SPHINX_HISTO_VERSION == 1){
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
} elseif (SPHINX_HISTO_VERSION == 2){
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
}
$cl = new SphinxClient();

2
library/WsScore/Interne/v0.5/Service.php
View File

@ -1252,7 +1252,7 @@ class Interne extends Scores_Ws_Server
if (SPHINX_HISTO_VERSION == 1){
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
} elseif (SPHINX_HISTO_VERSION == 2){
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
}
$cl = new SphinxClient();

2
library/WsScore/Interne/v0.6/Service.php
View File

@ -1190,7 +1190,7 @@ class Interne extends Scores_Ws_Server
if (SPHINX_HISTO_VERSION == 1){
require_once 'Vendors/sphinxapi/sphinxapi-0.9.9.php';
} elseif (SPHINX_HISTO_VERSION == 2){
require_once 'Vendors/sphinxapi/sphinxapi-2.1.5.php';
require_once 'Vendors/sphinxapi/sphinxapi-2.2.9.php';
}
$cl = new SphinxClient();

12
library/WsScore/Monitoring/v0.1/Service.php
View File

@ -4,7 +4,17 @@ require_once __DIR__ . '/Types.php';
class Monitoring extends Scores_Ws_Server
{
protected function getSurveillances($source){}
protected function getSurveillanceList($source = null)
{
/**
* Afficher les surveillances en groupant par siren
* Identite : SIREN, Nom, Adresse
* Clic pour liste des éléments
* Ligne 1
* Ligne 2
*
*/
}
protected function getSurveillance(){}
protected function getSurveillanceById(){}

1
library/WsScore/Source/v0.1/Service.php
View File

@ -195,5 +195,6 @@ class Source extends Scores_Ws_Server
return $id;
}
protected function setContact(){}
}