From 52cfc28b7886a65be8ebf533625bc7cd32f9299b Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Wed, 17 Sep 2014 16:42:06 +0000
Subject: [PATCH] changed formating

git-svn-id: https://svn.fhem.de/fhem/trunk@6566 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/38_netatmo.pm | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm
index 527d29ccf..55d76c325 100644
--- a/fhem/FHEM/38_netatmo.pm
+++ b/fhem/FHEM/38_netatmo.pm
@@ -938,29 +938,21 @@ netatmo_Get($$@)
           $ret .= sprintf( "%s\t%.8f\t%.8f\t%i", $device->{_id},
                                                  $device->{place}->{location}->[0], $device->{place}->{location}->[1],
                                                  $device->{place}->{altitude} );
+          $ret .= "\t";
+
           my $addr .= netatmo_getAddress( $hash, 1, $device->{place}->{location}->[0], $device->{place}->{location}->[1] );
           next if( ref($device->{measures}) ne "HASH" );
-          my $ext;
-          foreach my $module ( keys %{$device->{measures}}) {
-            #next if( ref($device->{measures}->{$module}->{res}) ne "HASH" );
-            if( ref($device->{measures}->{$module}->{res}) ne "HASH" ) {
-              my $value = $device->{measures}->{$module}->{rain_60min};
-              if( defined($value) ) {
-                $ext .= "$module ";
-                $ext .= join(',', "rain");
-                $ext .= " ";
-                $ret .= sprintf( "\t%i mm", $value ) if( defined($value) );
-              }
 
-              next;
-            }
+          my $ext;
+          foreach my $module ( sort keys %{$device->{measures}}) {
+            next if( ref($device->{measures}->{$module}->{res}) ne "HASH" );
 
             $ext .= "$module ";
             $ext .= join(',', @{$device->{measures}->{$module}->{type}});
             $ext .= " ";
+
             foreach my $timestamp ( keys %{$device->{measures}->{$module}->{res}} ) {
               my $i = 0;
-              $ret .= "\t";
               foreach my $value ( @{$device->{measures}->{$module}->{res}->{$timestamp}} ) {
                 my $type = $device->{measures}->{$module}->{type}[$i];
 
@@ -979,8 +971,21 @@ netatmo_Get($$@)
               last;
             }
           }
+          my $got_rain = 0;
+          foreach my $module ( keys %{$device->{measures}}) {
+            my $value = $device->{measures}->{$module}->{rain_60min};
+            if( defined($value) ) {
+              $got_rain = 1;
+
+              $ext .= "$module ";
+              $ext .= join(',', "rain");
+              $ext .= " ";
+
+              $ret .= sprintf( "\t%i mm", $value ) if( defined($value) );
+            }
+          }
+          $ret .= "\t" if( !$got_rain );
 
-          #$ret .= "\n\t\t";
           $ret .= "\t$addr";
 
           $ret .= "\n\tdefine netatmo_P$device->{_id} netatmo PUBLIC $device->{_id} $ext" if( $station );