[opencimetiere-Commits] r773 - trunk/app

[sof...@adullact.net]

Author: softime
Date: 2018-07-02 18:31:51 +0200 (Mon, 02 Jul 2018)
New Revision: 773

Modified:
trunk/app/search.class.php
Log:
* Correction de la recherche globale

Modified: trunk/app/search.class.php
===================================================================
--- trunk/app/search.class.php 2018-07-02 15:13:53 UTC (rev 772)
+++ trunk/app/search.class.php 2018-07-02 16:31:51 UTC (rev 773)
@@ -633,9 +633,9 @@
//// pgsql
if( OM_DB_PHPTYPE == "pgsql" ){
if(CHARSET=='UTF8')
- $requete .= " CAST(".$rech." AS CHAR(50)) £largeSearch '£recherche[".utf8_decode($cpt2)."]' "; // Translate accent / Cast
+ $requete .= " LOWER(CAST(".$rech." AS CHAR(50))) £largeSearch LOWER('£recherche[".utf8_decode($cpt2)."]') "; // Translate accent / Cast
else
- $requete .= " TRANSLATE(CAST(LOWER(".$rech."::varchar) AS CHAR(50)),'àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ','aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY') £largeSearch '£recherche[".$cpt2."]' "; // Translate accent / Cast
+ $requete .= " TRANSLATE(LOWER(CAST(".$rech." AS CHAR(50))),'àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ','aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY') £largeSearch LOWER('£recherche[".$cpt2."]') "; // Translate accent / Cast
}
}else{
if( $cpt2 <= 1){
@@ -666,7 +666,7 @@
$requete = str_replace('£largeSearch',"like",$requete);
}else{
if($largeSearch=="on" && !$entreDate){
- $requete = str_replace('£recherche['.$cpt2.']',"LOWER(%".$search."%::varchar)",$requete);
+ $requete = str_replace('£recherche['.$cpt2.']',"%".$search."%",$requete);
$requete = str_replace('£largeSearch',"like",$requete);
}else{
///// mysql