Subversion Repositories eFlore/Applications.cel

Rev

Rev 2446 | Rev 2462 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2446 Rev 2449
Line 329... Line 329...
329
		if (isset($this->parametres[0])) {
329
		if (isset($this->parametres[0])) {
330
			$this->format_image = $this->parametres[0];
330
			$this->format_image = $this->parametres[0];
331
		}
331
		}
Line 332... Line 332...
332
 
332
 
333
		// Construction de la requête
333
		// Construction de la requête
334
		$requete = 	(isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '.
334
		$requete = 	(isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' co.*, '.
335
			' cim.id_image, cim.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte AS mots_cles_texte_images, '.
335
			' ci.id_image, ci.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '.
336
			' ci.mots_cles_texte AS mots_cles_texte_images_obs, cim.commentaire, note_qualite, nom_referentiel '.
336
			' co.mots_cles_texte AS mots_cles_texte_images_obs, ci.commentaire, note_qualite, nom_referentiel '.
337
			'FROM cel_obs AS ci LEFT JOIN cel_images AS cim ON (ci.id_observation = cim.ce_observation) '.
337
			'FROM cel_obs AS co LEFT JOIN cel_images AS ci ON (co.id_observation = ci.ce_observation) '.
338
			'WHERE ci.transmission = 1 '.
338
			'WHERE co.transmission = 1 '.
339
			'	AND ci.ce_utilisateur = cim.ce_utilisateur '.
339
			'	AND co.ce_utilisateur = ci.ce_utilisateur '.
340
			'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby  : 'cim.date_creation DESC').' '.
340
			'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby  : 'ci.date_creation DESC').' '.
Line 341... Line 341...
341
			"LIMIT $this->start, $this->limit ";
341
			"LIMIT $this->start, $this->limit ";
Line 342... Line 342...
342
 
342
 
Line 364... Line 364...
364
	}
364
	}
Line 365... Line 365...
365
 
365
 
Line 366... Line 366...
366
	private function getServiceComplet() {
366
	private function getServiceComplet() {
367
 
367
 
368
		// Construction de la requête
368
		// Construction de la requête
369
		$requete = 	(isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '.
369
		$requete = 	(isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' co.*, '.
370
			'	cim.id_image, ci.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte AS mots_cles_texte_images, '.
370
			'	ci.id_image, co.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '.
371
			'	ci.mots_cles_texte AS mots_cles_texte_obs, cim.commentaire AS commentaire_img, note_qualite, nom_referentiel, '.
371
			'	co.mots_cles_texte AS mots_cles_texte_obs, ci.commentaire AS commentaire_img, note_qualite, nom_referentiel, '.
372
			'	ci.commentaire AS commentaire_obs '.
372
			'	co.commentaire AS commentaire_obs '.
373
			'FROM cel_images AS cim '.
373
			'FROM cel_images AS ci '.
374
			'	LEFT JOIN cel_obs AS ci '.
374
			'	LEFT JOIN cel_obs AS co '.
375
			'		ON (cim.ce_observation = ci.id_observation) '.
375
			'		ON (ci.ce_observation = co.id_observation) '.
376
			(($this->etreFluxAdmin()) ? '' : 'WHERE ci.transmission = 1 ').
376
			(($this->etreFluxAdmin()) ? '' : 'WHERE co.transmission = 1 ').
377
			'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby  : 'cim.date_creation DESC').' '.
377
			'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby  : 'ci.date_creation DESC').' '.
378
			"LIMIT $this->start, $this->limit ";
378
			"LIMIT $this->start, $this->limit ";
Line 379... Line 379...
379
		//echo $requete;
379
		//echo $requete;