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

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

Revision: 1292
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1292&view=rev
Author:   pfry
Date:     2013-01-03 20:49:16 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Bugfix betr. Listen in transmit

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

Modified: wiregate/plugin/generic/Logikprozessor.pl
===================================================================
--- wiregate/plugin/generic/Logikprozessor.pl	2013-01-03 20:35:06 UTC (rev 1291)
+++ wiregate/plugin/generic/Logikprozessor.pl	2013-01-03 20:49:16 UTC (rev 1292)
@@ -149,7 +149,7 @@
 	    {	
 		$transmit=[$transmit] unless ref $transmit;
 
-		for my $trm (@${transmit})
+		for my $trm (@{$transmit})
 		{
 		    $plugin_subscribe{$trm}{$plugname}=1;
 		    plugin_log($plugname, "\$logic{$t}: Transmit-GA $trm nicht in %eibgaconf gefunden") if $debug && !exists $eibgaconf{$trm};
@@ -206,11 +206,22 @@
 	    {	
 		$transmit=[$transmit] unless ref $transmit;
 
-		for my $trm (@${transmit})
+		for my $trm (@{$transmit})
 		{
 		    knx_write($trm, $result); # DPT aus eibga.conf		    
-		    plugin_log($plugname, "\$logic{$t}{transmit}(Logik) -> $trm:$result") if $debug;
 		}
+
+		if($debug)
+		{
+		    if(ref $logic{$t}{transmit})
+		    {
+			$retval.="\$logic{$t}{transmit}(Logik) -> [".join(",",@{$logic{$t}{transmit}})."]:$result";
+		    }
+		    else
+		    {
+			$retval.="\$logic{$t}{transmit}(Logik) -> ".$logic{$t}{transmit}.":$result gesendet ";
+		    }
+		}
 	    }
 	}
     }	    
@@ -366,11 +377,22 @@
 	{
 	    if(defined $result && defined $transmit)
 	    {
-		for my $trm (@${transmit})
+		for my $trm (@{$transmit})
 		{
 		    knx_write($trm, $result); # DPT aus eibga.conf		    
-		    $retval.="$msg{src} $ga:$in -> \$logic{$t}{receive}(Logik) -> $trm:$result gesendet " if $debug;
 		}
+
+		if($debug)
+		{
+		    if(ref $logic{$t}{transmit})
+		    {
+			$retval.="$msg{src} $ga:$in -> \$logic{$t}{receive}(Logik) -> [".join(",",@{$logic{$t}{transmit}})."]:$result gesendet ";
+		    }
+		    else
+		    {
+			$retval.="$msg{src} $ga:$in -> \$logic{$t}{receive}(Logik) -> ".$logic{$t}{transmit}.":$result gesendet ";
+		    }
+		}
 	    }
 
 	    # Cool-Periode starten
@@ -429,11 +451,22 @@
 	    {	
 		$transmit=[$transmit] unless ref $transmit;
 
-		for my $trm (@${transmit})
+		for my $trm (@{$transmit})
 		{
 		    knx_write($trm, $result); # DPT aus eibga.conf		    
-		    plugin_log($plugname, "\$logic{$t}{transmit}(Logik) -> $trm:$result") if $debug;
 		}
+
+		if($debug)
+		{
+		    if(ref $logic{$t}{transmit})
+		    {
+			$retval.="\$logic{$t}{transmit}(Logik) -> [".join(",",@{$logic{$t}{transmit}})."]:$result";
+		    }
+		    else
+		    {
+			$retval.="\$logic{$t}{transmit}(Logik) -> ".$logic{$t}{transmit}.":$result gesendet ";
+		    }
+		}
 	    }
 
 	    # Cool-Periode starten

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