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

merged 93_DbLog to stay up2date

Browse Source 
added version display

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2858 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes
2013-03-06 18:47:44 +00:00
parent 7ea41f000f
commit a9096ab391
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
www/frontend/FHEM/93_DbLog.pm
View File

@@ -396,6 +396,15 @@ DbLog_Connect($)
Log 3, "Connection to db $dbconn established";
$hash->{DBH}= $dbh;
if ($hash->{DBMODEL} eq "SQLITE") {
$dbh->do("PRAGMA temp_store=MEMORY");
$dbh->do("PRAGMA synchronous=NORMAL");
$dbh->do("PRAGMA journal_mode=WAL");
$dbh->do("CREATE TEMP TABLE IF NOT EXISTS current (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32))");
$dbh->do("CREATE TABLE IF NOT EXISTS history (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32))");
$dbh->do("CREATE INDEX IF NOT EXISTS Search_Idx ON `history` (DEVICE, READING, TIMESTAMP)");
}
# creating an own connection for the webfrontend, saved as DBHF in Hash
# this makes sure that the connection doesnt get lost due to other modules
my $dbhf = DBI->connect_cached("dbi:$dbconn", $dbuser, $dbpassword);
@@ -476,7 +485,7 @@ DbLog_Get($@)
my $to = shift @a; # Now @a contains the list of column_specs
my ($internal, @fld);
if(uc($outf) eq "INT") {
if($outf eq "INT") {
$outf = "-";
$internal = 1;
} elsif (uc($outf) eq "WEBCHART") {
@@ -1320,4 +1329,3 @@ sub chartQuery($@) {
=end html_DE
=cut