Subversion Repositories eFlore/Applications.cel

Rev

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

Rev 3672 Rev 3673
Line 452... Line 452...
452
		    ' b.commentaire as commentaire_obs, "" as commentaire_img, nom_referentiel '.
452
		    ' b.commentaire as commentaire_obs, "" as commentaire_img, nom_referentiel '.
453
			'FROM cel_images_export AS c '.
453
			'FROM cel_images_export AS c '.
454
			'	JOIN cel_export_total AS b '.
454
			'	JOIN cel_export_total AS b '.
455
			'		ON (c.ce_observation = b.id_observation) '.
455
			'		ON (c.ce_observation = b.id_observation) '.
456
			'WHERE '.
456
			'WHERE '.
457
			(($this->etreFluxAdmin()) ? '' : ' AND b.transmission = 1 ').
457
			(($this->etreFluxAdmin()) ? '' : ' b.transmission = 1 ').
458
			'	AND ';
458
			'	AND ';
Line 459... Line 459...
459
 
459
 
460
		if ($this->estUneRechercheGenerale()) {
460
		if ($this->estUneRechercheGenerale()) {
461
			$chaine_requete = $_GET['recherche'];
461
			$chaine_requete = $_GET['recherche'];
462
			$requete .= "donnees_standard =  1 AND ".$this->creerSousRequeteRechercheGenerale($chaine_requete);
462
			$requete .= "donnees_standard =  1 AND ".$this->creerSousRequeteRechercheGenerale($chaine_requete);
463
		} else {
463
		} else {
-
 
464
			$criteres = $this->traiterCriteresMultiples($_GET) ;
-
 
465
			if (!isset($_GET["standard"])) {
-
 
466
			    $requete .= "donnees_standard =  1 AND ";
464
			$criteres = $this->traiterCriteresMultiples($_GET) ;
467
			}
465
			if (!empty($criteres)) {
468
			if (!empty($criteres)) {
466
				$requete .= $this->creerSousRequeteRechercheParCriteres($criteres);
469
				$requete .= $this->creerSousRequeteRechercheParCriteres($criteres);
467
			}
470
			}
468
		}
471
		}