From 349ba5d67fa86b7c86dcffc20efb0d6945aa13ac Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 9 Apr 2014 16:12:49 +0000
Subject: [PATCH] fhem.pl: userreading name may contain -

git-svn-id: https://svn.fhem.de/fhem/trunk@5498 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/docs/commandref_frame.html    | 58 ++++++++++++++++--------------
 fhem/docs/commandref_frame_DE.html | 10 ++++--
 fhem/fhem.pl                       |  2 +-
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/fhem/docs/commandref_frame.html b/fhem/docs/commandref_frame.html
index 8758fc069..dd5e9d8b1 100644
--- a/fhem/docs/commandref_frame.html
+++ b/fhem/docs/commandref_frame.html
@@ -469,32 +469,38 @@ A line ending with \ will be concatenated with the next one, so long lines
           energy1:counters.A { ReadingsVal("myMultiMeter","counters.A",0)/1250.0;; },
           energy2:counters.B { ReadingsVal("myMultiMeter","counters.B",0)/1250.0;; }
       </code></ul>
-    <code>&lt;modifier&gt;</code> can take one of these values:
-    <ul>
-      <li>none: the same as it would not have been given at all.</li>
-      <li>difference: the reading is set to the difference between the current
-          and the previously evaluated value.</li>
-      <li>differential: the reading is set to the difference between the
-          current and the previously evaluated value divided by the time in
-          seconds between the current and the previous evaluation. Granularity
-          of time is one second. No value is calculated if the time past is
-          below one second.  Useful to calculate rates.</li>
-      <li>offset: if the current evaluated value is smaler than the previously
-          evaluated value the reading is incremented by the previous value.
-          the reading can then be used as an offset correct for a counter that
-          is reset for example due to a power loss.</li>
-      <li>monotonic: if the difference between the current and the previously
-          evaluated value is positive the reading is incremented by this difference.
-          this allows to derive a monotonic growing counter from an original counter
-          even if the original will be rest by a power loss</li>
-    </ul>
-    Example:<br>
-    <ul><code>attr myPowerMeter userReadings power 
-      differential { ReadingsVal("myPowerMeter","counters.A",0)/1250.0;; }
-    </code></ul>
-    Note: user readings with modifiers difference and differential store the
-    calculated values internally. The user reading is set earliest at the
-    second evaluation. Beware of stale values when changing definitions!
+      <code>&lt;modifier&gt;</code> can take one of these values:
+      <ul>
+        <li>none: the same as it would not have been given at all.</li>
+        <li>difference: the reading is set to the difference between the current
+            and the previously evaluated value.</li>
+        <li>differential: the reading is set to the difference between the
+            current and the previously evaluated value divided by the time in
+            seconds between the current and the previous evaluation. Granularity
+            of time is one second. No value is calculated if the time past is
+            below one second.  Useful to calculate rates.</li>
+        <li>offset: if the current evaluated value is smaler than the previously
+            evaluated value the reading is incremented by the previous value.
+            the reading can then be used as an offset correct for a counter that
+            is reset for example due to a power loss.</li>
+        <li>monotonic: if the difference between the current and the previously
+            evaluated value is positive the reading is incremented by this difference.
+            this allows to derive a monotonic growing counter from an original counter
+            even if the original will be rest by a power loss</li>
+      </ul>
+      Example:<br>
+      <ul><code>attr myPowerMeter userReadings power 
+        differential { ReadingsVal("myPowerMeter","counters.A",0)/1250.0;; }
+      </code></ul>
+      Notes:
+      <ul>
+        <li>user readings with modifiers difference and differential store the
+        calculated values internally. The user reading is set earliest at the
+        second evaluation. Beware of stale values when changing
+        definitions!</li>
+      <li>the name of the defined Readings consists of alphanumeric characters
+        with underscore (_) and the minus (-) sign.</li>
+      </ul>
     </li><br>
     </ul>
   <br>
diff --git a/fhem/docs/commandref_frame_DE.html b/fhem/docs/commandref_frame_DE.html
index 658828881..bc156b6a6 100644
--- a/fhem/docs/commandref_frame_DE.html
+++ b/fhem/docs/commandref_frame_DE.html
@@ -508,9 +508,13 @@ Zeilen erstreckende Befehle, indem man keine \ am Zeilenende eingeben muss.</p>
       attr myPowerMeter userReadings power differential
         { ReadingsVal("myPowerMeter","counters.A",0)/1250.0}
     </code></ul>
-    Achtung: Falls difference oder differential spezifiziert ist, dann werden
-    f&uuml;r die Berechnung &auml;ltere Werte ben&ouml;tigt, d.h. der Wert wird
-    fr&uuml;hestens beim zweiten &Auml;nderung gesetzt.
+    Achtung:<ul>
+      <li>Falls difference oder differential spezifiziert ist, dann werden
+        f&uuml;r die Berechnung &auml;ltere Werte ben&ouml;tigt, d.h. der Wert
+        wird fr&uuml;hestens beim zweiten &Auml;nderung gesetzt.</li>
+      <li>der Name der definierten Readings besteht aus alphanumerischen
+        Zeichen, Unterstrich (_) und Minus-Zeichen (-).</li>
+      </ul>
     </li><br>
 
 
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index f20e53d4e..8d23e6cd6 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -2166,7 +2166,7 @@ CommandAttr($$)
       my $arg= $a[2];
 
       # matches myReading1[:trigger2] { codecode1 }
-      my $regexi= '\s*(\w+)(:\S*)?\s+((\w+)\s+)?({.*?})\s*';
+      my $regexi= '\s*([\w-]+)(:\S*)?\s+((\w+)\s+)?({.*?})\s*';
       my $regexo= '^(' . $regexi . ')(,\s*(.*))*$';
 
       #Log 1, "arg is $arg";