From 1c2d2939316f6ad7b505df6cf5d09b95c9cc1300 Mon Sep 17 00:00:00 2001
From: Lippie81 <46738685+Lippie81@users.noreply.github.com>
Date: Tue, 12 Mar 2019 21:07:58 +0100
Subject: [PATCH] Update 59_Weather.pm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Paramater 2 und 3 werden automatisch dem zugehörigen internen Parameter Anzahl oder daily/hourly zugeordnet.
Damit ist die Reihenfolge beim Aufruf frei wählbar und beide Parameter können beim Aufruf beliebig weggelassen werden.
---
 59_Weather.pm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/59_Weather.pm b/59_Weather.pm
index f9a8457..1de02f9 100755
--- a/59_Weather.pm
+++ b/59_Weather.pm
@@ -709,7 +709,11 @@ sub WeatherIconIMGTag($) {
 #####################################
 
 sub WeatherAsHtmlV($;$$) {
-    my ( $d, $f, $items ) = @_;
+    my ( $d, $op1, $op2 ) = @_;
+    my $items = $op2;
+    my $f = $op1;
+    if($op1 =~ /[0-9]/g){ $items = $op1; }
+    if($op2 =~ /[dh]/g){ $f = $op2; }
 
     $f =~ tr/dh/./cd;
     $f = "h" if ( !$f || length($f) > 1);
@@ -781,7 +785,11 @@ sub WeatherAsHtmlV($;$$) {
 }
 
 sub WeatherAsHtml($;$$) {
-    my ( $d, $f, $items ) = @_;
+    my ( $d, $op1, $op2 ) = @_;
+    my $items = $op2;
+    my $f = $op1;
+    if($op1 =~ /[0-9]/g){ $items = $op1; }
+    if($op2 =~ /[dh]/g){ $f = $op2; }
 
     $f =~ tr/dh/./cd;
     $f = "h" if ( !$f || length($f) > 1);
@@ -792,12 +800,11 @@ sub WeatherAsHtml($;$$) {
 }
 
 sub WeatherAsHtmlH($;$$) {
-    my ( $d, $f, $items ) = @_;
-
-    $f =~ tr/dh/./cd;
-    $f = "h" if ( !$f || length($f) > 1);
-    $items =~ tr/0-9/./cd;
-    $items = 6   if ( !$items );
+    my ( $d, $op1, $op2 ) = @_;
+    my $items = $op2;
+    my $f = $op1;
+    if($op1 =~ /[0-9]/g){ $items = $op1; }
+    if($op2 =~ /[dh]/g){ $f = $op2; }
     
     return "$d is not a Weather instance<br>"
       if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
@@ -884,7 +891,11 @@ sub WeatherAsHtmlH($;$$) {
 }
 
 sub WeatherAsHtmlD($;$$) {
-    my ( $d, $f, $items ) = @_;
+    my ( $d, $op1, $op2 ) = @_;
+    my $items = $op2;
+    my $f = $op1;
+    if($op1 =~ /[0-9]/g){ $items = $op1; }
+    if($op2 =~ /[dh]/g){ $f = $op2; }
 
     $f =~ tr/dh/./cd;
     $f = "h" if ( !$f || length($f) > 1);