Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 715 → Rev 716

/trunk/jrest/services/CelSyndicationImage.php
323,7 → 323,7
}
// Construction de la requête
$requete = (($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '.
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '.
' ci_id_image, ci_ce_utilisateur, ci_nom_original, ci_meta_date_ajout, ci_meta_mots_cles, ci_meta_comment, ci_note_image '.
'FROM cel_obs_images AS coi '.
'LEFT JOIN cel_inventory AS ci '.
332,7 → 332,7
'ON (coi.coi_ce_image = cim.ci_id_image AND coi.coi_ce_utilisateur = cim.ci_ce_utilisateur) '.
'WHERE ci.transmission = 1 '.
' AND ci.identifiant = cim.ci_ce_utilisateur '.
'ORDER BY '.((!is_null($this->orderby)) ? $this->orderby : 'ci_meta_date_ajout DESC').' '.
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'ci_meta_date_ajout DESC').' '.
"LIMIT $this->start, $this->limit ";
$elements = $this->executerRequete($requete);
456,6 → 456,7
}
private function creerSousRequeteMotsCles($mot_cle) {
$requete = '';
if (preg_match('/.*,.*/', $mot_cle)) {
$requete = $this->creerSousRequeteMotsClesOu($mot_cle);
} else if (preg_match('/.*ET.*/', $mot_cle)) {
464,7 → 465,7
// Construction de la requête
$prerequete = "SELECT cmc_id_mot_cle_utilisateur, cmc_id_proprietaire FROM cel_mots_cles_images WHERE $where ".
'cmc_id_mot_cle_general = '.$this->bdd->quote($this->encoderMotCle($mot_cle));
$elements = $this->executerRequete($prerequete);//print_r($elements);
$elements = $this->executerRequete($prerequete);
if ($elements != false && count($elements) > 0) {
foreach ($elements as $occurence) {
$requete .= '(ci_meta_mots_cles LIKE "%'.$occurence['cmc_id_mot_cle_utilisateur'].'%" AND ci_ce_utilisateur = '.
523,12 → 524,11
$elements = $this->executerRequete($prerequete);//print_r($elements);
if ($elements != false && count($elements) > 0) {
foreach ($elements as $occurence) {
$occurence['cmc_id_mot_cle_utilisateur'] = '';
$requete = ' (';
for ($j = 'a'; $j < $i; $j++) {
$occurence['cmc_id_mot_cle_utilisateur'] .= $occurence[$j].',';
$requete .= 'ci_meta_mots_cles like "%'.$occurence[$j].'%" AND ';
}
$requete .= '(ci_meta_mots_cles = "'.$occurence['cmc_id_mot_cle_utilisateur'].'" AND ci_ce_utilisateur = '.
$this->bdd->quote($occurence['cmc_id_proprietaire']).' ) OR ';
$requete .= ' ci_ce_utilisateur = '.$this->bdd->quote($occurence['cmc_id_proprietaire']).' ) OR ';
}
}
return $requete;