Subversion Repositories eFlore/Applications.coel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1760 → Rev 1761

/branches/v1.3-muller-thurgau/jrest/services/CoelRecherche.php
369,13 → 369,17
$where[] = "ccb_ce_truk_type IN ({$p['bot']})";
}
if (isset($p['lieu-stockage'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv ON cmlv.cmlv_id_valeur = cs_ce_truk_pays';
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv2 ON cmlv2.cmlv_id_valeur = cs_ce_truk_region';
$where[] = '(' . implode(' OR ', array(
"cs_adresse_01 LIKE {$p['lieu-stockage']}",
"cs_adresse_02 LIKE {$p['lieu-stockage']}",
"cs_code_postal LIKE {$p['lieu-stockage']}",
"cs_ville LIKE {$p['lieu-stockage']}",
"cs_ce_truk_region LIKE {$p['lieu-stockage']}", // @TODO joindre la table meta
"cs_ce_truk_pays LIKE {$p['lieu-stockage']}"
"cs_ce_truk_region LIKE {$p['lieu-stockage']}",
"cs_ce_truk_pays LIKE {$p['lieu-stockage']}",
"cmlv.cmlv_nom LIKE {$p['lieu-stockage']}",
"cmlv2.cmlv_nom LIKE {$p['lieu-stockage']}"
)) . ')';
}
if (isset($p['zg'])) {
460,6 → 464,8
$where[] = "cp_nom LIKE {$p['nom-famille']}";
}
if (isset($p['adresse'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv ON cmlv.cmlv_id_valeur = cp_ce_truk_pays';
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv2 ON cmlv2.cmlv_id_valeur = cp_ce_truk_region';
$where[] = '(' . implode(' OR ', array(
"cp_adresse_01 LIKE {$p['adresse']}",
"cp_adresse_02 LIKE {$p['adresse']}",
466,13 → 472,19
"cp_code_postal LIKE {$p['adresse']}",
"cp_ville LIKE {$p['adresse']}",
"cp_ce_truk_pays LIKE {$p['adresse']}",
"cp_ce_truk_region LIKE {$p['adresse']}",
"cp_naissance_lieu LIKE {$p['adresse']}",
"cp_deces_lieu LIKE {$p['adresse']}"
"cp_deces_lieu LIKE {$p['adresse']}",
"cmlv.cmlv_nom LIKE {$p['adresse']}",
"cmlv2.cmlv_nom LIKE {$p['adresse']}"
)) . ')';
}
if (isset($p['date-vivant'])) {
$where[] = "cp_naissance_date <= {$p['date-vivant']}";
$where[] = "(cp_deces_date IS NULL OR cp_deces_date >= {$p['date-vivant']})";
$where[] = "cp_deces_date >= {$p['date-vivant']}";
$where[] = "cp_naissance_date IS NOT NULL";
$where[] = "cp_deces_date IS NOT NULL";
//$where[] = "(cp_deces_date IS NULL OR cp_deces_date >= {$p['date-vivant']})";
}
 
// pour inclure éventuellement les adresses de la structure
/branches/v1.3-muller-thurgau/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r1758-1760