From d60ed3959cb338b29d9b7545e30e9da715b69fee Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 23 Jul 2013 06:03:39 +0000
Subject: [PATCH] altitude added

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3480 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/99_SUNRISE_EL.pm |   7 ++-
 fhem/contrib/fhemupdate.pl | 114 ++++++++++---------------------------
 fhem/fhem.pl               |   4 +-
 3 files changed, 38 insertions(+), 87 deletions(-)

diff --git a/fhem/FHEM/99_SUNRISE_EL.pm b/fhem/FHEM/99_SUNRISE_EL.pm
index d8a2afacf..a5de9fcfe 100755
--- a/fhem/FHEM/99_SUNRISE_EL.pm
+++ b/fhem/FHEM/99_SUNRISE_EL.pm
@@ -451,7 +451,8 @@ isday</pre>
 
   <b>Get</b> <ul>N/A</ul><br>
 
-  <b>Attributes</b> <ul>
+  <b>Attributes</b><br>
+  <ul>
     <a name="latitude"></a>
     <li>latitude<br>
       If set, this latitude is used to calculate sunset/sunrise<br>
@@ -464,6 +465,10 @@ isday</pre>
         Notation need to be in decimal format (for example Berlin = 13.400)
         As default Frankfurt/Main, Germany (8.686) is used.
         </li><br>
+    <a name="altitude"></a>
+    <li>altitude<br>
+        Used by other modules.
+        </li><br>
     Note: these are global attributes, e.g.<br>
     <ul>
       attr global latitude 50.112<br>
diff --git a/fhem/contrib/fhemupdate.pl b/fhem/contrib/fhemupdate.pl
index 370e65d41..bad3565c2 100755
--- a/fhem/contrib/fhemupdate.pl
+++ b/fhem/contrib/fhemupdate.pl
@@ -4,6 +4,8 @@
 # This is quite a big mess here.
 
 use IO::File;
+use strict;
+use warnings;
 
 # Server-Side script to check out the fhem SVN repository, and upload the
 # changed files to the server
@@ -13,89 +15,17 @@ $ENV{CVS_RSH}="/usr/bin/ssh";
 print "\n\n";
 print localtime() . "\n";
 
-#my $homedir="/Users/rudi/Projects/fhem/fhemupdate";
 my $homedir="/home/rudi/fhemupdate";
-#goto NEWSTYLE;
 
 chdir("$homedir/culfw");
 system("svn update .");
 
 chdir("$homedir/fhem");
-system("mkdir -p fhemupdate");
 system("svn update .");
 die "SVN failed, exiting\n" if($?);
 
 `../copyfiles.sh`;
 
-#################################
-# Old style
-my @filelist = (
- "./fhem.pl.txt",
- "FHEM/.*.pm",
- "FHEM/FhemUtils/.*.pm",
- "FHEM/lib/.*.pm",
- "www/gplot/.*.gplot",
- "www/images/dark/.*.png",
- "www/images/default/.*.png",
- "www/images/smallscreen/.*.png",
- "www/pgm2/.*\.(js|css|svg)",
- "docs/commandref(_..)?.html",
- "docs/faq(_..)?.html",
- "docs/HOWTO(_..)?.html",
- "docs/fhem.*.png",
- "docs/.*.jpg",
- "../culfw/Devices/CUL/.*.hex",
- "./CHANGED",
-);
-
-# Read in the file timestamps
-my %filetime;
-my %filesize;
-my %filedir;
-foreach my $fspec (@filelist) {
-  $fspec =~ m,^(.+)/([^/]+)$,;
-  my ($dir,$pattern) = ($1, $2);
-
-  opendir DH, $dir || die("Can't open $dir: $!\n");
-  foreach my $file (grep { /$pattern/ && -f "$dir/$_" } readdir(DH)) {
-    my @st = stat("$dir/$file");
-    my @mt = localtime($st[9]);
-    $filetime{$file} = sprintf "%04d-%02d-%02d_%02d:%02d:%02d",
-                $mt[5]+1900, $mt[4]+1, $mt[3], $mt[2], $mt[1], $mt[0];
-    $filesize{$file} = $st[7];
-    $filedir{$file} = $dir;
-  }
-  closedir(DH);
-}
-
-my %oldtime;
-if(open FH, "fhemupdate/filetimes.txt") {
-  while(my $l = <FH>) {
-    chomp($l);
-    my ($ts, $fs, $file) = split(" ", $l, 3);
-    $oldtime{"$file.txt"} = $ts if($file eq "fhem.pl");
-    $oldtime{$file} = $ts;
-  }
-  close(FH);
-}
-
-chdir("$homedir/fhem/fhemupdate");
-open FH, ">filetimes.txt" || die "Can't open filetimes.txt: $!\n";
-my $cnt;
-foreach my $f (sort keys %filetime) {
-  my $fn = $f;
-  $fn =~ s/.txt$// if($fn =~ m/.pl.txt$/);
-  print FH "$filetime{$f} $filesize{$f} $fn\n";
-
-  my $newfname = $f;
-  if(!$oldtime{$f} || $oldtime{$f} ne $filetime{$f}) {
-    system("cp ../$filedir{$f}/$f $f");
-    $cnt++;
-  }
-}
-close FH;
-NEWSTYLE:
-
 for(my $loop = 0; $loop < 2; $loop++) {
   #################################
   # new Style
@@ -108,17 +38,31 @@ for(my $loop = 0; $loop < 2; $loop++) {
    "./CHANGED"                   => { type=>",fhem,", dir=>"." },
    "FHEM/.*.pm"                  => { type=>",fhem,", dir=>"FHEM" },
    "FHEM/FhemUtils/.*.pm"        => { type=>",fhem,", dir=>"FHEM/FhemUtils"},
+   "FHEM/FhemUtils/update-.*",   => { type=>",fhem,", dir=>"FHEM/FhemUtils"},
    "FHEM/lib/.*.pm"              => { type=>",fhem,", dir=>"FHEM/lib"},
+   "FHEM/lib/SWAP/.*.xml"        => { type=>",fhem,", dir=>"FHEM/lib/SWAP"},
+   "FHEM/lib/SWAP/panStamp/.*"   => { type=>",fhem,", dir=>"FHEM/lib/SWAP/panStamp"},
+   "FHEM/lib/SWAP/justme/.*"     => { type=>",fhem,", dir=>"FHEM/lib/SWAP/justme"},
+   "FHEM/lib/Device/.*.pm"       => { type=>",fhem,", dir=>"FHEM/lib/Device"},
+   "FHEM/lib/Device/Firmata/.*.pm"=>{ type=>",fhem,", dir=>"FHEM/lib/Device/Firmata"},
    "../culfw/Devices/CUL/.*.hex" => { type=>",fhem,", dir=>"FHEM",
                                                       dir3=>"FHEM", },
    "www/pgm2/.*"                 => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/jscolor/.*"              => { type=>"fhem,",  dir=>"www/pgm2"},
    "www/gplot/.*.gplot"          => { type=>"fhem,",  dir=>"www/pgm2"},
    "www/images/dark/.*.png"      => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/bright/.*.png"    => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/bright/.*.png"    => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/fhemSVG/.*.svg"   => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/openautomation/.*.svg" => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/openautomation/.*.txt" => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/darktouchpad/.*.png" => { type=>"fhem,",  dir=>"www/pgm2"},
    "www/images/default/.*"       => { type=>"fhem,",  dir=>"www/pgm2"},
+   "www/images/default/remotecontrol/.*" => { type=>"fhem,",  dir=>"www/pgm2"},
    "www/images/smallscreen/.*"   => { type=>"fhem,",  dir=>"www/pgm2"},
-   "docs/commandref(_..)?.html"      => { type=>"fhem,",  dir=>"www/pgm2"},
-   "docs/faq(_..)?.html"             => { type=>"fhem,",  dir=>"www/pgm2"},
-   "docs/HOWTO(_..)?.html"           => { type=>"fhem,",  dir=>"www/pgm2"},
+   "docs/commandref(_..)?.html"  => { type=>"fhem,",  dir=>"www/pgm2"},
+   "docs/faq(_..)?.html"         => { type=>"fhem,",  dir=>"www/pgm2"},
+   "docs/HOWTO(_..)?.html"       => { type=>"fhem,",  dir=>"www/pgm2"},
    "docs/fhem.*.png"             => { type=>"fhem,",  dir=>"www/pgm2"},
    "docs/.*.jpg"                 => { type=>"fhem,",  dir=>"www/pgm2"},
   );
@@ -210,21 +154,23 @@ chdir("$homedir/fhem");
 
 if(0) {
   my $fname="controls_fhem.txt";
-  `cp fhemupdate4/$fname fhemupdate`;
-  `cp fhemupdate4/$fname fhemupdate2/FHEM`;
-  `rm fhemupdate2/$fname`;
   my @st = stat("fhemupdate4/$fname");
   my @mt = localtime($st[9]);
   my $ftime = sprintf "%04d-%02d-%02d_%02d:%02d:%02d",
                     $mt[5]+1900, $mt[4]+1, $mt[3], $mt[2], $mt[1], $mt[0];
   my $fsize = $st[7];
-  system("echo $ftime $fsize $fname >> fhemupdate/filetimes.txt");
-  system("echo $ftime $fsize FHEM/$fname >> fhemupdate2/filetimes.txt");
 }
 
 my $rsyncopts="-a --delete --compress --verbose";
-system("rsync $rsyncopts fhemupdate fhem.de:fhem");
-system("rsync $rsyncopts fhemupdate2 fhem.de:fhem");
 system("rsync $rsyncopts fhemupdate4/. fhem.de:fhem/fhemupdate4/svn");
-system("scp docs/commandref.html docs/commandref_DE.html fhem.de:fhem");
-system("scp CHANGED fhem.de:fhem");
+if(-f "commandref_changed") {
+  system("scp docs/commandref.html docs/commandref_DE.html fhem.de:fhem");
+}
+system("scp CHANGED MAINTAINER.txt fhem.de:fhem");
+system("scp fhem.de:fhem/stats/data/fhem_statistics_db.sqlite ..");
+
+chdir("$homedir");
+system("sh mksvnlog.sh > SVNLOG");
+system("scp SVNLOG fhem.de:fhem");
+
+system("sourceforge/dorsync");
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 04e6b534a..43eb3dcd3 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -195,7 +195,7 @@ my $namedef =
   "- a regexp, if it contains one of the following characters: *[]^\$\n" .
   "- a range separated by dash (-)\n";
 my @cmdList;                    # Remaining commands in a chain. Used by sleep
-my $evalSpecials;               # Used by EvalSpecials->AnalyzeCommand parameter passing
+my $evalSpecials;       # Used by EvalSpecials->AnalyzeCommand parameter passing
 
 $init_done = 0;
 
@@ -205,7 +205,7 @@ $modules{Global}{AttrList} =
   "archivecmd apiversion archivedir configfile lastinclude logfile " .
   "modpath nrarchive pidfilename port statefile title userattr " .
   "verbose:1,2,3,4,5 mseclog:1,0 version nofork:1,0 logdir holiday2we " .
-  "autoload_undefined_devices:1,0 dupTimeout latitude longitude " .
+  "autoload_undefined_devices:1,0 dupTimeout latitude longitude altitude" .
   "backupcmd backupdir backupsymlink backup_before_update " .
   "exclude_from_update motd updatebranch uniqueID ".
   "sendStatistics:onUpdate,manually,never updateInBackground:1,0 ".