Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

RESIDENTStk: improve code robustness

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10378 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-01-06 15:48:18 +00:00
parent af58a94eda
commit d0803640ab
1 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fhem/FHEM/RESIDENTStk.pm
View File

@ -87,11 +87,26 @@ sub RESIDENTStk_wakeupSet($$) {
my $wakeupUserdeviceRealname = "Bewohner"; my $wakeupUserdeviceRealname = "Bewohner";
if (defined($defs{$wakeupUserdevice})) { if ( defined( $defs{$wakeupUserdevice} ) ) {
if ($defs{$wakeupUserdevice}{TYPE} eq "ROOMMATE") { if ( $defs{$wakeupUserdevice}{TYPE} eq "ROOMMATE" ) {
$wakeupUserdeviceRealname = AttrVal( AttrVal($NAME,"wakeupUserdevice",""), AttrVal( AttrVal($NAME,"wakeupUserdevice",""), "rr_realname", "group" ), $wakeupUserdeviceRealname ); $wakeupUserdeviceRealname = AttrVal(
} elsif ($defs{$wakeupUserdevice}{TYPE} eq "GUEST") { AttrVal( $NAME, "wakeupUserdevice", "" ),
$wakeupUserdeviceRealname = AttrVal( AttrVal($NAME,"wakeupUserdevice",""), AttrVal( AttrVal($NAME,"wakeupUserdevice",""), "rg_realname", "group" ), $wakeupUserdeviceRealname ); AttrVal(
AttrVal( $NAME, "wakeupUserdevice", "" ), "rr_realname",
"group"
),
$wakeupUserdeviceRealname
);
}
elsif ( $defs{$wakeupUserdevice}{TYPE} eq "GUEST" ) {
$wakeupUserdeviceRealname = AttrVal(
AttrVal( $NAME, "wakeupUserdevice", "" ),
AttrVal(
AttrVal( $NAME, "wakeupUserdevice", "" ), "rg_realname",
"group"
),
$wakeupUserdeviceRealname
);
} }
} }
@ -1553,6 +1568,13 @@ sub RESIDENTStk_wakeupGetNext($) {
sub RESIDENTStk_TimeDiff ($$;$) { sub RESIDENTStk_TimeDiff ($$;$) {
my ( $datetimeNow, $datetimeOld, $format ) = @_; my ( $datetimeNow, $datetimeOld, $format ) = @_;
if ( $datetimeNow eq "" || $datetimeOld eq "" ) {
Log3 $name, 5,
"RESIDENTStk $name: empty data: datetimeNow='$datetimeNow' datetimeOld='$datetimeOld'";
$datetimeNow = "1970-01-01 00:00:00";
$datetimeOld = "1970-01-01 00:00:00";
}
my $timestampNow = RESIDENTStk_Datetime2Timestamp($datetimeNow); my $timestampNow = RESIDENTStk_Datetime2Timestamp($datetimeNow);
my $timestampOld = RESIDENTStk_Datetime2Timestamp($datetimeOld); my $timestampOld = RESIDENTStk_Datetime2Timestamp($datetimeOld);
my $timeDiff = $timestampNow - $timestampOld; my $timeDiff = $timestampNow - $timestampOld;
@ -1571,14 +1593,29 @@ sub RESIDENTStk_TimeDiff ($$;$) {
sub RESIDENTStk_Datetime2Timestamp($) { sub RESIDENTStk_Datetime2Timestamp($) {
my ($datetime) = @_; my ($datetime) = @_;
my $timestamp;
my ( $date, $time, $y, $m, $d, $hour, $min, $sec, $timestamp ); if ( $datetime =~
/.*([0-9]{4})-([0-9]{1}|[0-9]{2})-([0-9]{1}|[0-9]{2}).([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}).*/
)
{
my ( $date, $time, $y, $m, $d, $hour, $min, $sec );
( $date, $time ) = split( ' ', $datetime ); $sec = $6;
( $y, $m, $d ) = split( '-', $date ); $min = $5;
( $hour, $min, $sec ) = split( ':', $time ); $hour = $4;
$m -= 01; $d = $3;
$m = $2;
$y = $1;
$m -= 01 if ( $m > 0 );
$timestamp = timelocal( $sec, $min, $hour, $d, $m, $y ); $timestamp = timelocal( $sec, $min, $hour, $d, $m, $y );
}
else {
Log3 $name, 5,
"RESIDENTStk $name: timestamp '$datetime' has wrong format.";
$timestamp = timelocal( "00", "00", "00", "01", "01", "1970" );
}
return $timestamp; return $timestamp;
} }