[Openautomation-svn] SF.net SVN: openautomation:[827] wiregate/plugin/generic/Logikprozessor.pl

[<pf...@us...>]

Revision: 827
          http://openautomation.svn.sourceforge.net/openautomation/?rev=827&view=rev
Author:   pfry
Date:     2012-05-17 20:56:56 +0000 (Thu, 17 May 2012)
Log Message:
-----------
kleiner Bugfix betr. Bereiche von Wochentagen

Modified Paths:
--------------
    wiregate/plugin/generic/Logikprozessor.pl

Modified: wiregate/plugin/generic/Logikprozessor.pl
===================================================================
--- wiregate/plugin/generic/Logikprozessor.pl	2012-05-17 20:48:03 UTC (rev 826)
+++ wiregate/plugin/generic/Logikprozessor.pl	2012-05-17 20:56:56 UTC (rev 827)
@@ -501,8 +501,15 @@
 	    }
 
 	    $s->{$k}=[$s->{$k}] unless ref $s->{$k} eq 'ARRAY'; # alle Kategorien in Listenform
-	    map $_=$weekday{$_}, @{$s->{$k}} if $k eq 'day_of_week'; # Wochentage in Zahlenform
 
+	    if($k eq 'day_of_week')
+	    {
+		for my $wd (sort { length($b) cmp length($a) } keys %weekday)
+		{
+		    foreach (@{$s->{$k}}) { s/$wd/$weekday{$wd}/gie } # Wochentage in Zahlenform
+		}
+	    }
+
 	    # Expandieren von Bereichen, z.B. month=>'3-5'
 	    if($k ne 'time' && grep /\-/, @{$s->{$k}}) 
 	    {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.