mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-05 08:20:23 +00:00
75_msgConfig: add cleanReadings get function
git-svn-id: https://svn.fhem.de/fhem/trunk@9783 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski
parent
30c35505cc
commit
6637524817
@ -1848,9 +1848,14 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
|
|||||||
|
|
||||||
$msgSent = 1 if ($error == 0);
|
$msgSent = 1 if ($error == 0);
|
||||||
$msgSentDev = 1 if ($error == 0);
|
$msgSentDev = 1 if ($error == 0);
|
||||||
|
if ($subRecipient ne "") {
|
||||||
|
$gatewaysStatus{"$gatewayDev:$subRecipient"} = $routeStatus if ($globalDevName ne $gatewayDev);
|
||||||
|
$gatewaysStatus{"$device:$subRecipient"} = $routeStatus if ($globalDevName eq $gatewayDev);
|
||||||
|
} else {
|
||||||
$gatewaysStatus{$gatewayDev} = $routeStatus if ($globalDevName ne $gatewayDev);
|
$gatewaysStatus{$gatewayDev} = $routeStatus if ($globalDevName ne $gatewayDev);
|
||||||
$gatewaysStatus{$device} = $routeStatus if ($globalDevName eq $gatewayDev);
|
$gatewaysStatus{$device} = $routeStatus if ($globalDevName eq $gatewayDev);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
elsif ($routeStatus eq "UNAVAILABLE"
|
elsif ($routeStatus eq "UNAVAILABLE"
|
||||||
|| $routeStatus eq "UNDEFINED" )
|
|| $routeStatus eq "UNDEFINED" )
|
||||||
{
|
{
|
||||||
|
|||||||
@ -70,16 +70,16 @@ sub msgConfig_Initialize($) {
|
|||||||
msgCmdScreen
|
msgCmdScreen
|
||||||
msgCmdScreenHigh
|
msgCmdScreenHigh
|
||||||
msgCmdScreenLow
|
msgCmdScreenLow
|
||||||
msgFwPrioAbsentAudio
|
msgFwPrioAbsentAudio:-2,-1,0,1,2
|
||||||
msgFwPrioAbsentLight
|
msgFwPrioAbsentLight:-2,-1,0,1,2
|
||||||
msgFwPrioAbsentScreen
|
msgFwPrioAbsentScreen:-2,-1,0,1,2
|
||||||
msgFwPrioEmergencyAudio
|
msgFwPrioEmergencyAudio:-2,-1,0,1,2
|
||||||
msgFwPrioEmergencyLight
|
msgFwPrioEmergencyLight:-2,-1,0,1,2
|
||||||
msgFwPrioEmergencyPush
|
msgFwPrioEmergencyPush:-2,-1,0,1,2
|
||||||
msgFwPrioEmergencyScreen
|
msgFwPrioEmergencyScreen:-2,-1,0,1,2
|
||||||
msgFwPrioGoneAudio
|
msgFwPrioGoneAudio:-2,-1,0,1,2
|
||||||
msgFwPrioGoneLight
|
msgFwPrioGoneLight:-2,-1,0,1,2
|
||||||
msgFwPrioGoneScreen
|
msgFwPrioGoneScreen:-2,-1,0,1,2
|
||||||
msgLocationDevs
|
msgLocationDevs
|
||||||
msgPriorityAudio:-2,-1,0,1,2
|
msgPriorityAudio:-2,-1,0,1,2
|
||||||
msgPriorityLight:-2,-1,0,1,2
|
msgPriorityLight:-2,-1,0,1,2
|
||||||
@ -192,10 +192,18 @@ sub msgConfig_Get($@) {
|
|||||||
|
|
||||||
$what = $a[1];
|
$what = $a[1];
|
||||||
|
|
||||||
if ( lc($what) eq "routecmd" ) {
|
# cleanReadings
|
||||||
|
if ( lc($what) eq "cleanreadings" ) {
|
||||||
|
my $device = defined($a[2]) ? $a[2] : ".*";
|
||||||
|
|
||||||
|
return fhem ("deletereading $device fhemMsg.*");
|
||||||
|
}
|
||||||
|
|
||||||
|
# routeCmd
|
||||||
|
elsif ( lc($what) eq "routecmd" ) {
|
||||||
my $return = "";
|
my $return = "";
|
||||||
my $msgTypesReq = defined($a[2]) ? lc($a[2]) : join( ',', @msgTypes );
|
my $msgTypesReq = defined($a[2]) ? lc($a[2]) : join( ',', @msgTypes );
|
||||||
my $devicesReq = defined($a[3]) ? $a[3] : "";
|
my $devicesReq = defined($a[3]) ? $a[3] : $name;
|
||||||
my $cmdSchema = msgSchema::get();
|
my $cmdSchema = msgSchema::get();
|
||||||
my $UserDeviceTypes = "";
|
my $UserDeviceTypes = "";
|
||||||
|
|
||||||
@ -205,12 +213,10 @@ sub msgConfig_Get($@) {
|
|||||||
if ($devicesReq ne "") {
|
if ($devicesReq ne "") {
|
||||||
foreach my $device (split( /,/, $devicesReq )) {
|
foreach my $device (split( /,/, $devicesReq )) {
|
||||||
if (defined($defs{$device})) {
|
if (defined($defs{$device})) {
|
||||||
$return .= "USER DEFINED COMMANDS FOR MESSAGE TYPE '".uc($msgType)."'\n-------------------------------------------------------------------------------\n\n";
|
$UserDeviceTypes .= ",".$defs{$device}{TYPE} if ($UserDeviceTypes ne "" && $msgType ne "mail" && $device ne $name);
|
||||||
$return .= " $device (DEVICE TYPE: ".$defs{$device}{TYPE}.")\n";
|
$UserDeviceTypes = $defs{$device}{TYPE} if ($UserDeviceTypes eq "" && $msgType ne "mail" && $device ne $name);
|
||||||
$UserDeviceTypes .= ",".$defs{$device}{TYPE} if ($UserDeviceTypes ne "" && $msgType ne "mail");
|
$UserDeviceTypes .= ",fhemMsgMail" if ($UserDeviceTypes ne "" && $msgType eq "mail" && $device ne $name);
|
||||||
$UserDeviceTypes = $defs{$device}{TYPE} if ($UserDeviceTypes eq "" && $msgType ne "mail");
|
$UserDeviceTypes = "fhemMsgMail" if ($UserDeviceTypes eq "" && $msgType eq "mail" && $device ne $name);
|
||||||
$UserDeviceTypes .= ",fhemMsgMail" if ($UserDeviceTypes ne "" && $msgType eq "mail");
|
|
||||||
$UserDeviceTypes = "fhemMsgMail" if ($UserDeviceTypes eq "" && $msgType eq "mail");
|
|
||||||
|
|
||||||
my $typeUc = ucfirst($msgType);
|
my $typeUc = ucfirst($msgType);
|
||||||
|
|
||||||
@ -218,6 +224,7 @@ sub msgConfig_Get($@) {
|
|||||||
@priorities = ("Normal", "ShortPrio", "Short") if ($msgType eq "audio");
|
@priorities = ("Normal", "ShortPrio", "Short") if ($msgType eq "audio");
|
||||||
@priorities = ("Normal", "High", "Low") if ($msgType ne "audio");
|
@priorities = ("Normal", "High", "Low") if ($msgType ne "audio");
|
||||||
|
|
||||||
|
my $output = 0;
|
||||||
foreach my $prio (@priorities) {
|
foreach my $prio (@priorities) {
|
||||||
my $priorityCat;
|
my $priorityCat;
|
||||||
$priorityCat = $prio if ($prio ne "Normal");
|
$priorityCat = $prio if ($prio ne "Normal");
|
||||||
@ -273,8 +280,13 @@ sub msgConfig_Get($@) {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
next if ($cmd eq "" && $device eq $name && $output == 0);
|
||||||
|
$return .= uc($msgType).": USER DEFINED COMMANDS WITH PRECEDENCE\n-------------------------------------------------------------------------------\n\n" if ($output == 0);
|
||||||
|
$return .= " $device (DEVICE TYPE: ".$defs{$device}{TYPE}.")\n" if ($output == 0);
|
||||||
|
$output = 1 if ($output == 0);
|
||||||
|
|
||||||
$return .= " Priority $prio:\n $cmd\n" if ($cmd ne "");
|
$return .= " Priority $prio:\n $cmd\n" if ($cmd ne "");
|
||||||
$return .= " Priority $prio:\n [DEFAULT]\n" if ($cmd eq "");
|
$return .= " Priority $prio:\n [DEFAULT COMMAND]\n" if ($cmd eq "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -291,7 +303,7 @@ sub msgConfig_Get($@) {
|
|||||||
|
|
||||||
my $deviceTypes = $devicesReq;
|
my $deviceTypes = $devicesReq;
|
||||||
$deviceTypes = join(',', keys $cmdSchema->{$msgType})
|
$deviceTypes = join(',', keys $cmdSchema->{$msgType})
|
||||||
if ($deviceTypes eq "");
|
if ($deviceTypes eq "" || $devicesReq eq $name);
|
||||||
$deviceTypes = $UserDeviceTypes
|
$deviceTypes = $UserDeviceTypes
|
||||||
if ($UserDeviceTypes ne "");
|
if ($UserDeviceTypes ne "");
|
||||||
|
|
||||||
@ -299,7 +311,7 @@ sub msgConfig_Get($@) {
|
|||||||
foreach my $deviceType (split( /,/, $deviceTypes )) {
|
foreach my $deviceType (split( /,/, $deviceTypes )) {
|
||||||
|
|
||||||
if (defined($cmdSchema->{$msgType}{$deviceType})) {
|
if (defined($cmdSchema->{$msgType}{$deviceType})) {
|
||||||
$return .= "DEFAULT COMMANDS FOR MESSAGE TYPE '".uc($msgType)."'\n-------------------------------------------------------------------------------\n\n"
|
$return .= uc($msgType).": DEFAULT COMMANDS\n-------------------------------------------------------------------------------\n\n"
|
||||||
if ($outout == 0);
|
if ($outout == 0);
|
||||||
$outout = 1;
|
$outout = 1;
|
||||||
$return .= " $deviceType\n";
|
$return .= " $deviceType\n";
|
||||||
@ -330,19 +342,20 @@ sub msgConfig_Get($@) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$return .= "Unknown messaging type $msgType.\n";
|
$return .= "Unknown messaging type '$msgType'\n" if ($msgType ne "text");
|
||||||
|
$return .= "Messaging type 'text' does not have dedicated routing commands. This is a wrapper type to dynamically distinguish between push and mail.\n" if ($msgType eq "text");
|
||||||
}
|
}
|
||||||
|
|
||||||
$return .= "\n" if ($return ne "");
|
$return .= "\n" if ($return ne "");
|
||||||
}
|
}
|
||||||
|
|
||||||
$return = "Non-existing device or module name: $devicesReq" if ($return eq "");
|
$return = "Non-existing device or unknown module messaging schema definition: $devicesReq" if ($return eq "");
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
else {
|
else {
|
||||||
return
|
return
|
||||||
"Unknown argument $what, choose one of routeCmd:,audio,light,mail,push,screen";
|
"Unknown argument $what, choose one of routeCmd:,audio,light,mail,push,screen cleanReadings";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user