mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configDB.pm: forum #42190

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9452 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2015-10-14 09:16:30 +00:00
parent 20f1c27db5
commit fd7bea0fe3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/configDB.pm
View File

@@ -1,4 +1,4 @@
# $Id: configDB.pm 7696 2015-01-24 18:16:54Z betateilchen $ # $Id$
############################################################################## ##############################################################################
# #
@@ -101,6 +101,8 @@
# #
# 2015-01-23 - added FileRead() caching - experimental # 2015-01-23 - added FileRead() caching - experimental
# #
# 2015-10-14 - changed search conditions use ESCAPE, forum #42190
#
############################################################################## ##############################################################################
# #
@@ -585,7 +587,7 @@ sub cfgDB_MigrationImport() {
# return SVN Id, called by fhem's CommandVersion # return SVN Id, called by fhem's CommandVersion
sub cfgDB_svnId() { sub cfgDB_svnId() {
return "# ".'$Id: configDB.pm 7696 2015-01-24 18:16:54Z betateilchen $' return "# ".'$Id$'
} }
# return filelist depending on directory and regexp # return filelist depending on directory and regexp
@@ -895,8 +897,11 @@ sub _cfgDB_Search($$;$) {
my ($sql, $sth, @line, $row, @result, $ret, $text); my ($sql, $sth, @line, $row, @result, $ret, $text);
$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%' ";
$sql .= "AND device like '$search%' " if($dsearch); # 2015-10-14 - changed, forum #42190
$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);
# $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();