From 2e5007c5922a69fd4de87ed2bdfa9a7d71ff47ef Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Thu, 12 Apr 2018 19:22:50 +0000
Subject: [PATCH] 93_DbRep: 7.15.2, Internal MODEL is set, minor fixes

git-svn-id: https://svn.fhem.de/fhem/trunk@16595 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED          |  1 +
 fhem/FHEM/93_DbRep.pm | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index ddeead8c2..202b2bbcd 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - bugfix:  93_DbRep: 7.15.2, Internal MODEL is set, minor fixes
   - change:  93_DbRep: 7.15.1, sqlCmd accept widget textField-long,
                                Internal MODEL is set
   - feature: 72_FB_CALLMONITOR: new attribute "sendKeepAlive" to send cyclic
diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm
index 6c9a40f0a..30f61a9cd 100644
--- a/fhem/FHEM/93_DbRep.pm
+++ b/fhem/FHEM/93_DbRep.pm
@@ -36,7 +36,8 @@
 #
 ###########################################################################################################################
 #  Versions History:
-# 
+#
+# 7.15.2       12.04.2018       fix in setting MODEL, prevent fhem from crash if wrong timestamp "0000-00-00" found in db 
 # 7.15.1       11.04.2018       sqlCmd accept widget textField-long, Internal MODEL is set
 # 7.15.0       24.03.2018       new command sqlSpecial
 # 7.14.8       21.03.2018       fix no save into database if value=0 (DbRep_OutputWriteToDB) 
@@ -333,7 +334,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 sub DbRep_Main($$;$);
 sub DbLog_cutCol($$$$$$$);           # DbLog-Funktion nutzen um Daten auf maximale Länge beschneiden
 
-my $DbRepVersion = "7.15.1";
+my $DbRepVersion = "7.15.2";
 
 my %dbrep_col = ("DEVICE"  => 64,
                  "TYPE"    => 64,
@@ -433,6 +434,7 @@ sub DbRep_Define($@) {
   
   $hash->{LASTCMD}             = " ";
   $hash->{ROLE}                = AttrVal($name, "role", "Client");
+  $hash->{MODEL}               = $hash->{ROLE};
   $hash->{HELPER}{DBLOGDEVICE} = $a[2];
   $hash->{VERSION}             = $DbRepVersion;
   $hash->{NOTIFYDEV}           = "global,".$name;                     # nur Events dieser Devices an DbRep_Notify weiterleiten 
@@ -1602,6 +1604,11 @@ sub DbRep_createTimeArray($$$) {
  #  absolute Auswertungszeiträume statische und dynamische (Beginn / Ende) berechnen 
  ######################################################################################
  
+ if($hash->{HELPER}{MINTS} && $hash->{HELPER}{MINTS} =~ m/0000-00-00/) {
+     Log3 ($name, 1, "DbRep $name - ERROR - wrong timestamp \"$hash->{HELPER}{MINTS}\" found in database. Please delete it !");
+     delete $hash->{HELPER}{MINTS};
+ }
+ 
  my $mints = $hash->{HELPER}{MINTS}?$hash->{HELPER}{MINTS}:"1970-01-01 01:00:00";  # Timestamp des 1. Datensatzes verwenden falls ermittelt
  $tsbegin = AttrVal($name, "timestamp_begin", $mints);
  $tsbegin = DbRep_formatpicker($tsbegin);