FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

55_GDS.pm: minor bugfix, use os-based unzip

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11609 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2016-06-04 12:25:06 +00:00
parent f45c6895d3
commit 7fb6a58112
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/contrib/GDS/55_GDS.pm
View File

@ -38,7 +38,7 @@ use warnings;
use feature qw/switch/;
use Blocking;
use Archive::Extract;
#use Archive::Extract;
use Net::FTP;
use XML::Simple;
@ -1016,7 +1016,7 @@ sub decodeCAPData($$$){
while(($k, $v) = each %readings){
# skip update if no valid data is available
next unless(defined($v));
readingsBulkUpdate($hash, $k, latin1ToUtf8($v));
readingsSingleUpdate($hash, $k, latin1ToUtf8($v),1);
}
# convert color value to hex
@ -1212,23 +1212,7 @@ sub _retrieveCAPDATA {
}
# unzip
my $zip;
eval {
$Archive::Extract::PREFER_BIN = 1;
$Archive::Extract::WARN = 0;
$zip = Archive::Extract->new( archive => $targetFile, type => 'zip' );
my $ok = $zip->extract( to => $targetDir );
Log3($name, 5, "GDS $name: error ".$zip->error()) unless $ok;
};
# my $zip;
# eval {
# $zip = Archive::Zip->new($targetFile);
# foreach my $member ($zip->members()) {
# my $fileName = $member->fileName();
# $zip->extractMember($member,$targetDir."/".$fileName) == AZ_OK || Debug "unzip error: $member";
# }
# };
qx(unzip -o $targetFile -d $targetDir);
# merge
my ($countInfo,$cF) = _mergeCapFile($hash);
@ -1736,6 +1720,8 @@ sub getListForecastStations($) {
#
###################################################################################################
#
# 2016-06-05 changed use os based unzip for decoding capdata
#
# 2016-03-29 changed remove all conditions code
#
# 2016-01-27 changed use setKeyValue/getKeyValue for username and password