Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 2121 → Rev 2122

/trunk/jrest/services/ImportXLS.php
710,6 → 710,7
//if(strpos($referentiel, 'bdnff') !== FALSE) return 'bdnff'; //:4.02';
if(strpos($referentiel, 'bdnff') !== FALSE) return 'bdtfx';
if(strpos($referentiel, 'isfan') !== FALSE) return 'isfan'; //:v1.00';
if(strpos($referentiel, 'bdtao') !== FALSE) return 'bdtao'; //:v1.00';
if(strpos($referentiel, 'autre') !== FALSE) return 'autre';
 
if($referentiel && isset($ligne[C_NOM_SEL]) && $ligne[C_NOM_SEL]) {
/trunk/jrest/services/CelValidationObservation.php
97,6 → 97,7
const bdtfx = 'bdtfx_v2_00';
const bdtxa = 'bdtxa_v1_01';
const isfan = 'isfan_v2013';
const bdtao = 'bdtao_v1_00';
 
// get from num_nom(_sel)
static function NN($db, $id, $ref) {
130,6 → 131,12
" FROM %s.%s o".
" LEFT JOIN %s.%s ret ON o.num_nom_retenu != 0 AND o.num_nom_retenu = ret.num_nom".
" WHERE o.num_nom = %d -- %s:%d", self::db, self::isfan, self::db, self::isfan, intval($id), __FILE__, __LINE__))->fetch(PDO::FETCH_ASSOC);
case "bdtao":
return $db->query(sprintf("SELECT o.num_nom_retenu AS nom_ret_nn, o.num_taxonomique AS nt, CONCAT(o.nom_sci, ' ', o.auteur) AS nom_sel".
" , o.famille, CONCAT(ret.nom_sci, ' ', ret.auteur) AS nom_ret".
" FROM %s.%s o".
" LEFT JOIN %s.%s ret ON o.num_nom_retenu != 0 AND o.num_nom_retenu = ret.num_nom".
" WHERE o.num_nom = %d -- %s:%d", self::db, self::bdtao, self::db, self::bdtao, intval($id), __FILE__, __LINE__))->fetch(PDO::FETCH_ASSOC);
}
return FALSE;
}
/trunk/jrest/lib/Cel.php
41,7 → 41,7
protected $start;
protected $limit;
 
static $referentiels_valides = array('bdtfx', 'bdtxa', 'isfan');
static $referentiels_valides = array('bdtfx', 'bdtxa', 'isfan', 'bdtao');
static $default_referentiel = 'bdtfx';
static $fallback_referentiel = 'autre';