Author: locilka Date: Thu Jun 16 09:46:43 2011 New Revision: 64387 URL: http://svn.opensuse.org/viewcvs/yast?rev=64387&view=rev Log: - Fixed 'do not use switch/case' error by replacing with 'given/when' (BNC #695698) - Partly fixed indentation in YaPI/HTTPD.pm - 2.21.1 Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=64387&r1=64386&r2=64387&view=diff ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Thu Jun 16 09:46:43 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=64387&r1=64386&r2=64387&view=diff ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Jun 16 09:46:43 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jun 16 09:43:37 CEST 2011 - locilka@suse.cz + +- Fixed 'do not use switch/case' error by replacing with + 'given/when' (BNC #695698) +- Partly fixed indentation in YaPI/HTTPD.pm +- 2.21.1 + +------------------------------------------------------------------- Fri Feb 25 13:53:54 CET 2011 - jsrain@suse.cz - fixed server flags handling (bnc#656589) Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?rev=64387&r1=64386&r2=64387&view=diff ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Thu Jun 16 09:46:43 2011 @@ -296,7 +296,7 @@ =cut package YaPI::HTTPD; -use Switch; +use feature "switch"; use Data::Dumper; use YaPI; use YaST::YCP qw(:LOGGING sformat); @@ -349,31 +349,33 @@ sub GetHostsList { my $self = shift; my @ret = (); - if (!defined $vhost_files ){ - my @data = $self->readHosts(); - $vhost_files = $data[0]; -} - - foreach my $key ( keys(%{$vhost_files}) ) { - switch($key) - { - case "ip-based" { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - foreach my $hostentryHash ( @$hostList ) { - push( @ret, $hostentryHash->{HOSTID} ) if( $hostentryHash->{HOSTID} ); - } - } + if (!defined $vhost_files) { + my @data = $self->readHosts(); + $vhost_files = $data[0]; + } + + foreach my $key (keys (%{$vhost_files})) { + given($key) { + when ("ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } } - case "main" { push( @ret, $vhost_files->{'main'}{HOSTID} ) if( defined($vhost_files->{'main'}{HOSTID}) ); } - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - push( @ret, $hostentryHash->{HOSTID} ) if( $hostentryHash->{HOSTID} ); - } - } - } - } - } + } + when ("main") { + push (@ret, $vhost_files->{'main'}{HOSTID}) if (defined ($vhost_files->{'main'}{HOSTID})); + } + default { + foreach my $hostList ( $vhost_files->{$key} ) { + foreach my $hostentryHash ( @$hostList ) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } + } + } + } + } + return \@ret; } @@ -412,44 +414,38 @@ # will read all vhost files, even if the vhost is found # in the first file. - if (!defined $vhost_files ){ - my @data = $self->readHosts(); - $vhost_files = $data[0]; -} -# my @data = $self->readHosts(); + if (!defined $vhost_files) { + my @data = $self->readHosts(); + $vhost_files = $data[0]; + } -# if( ref($vhost_files) eq 'HASH' ) { $vhost_files = $data[0]; } -# else { return $self->SetError( %{SCR->Error(".http_server.vhosts")} ); } my $ret=undef; - foreach my $key ( keys( %{$vhost_files} ) ){ - switch($key) - { - case "ip-based" { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - foreach my $hostentryHash ( @$hostList ) { - if (( $hostentryHash->{HOSTID} ) && ($hostentryHash->{HOSTID} eq $hostid)){ - $ret = $hostentryHash; - } - } - } + + foreach my $key (keys (%{$vhost_files})) { + given ($key) { + when ("ip-based") { + foreach my $hostList ( $vhost_files->{'ip-based'} ) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } } - case "main" { if (( defined($vhost_files->{'main'}{HOSTID}) ) && ($vhost_files->{'main'}{HOSTID} eq $hostid)) {$ret = $vhost_files->{'main'}; } } - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - if (( $hostentryHash->{HOSTID} ) && ($hostentryHash->{HOSTID} eq $hostid)){ - $ret = $hostentryHash; - } - } - } - } - } - } - if (defined $ret){ - return [ @{$ret->{'DATA'}} ]; - } else { - return []; - } + } + when ("main") { + $ret = $vhost_files->{'main'} + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + default { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + } + } + + return [@{$ret->{'DATA'}}] if (defined $ret); + return []; } BEGIN { $TYPEINFO{getVhType} = ["function", [ "map", "string", "any" ], "string"]; } @@ -457,38 +453,34 @@ my $self = shift; my $hostid = shift; - my %ret= (); - foreach my $key ( keys( %{$vhost_files} ) ){ - switch($key) - { - case "ip-based" { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - foreach my $hostentryHash ( @$hostList ) { - if (( $hostentryHash->{HOSTID} ) && ($hostentryHash->{HOSTID} eq $hostid)) - { - %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}); - } - } - } + my %ret = (); + + foreach my $key (keys (%{$vhost_files})) { + given($key) { + when ("ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } } - case "main" { if (( defined($vhost_files->{'main'}{HOSTID}) ) && ($vhost_files->{'main'}{HOSTID} eq $hostid)) - { - %ret = (type => 'main'); - } - } - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - if (( $hostentryHash->{HOSTID} ) && ($hostentryHash->{HOSTID} eq $hostid)) - { - %ret = (type => 'name-based',id => $hostentryHash->{HostIP}); - } - } - } - } - } - } - return \%ret; + } + when ("main") { + %ret = (type => 'main') + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + default { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'name-based',id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + } + } + + return \%ret; } sub createVH (){ @@ -533,27 +525,30 @@ } -sub deleteVH (){ +sub deleteVH () { my $self = shift; my $hostid = shift; - foreach my $key ( keys( %{$vhost_files} ) ){ - switch($key) - { - case "ip-based" { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - my @tmp_list = (); - foreach my $hostentryHash ( @$hostList ) { push(@tmp_list, $hostentryHash) if ($hostid ne $hostentryHash->{HOSTID}); } - $vhost_files->{'ip-based'} = \@tmp_list; - } + foreach my $key (keys (%{$vhost_files})) { + given($key) { + when ("ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + my @tmp_list = (); + foreach my $hostentryHash (@$hostList) { + push(@tmp_list, $hostentryHash) if ($hostid ne $hostentryHash->{HOSTID}); + } + $vhost_files->{'ip-based'} = \@tmp_list; } - case "main" { delete $vhost_files->{'main'} if ($hostid eq 'main'); } - else { + } + when ("main") { + delete $vhost_files->{'main'} if ($hostid eq 'main'); + } + default { my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; delete $vhost_files->{$key} if ($vhost eq $hostid); - } - } - } + } + } + } } @@ -561,7 +556,7 @@ my $self = shift; my $data = shift; - $vhost_files->{'main'}{'DATA'} = $data; + $vhost_files->{'main'}{'DATA'} = $data; } sub modifyVH { @@ -570,12 +565,10 @@ my $data = shift; - my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); -# $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org