| 263,12 → 263,12 |
|---|
| ); |
| $req = sprintf( |
| 'SELECT %s, group_concat(num_taxon) as num_taxon, IF(num_statut="",1,0) AS is_null' . |
| ' FROM %s WHERE %s GROUP BY id ORDER BY %s is_null ASC, num_statut ASC %s -- %s:%d', |
| ' FROM %s WHERE %s GROUP BY id ORDER BY is_null ASC, num_statut ASC, %s %s -- %s:%d', |
| |
| in_array('*', $this->requete_champ) ? ' * ' : implode(', ', $this->requete_champ), |
| $this->table, |
| $this->requete_condition ? implode(' AND ', $this->requete_condition) : 'TRUE', |
| $this->tri ? ($this->tri . ' ' . $this->tri_ordre . ', ') : '', |
| $this->tri ? ($this->tri . ' ' . $this->tri_ordre . ' ') : '', |
| $limiteClause, |
| __FILE__, __LINE__); |
| return $req; |
| 290,12 → 290,12 |
|---|
| } |
| $req = sprintf( |
| 'SELECT %s, IF(num_statut="",1,0) AS is_null' . |
| ' FROM %s WHERE %s ORDER BY %s is_null ASC, num_statut ASC %s -- %s:%d', |
| ' FROM %s WHERE %s ORDER BY is_null ASC, num_statut ASC, %s %s -- %s:%d', |
| |
| in_array('*', $this->requete_champ) ? ' * ' : implode(', ', $this->requete_champ), |
| $this->table, |
| $this->requete_condition ? implode(' AND ', $this->requete_condition) : 'TRUE', |
| $this->tri ? ($this->tri . ' ' . $this->tri_ordre . ', ') : '', |
| $this->tri ? ($this->tri . ' ' . $this->tri_ordre . ' ') : '', |
| $nolimit ? '' : $limiteClause, |
| __FILE__, __LINE__); |
| return $req; |
| 458,23 → 458,23 |
|---|
| $table_retour_json['entete']['href.suivant'] = $url['suivant']; |
| } |
| $resultat_json = array(); |
| foreach ($resultat as &$tab) { |
| foreach ($resultat as $id => &$tab) { |
| $nnv = $tab['num_nom_vernaculaire']; |
| $resultat_json[$nnv]['id'] = $tab['id']; |
| $resultat_json[$nnv]['nom_vernaculaire'] = $tab['nom_vernaculaire']; |
| $resultat_json[$nnv]['langue.code'] = $resultat_json[$nnv]['code_langue'] = $tab['code_langue']; |
| $resultat_json[$nnv]['taxon.code'] = 'bdtfx.nt:'.$tab['num_taxon']; |
| $resultat_json[$id]['id'] = $tab['id']; |
| $resultat_json[$id]['nom_vernaculaire'] = $tab['nom_vernaculaire']; |
| $resultat_json[$id]['langue.code'] = $resultat_json[$nnv]['code_langue'] = $tab['code_langue']; |
| $resultat_json[$id]['taxon.code'] = 'bdtfx.nt:'.$tab['num_taxon']; |
| if ($this->retour_format == 'max') { |
| $this->taxons[] = $tab['num_taxon']; // utilisé pour chercher les noms latins plus bas |
| if($this->champs_supp) { |
| //$resultat_json[$nnv] = $this->ajouterChampsOntologieLigneResultat($tab); |
| // simple initialisation par copie de la référence de l'original |
| $resultat_json[$nnv] = &$tab; |
| $resultat_json[$id] = &$tab; |
| } else { |
| $resultat_json[$nnv]['num_taxon'] = $tab['num_taxon']; |
| $resultat_json[$nnv]['nom_retenu.code'] = $tab['num_taxon']; |
| $resultat_json[$nnv]['taxon'] = $tab['num_taxon']; |
| $resultat_json[$nnv]['href'] = $this->ajouterHref('noms-vernaculaires', $tab['id']); |
| $resultat_json[$id]['num_taxon'] = $tab['num_taxon']; |
| $resultat_json[$id]['nom_retenu.code'] = $tab['num_taxon']; |
| $resultat_json[$id]['taxon'] = $tab['num_taxon']; |
| $resultat_json[$id]['href'] = $this->ajouterHref('noms-vernaculaires', $tab['id']); |
| } |
| } |
| } |