Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 1298 → Rev 1299

/branches/v5.12-baouque/services/bibliotheque/Utilisateurs.php
1,6 → 1,6
<?php
class Utilisateurs {
const TPL_URL_WS_ANNUAIRE = 'http://www.tela-botanica.org/service:annuaire:utilisateur/identite-par-courriel/%s';
const TPL_URL_WS_ANNUAIRE = 'https://www.tela-botanica.org/service:annuaire:utilisateur/identite-par-courriel/%s';
 
private $courriels = array();
private $identites = array();
/branches/v5.12-baouque/services/modules/0.1/eflore/cartes/LegendeCartes.php
23,7 → 23,7
 
private $formatsSupportes = array(self::MIME_JSON);
private $tableOntologie = '';
private $ontologies = '';
private $ontologies = [];
private $legende = array();
 
public function __construct(Conteneur $conteneur) {
/branches/v5.12-baouque/services/modules/0.1/eflore/cartes/CelFormateur.php
54,7 → 54,7
* A terme, utilser vraiment le moissonage, y compris pour les donnees issues du CEL, en utilisant ABCD et en modifiant le programme d'harvesting.
*/
$queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_cel.cel_obs ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_new_cel.cel_obs ".
"WHERE nt = '".$this->info['nt']."' ".
" AND transmission = 1";
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
117,7 → 117,7
}
} else {
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
" FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
" FROM tb_new_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
return $utm;
/branches/v5.12-baouque/services/modules/0.1/eflore/cartes/CbnmedFormateur.php
112,7 → 112,7
$utm = array(0 => $tab_code_insee[$id_location_protege]);
} else {
$requete = "SELECT * ".
"FROM tb_cel.locations ".
"FROM tb_new_cel.locations ".
"WHERE insee_code = $id_location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
/branches/v5.12-baouque/services/modules/0.1/eflore/cartes/GeneralFormateur.php
63,7 → 63,7
$inventoriesCel = array();
} else {
$queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_cel.cel_obs ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_new_cel.cel_obs ".
"WHERE nt = '".$this->info['nt']."' ".
" AND transmission = 1";
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
191,7 → 191,7
$utm = array(0 => $tab_code_insee[$id_location_protege]);
} else {
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector ".
"FROM tb_cel.cel_zones_geo ".
"FROM tb_new_cel.cel_zones_geo ".
"WHERE nom LIKE $location_protege ".
" AND code = $id_location_protege ";
$resultat = $this->getBdd()->recupererTous($requete);
201,7 → 201,7
}
} else {
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
" FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
" FROM tb_new_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
}
/branches/v5.12-baouque/services/modules/0.1/baseveg/syntaxons/SyntaxonsCommun.php
114,7 → 114,7
self::$cache[$url] = $val;
}
$ontologie['niveau.code'] = $valeur;
$ontologie['niveau.libelle'] = $val->nom;
$ontologie['niveau.libelle'] = $val->nom ?? '';
$ontologie['niveau.href'] = $url;
return $ontologie;
}
/branches/v5.12-baouque/services/modules/0.1/coste/Textes.php
147,7 → 147,7
// de toolkits
$req = self::getCosteInfo($params, $db);
$res = $db->recupererTous($req);
$err = mysqli_error();
$err = @mysqli_error();
if (!$res && $err) {
// http_response_code(400);
// if(defined('DEBUG') && DEBUG) header("X-Debug: $req");
/branches/v5.12-baouque/services/modules/0.1/commun/MetaDonnees.php
330,7 → 330,7
if ($table_contact[0] != array()) {
$this->table_retour[$key.'.contact'] = '';
foreach ($table_contact as $info => $valeur) {
$this->table_retour[$key.'.contact'] .= $valeur['contact.prenom']." ".$valeur['contact.nom'];
$this->table_retour[$key.'.contact'] .= ($valeur['contact.prenom'] ?? '')." ". ($valeur['contact.nom'] ?? '');
}
//on affiche les détails des autres contacts :
$this->afficherTableDetails($key.'.contact', $table_contact);
/branches/v5.12-baouque/services/modules/0.1/bdtxa/cartes/LegendeCartes.php
23,7 → 23,7
 
private $formatsSupportes = array(self::MIME_JSON);
private $tableOntologie = '';
private $ontologies = '';
private $ontologies = [];
private $legende = array();
 
public function __construct(Conteneur $conteneur) {
/branches/v5.12-baouque/services/modules/0.1/cel/Images.php
260,7 → 260,7
'WHERE '.
" co.nom_ret_nn IN ($numNom) ".
' AND ci.date_prise_de_vue != "0000-00-00" '.
' AND co.nom_referentiel LIKE '.$this->Bdd->proteger($refTax.'%').' '.
' AND co.nom_referentiel = '.$this->Bdd->proteger($refTax).' '.
' ORDER BY ci.date_prise_de_vue ASC '.
'LIMIT 1' . ' -- ' . __FILE__ . ':' . __LINE__;
306,10 → 306,9
' ci.id_image AS id_img, co.date_observation AS date '.
(isset($this->parametres['retour.champs']) ? ', '.$this->parametres['retour.champs'] : '').
'FROM cel_images_export AS ci'.
' LEFT JOIN cel_export AS co '.
' JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
$this->formerRequeteConditions($numNomListe).' '.
'GROUP BY id_img '.
$this->formerRequeteTri().
"LIMIT $depart,$limite " . ' -- ' . __FILE__ . ':' . __LINE__;
321,7 → 320,7
$where[] = " co.nom_ret_nn IN ($numNomListe) ";
// exclusion des noms à déterminer, douteux ou plantnet-mobile
$where[] = " ((co.mots_cles_texte not like '%aDeterminer%' AND co.mots_cles_texte not like '%plantnet-mobile%') OR co.mots_cles_texte IS null) ";
$where[] = " co.nom_referentiel LIKE ".$this->Bdd->proteger($refTax."%").' ';
$where[] = " co.nom_referentiel = ".$this->Bdd->proteger($refTax).' ';
return ' WHERE '.implode(' AND ', $where);
}
535,7 → 534,7
if ($this->avoirContenu($infos['zone_geo'])) {
$commune[] = $infos['zone_geo'];
}
if (isset($infos['ce_zone_geo']) && $this->avoirContenu($infos['ce_zone_geo']) && $infos['ce_zone_geo'] != 'INSEE-C:') {
if (isset($infos['ce_zone_geo']) && $this->avoirContenu($infos['ce_zone_geo']) && $infos['ce_zone_geo'] != '') {
$commune[] = '('.substr(str_replace('INSEE-C:','',$infos['ce_zone_geo']), 0, 2).')';
}
return implode(' ', $commune);
552,7 → 551,7
$and = $referentiel ? ' AND referentiel = ' . $this->Bdd->proteger($referentiel) : '';
$requete = 'SELECT referentiel, ce_image as id_img, organe '.
'FROM tb_del_test.del_image_top '.
'FROM tb_del.del_image_top '.
'WHERE nn = '. $this->Bdd->proteger($nn) . $and . ' -- ' . __FILE__ . ':' . __LINE__;
$this->infosImages = $this->Bdd->recupererTous($requete);
/branches/v5.12-baouque/services/modules/0.1/bdtfx/CommunNomsTaxons.php
757,7 → 757,11
if (preg_match('/^([^_-]+)(?:_|-)([^_-]+)$/', $code, $match)) {
$code = $match[1].ucfirst($match[2]);
}
$requete = sprintf('SELECT * FROM %s WHERE id IN (SELECT id FROM %s WHERE code = "%s" AND classe_id = (SELECT id FROM %s WHERE code = "%s")) LIMIT 0, 100 -- %s:%s', Config::get('bdd_table_ontologies'), Config::get('bdd_table_ontologies'), $valeur, Config::get('bdd_table_ontologies'), $code, __FILE__, __LINE__);
$bdd = Config::get('bdd_table_ontologies');
$requete = sprintf(
'SELECT ba.* FROM %s ba JOIN %s bb ON (ba.id = bb.id AND bb.code = "%s") JOIN %s bc ON (bc.id= bb.classe_id AND bc.code = "%s") LIMIT 0, 100 -- %s:%s',
$bdd, $bdd, $valeur, $bdd, $code, __FILE__, __LINE__
);
$res = $this->getBdd()->recuperer($requete);
$nom_code = $valeur;
if (is_array($res)) {
/branches/v5.12-baouque/services/modules/0.1/baseflor/InformationsBaseflor.php
371,7 → 371,7
}
public function classerPrimSecEnTypesSsTypes($types_prim_sec) {
$types_sstypes = '';
$types_sstypes = [];
foreach ($types_prim_sec as $cle => $tb) {
$types_sstypes[$cle]= $this->separerTypes_SousTypes($tb, $cle);
}
/branches/v5.12-baouque/services/modules/0.1/baseflor/InformationsTaxonsSup.php
28,7 → 28,7
protected $serviceNom = 'informations';
private $retour_format = 'max';
private $Bdd;
private $requete_condition = "";
private $requete_condition = [];
private $champs_recherches = '*';
public function consulter($ressources, $parametres) {
/branches/v5.12-baouque/services/modules/0.1/chorodep/cartes/LegendeCartes.php
23,7 → 23,7
 
private $formatsSupportes = array(self::MIME_JSON);
private $tableOntologie = '';
private $ontologies = '';
private $ontologies = [];
private $legende = array();
 
public function __construct(Conteneur $conteneur) {
/branches/v5.12-baouque/services/configurations/config_moissonnage.ini
5,7 → 5,7
 
; Nom de la base utilisée.
bdd_nom = "tb_eflore"
bdd_nom_floradata = "tb_cel"
bdd_nom_floradata = "tb_new_cel"
 
; Nom de la table métadonnées utilisée.
bdd_table_meta = "eflore_meta"
/branches/v5.12-baouque/services/configurations/config_coste.ini
8,7 → 8,7
bdd_table_meta = "coste_meta"
 
; chemin vers les donnees de Coste (dont images)
donnees = "{ref:url_base}eflore/donnees/coste/"
donnees = "{ref:url_base}donnees/coste/"
 
; URL de base des services de ce projet
url_service="{ref:url_base}service:eflore:0.1/coste"
/branches/v5.12-baouque/services/configurations/config_bdtfxr.ini
161,7 → 161,8
flore_fh=LAUBER & WAGNER 2000 Flore illustrée de Suisse,
flore_fournier=FOURNIER 1934-1940. Quatre Flores de France.,
flore_belge_ed5=LAMBINON & DELVOSALLE & DUVIGNEAUD 2004 Nouvelle flore de la Belgique du G.-D. de Luxembourg du nord de la France et des régions voisines,
flore_fg=TISON & DE FOUCAULT 2014. Flora gallica."
flore_fg=TISON & DE FOUCAULT 2014. Flora gallica,
flore_ke=KERGUÉLEN 1993. Liste synonymique de la flore de France."
 
; tableau contenant le nom du champ flores
correspondance_flores="
/branches/v5.12-baouque/services/configurations/config_bdtfx.ini
161,7 → 161,8
flore_fh=LAUBER & WAGNER 2000 Flore illustrée de Suisse,
flore_fournier=FOURNIER 1934-1940. Quatre Flores de France.,
flore_belge_ed5=LAMBINON & DELVOSALLE & DUVIGNEAUD 2004 Nouvelle flore de la Belgique du G.-D. de Luxembourg du nord de la France et des régions voisines,
flore_fg=TISON & DE FOUCAULT 2014. Flora gallica."
flore_fg=TISON & DE FOUCAULT 2014. Flora gallica,
flore_ke=KERGUÉLEN 1993. Liste synonymique de la flore de France."
 
; tableau contenant le nom du champ flores
correspondance_flores="