FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

configDB.pm: search enhancments reverted due to mysql failures

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9561 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-10-20 15:51:31 +00:00
parent 47b7b157de
commit 8c61548579
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/configDB.pm
View File

@ -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 = "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%' "; $sql .= "WHERE v.version = '$searchversion' AND command not like '#create%' ";
# 2015-10-14 - changed, forum #42190 # 2015-10-14 - changed, forum #42190
$sql .= "AND device like '$search%' ESCAPE '\\' " 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); # $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); # 2015-10-20 - reverted due to mysql failure
# $sql .= "AND (device like '$search%' OR P1 like '$search%' OR P2 like '$search%') " 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 .= "ORDER BY lower(device),command DESC"; $sql .= "ORDER BY lower(device),command DESC";
$sth = $fhem_dbh->prepare( $sql); $sth = $fhem_dbh->prepare( $sql);
$sth->execute(); $sth->execute();