From be733a3d031a59be1bc868a9079f6efea7ecaf78 Mon Sep 17 00:00:00 2001
From: justme1968 <justme1968@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 5 Jan 2015 11:14:39 +0000
Subject: [PATCH] 33_readingsHistory.pm: enhanced mapping

git-svn-id: https://svn.fhem.de/fhem/trunk@7440 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/33_readingsHistory.pm | 44 +++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/33_readingsHistory.pm b/fhem/FHEM/33_readingsHistory.pm
index 3fb8da6fb..e06d76c9c 100644
--- a/fhem/FHEM/33_readingsHistory.pm
+++ b/fhem/FHEM/33_readingsHistory.pm
@@ -151,21 +151,36 @@ readingsHistory_lookup($$$$$$$$)
   my($mapping,$name,$alias,$reading,$value,$room,$group,$default) = @_;
 
   if( $mapping ) {
+    if( !ref($mapping) && $mapping =~ m/^{.*}$/) {
+      my $DEVICE = $name;
+      my $READING = $reading;
+      my $VALUE = $value;
+      my $m = eval $mapping;
+      if( $@ ) {
+        Log 2, $@ if( $@ );
+      } else {
+        $mapping = $m;
+      }
+    }
+
     if( ref($mapping) eq 'HASH' ) {
       $default = $mapping->{$name} if( defined($mapping->{$name}) );
       $default = $mapping->{$reading} if( defined($mapping->{$reading}) );
       $default = $mapping->{$name.".".$reading} if( defined($mapping->{$name.".".$reading}) );
       $default = $mapping->{$reading.".".$value} if( defined($mapping->{$reading.".".$value}) );
-    #} elsif( $mapping =~ m/^{.*}$/) {
-    #  my $DEVICE = $name;
-    #  my $READING = $reading;
-    #  my $VALUE = $value;
-    #  $mapping = eval $mapping;
-    #  $default = $mapping if( $mapping );
     } else {
       $default = $mapping;
     }
 
+    if( !ref($default) && $default =~ m/^{.*}$/) {
+      my $DEVICE = $name;
+      my $READING = $reading;
+      my $VALUE = $value;
+      $default = eval $default;
+      $default = "" if( $@ );
+      Log 2, $@ if( $@ );
+    }
+
     return $default if( !defined($default) );
 
     $default =~ s/\%ALIAS/$alias/g;
@@ -192,10 +207,22 @@ readingsHistory_lookup2($$$$)
 
   return $lookup if( !$lookup );
 
+  if( !ref($lookup) && $lookup =~ m/^{.*}$/) {
+    my $DEVICE = $name;
+    my $READING = $reading;
+    my $VALUE = $value;
+    my $l = eval $lookup;
+    if( $@ ) {
+      Log 2, $@ if( $@ );
+    } else {
+      $lookup = $l;
+    }
+  }
+
   if( ref($lookup) eq 'HASH' ) {
     my $vf = "";
-    $vf = $lookup->{$reading} if( exists($lookup->{$reading}) );
-    $vf = $lookup->{$name.".".$reading} if( exists($lookup->{$name.".".$reading}) );
+    $vf = $lookup->{$reading} if( defined($reading) && exists($lookup->{$reading}) );
+    $vf = $lookup->{$name.".".$reading} if( defined($reading) && exists($lookup->{$name.".".$reading}) );
     $vf = $lookup->{$reading.".".$value} if( defined($value) && exists($lookup->{$reading.".".$value}) );
     $lookup = $vf;
   }
@@ -206,6 +233,7 @@ readingsHistory_lookup2($$$$)
     my $VALUE = $value;
     $lookup = eval $lookup;
     $lookup = "" if( $@ );
+    Log 2, $@ if( $@ );
   }
 
   return $lookup if( !defined($lookup) );