From 8c6154857978a58cdb98793c577166f77a4611b1 Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Tue, 20 Oct 2015 15:51:31 +0000 Subject: [PATCH] configDB.pm: search enhancments reverted due to mysql failures git-svn-id: https://svn.fhem.de/fhem/trunk@9561 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/configDB.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fhem/configDB.pm b/fhem/configDB.pm index e212f29c4..cba5cea38 100644 --- a/fhem/configDB.pm +++ b/fhem/configDB.pm @@ -898,10 +898,11 @@ sub _cfgDB_Search($$;$) { $sql = "SELECT command, device, p1, p2 FROM fhemconfig as c join fhemversions as v ON v.versionuuid=c.versionuuid "; $sql .= "WHERE v.version = '$searchversion' AND command not like '#create%' "; # 2015-10-14 - changed, forum #42190 - $sql .= "AND device like '$search%' ESCAPE '\\' " if($dsearch); - $sql .= "AND (device like '$search%' ESCAPE '\\' OR P1 like '$search%' ESCAPE '\\' OR P2 like '$search%' ESCAPE '\\') " if(!$dsearch); -# $sql .= "AND device like '$search%' " if($dsearch); -# $sql .= "AND (device like '$search%' OR P1 like '$search%' OR P2 like '$search%') " if(!$dsearch); +# $sql .= "AND device like '$search%' ESCAPE '\\' " if($dsearch); +# $sql .= "AND (device like '$search%' ESCAPE '\\' OR P1 like '$search%' ESCAPE '\\' OR P2 like '$search%' ESCAPE '\\') " if(!$dsearch); +# 2015-10-20 - reverted due to mysql failure + $sql .= "AND device like '$search%' " if($dsearch); + $sql .= "AND (device like '$search%' OR P1 like '$search%' OR P2 like '$search%') " if(!$dsearch); $sql .= "ORDER BY lower(device),command DESC"; $sth = $fhem_dbh->prepare( $sql); $sth->execute();