From 489365f235116da5a866be2bf72310e9328c95bb Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 4 Aug 2010 01:22:35 +0000 Subject: [PATCH] better serialization on debugging data, RT#7514 --- FS/FS/part_export/communigate_pro.pm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/FS/FS/part_export/communigate_pro.pm b/FS/FS/part_export/communigate_pro.pm index 76fd60815..a3847bf2e 100644 --- a/FS/FS/part_export/communigate_pro.pm +++ b/FS/FS/part_export/communigate_pro.pm @@ -823,17 +823,7 @@ sub export_getsettings_svc_acct { foreach my $key ( grep ref($effective_settings->{$_}), keys %$effective_settings ) { - my $value = $effective_settings->{$key}; - if ( ref($value) eq 'ARRAY' ) { - $effective_settings->{$key} = - join(' ', map { ref($_) ? '['.join(', ', @$_).']' : $_ } @$value ); - } elsif ( ref($value) eq 'HASH' ) { - $effective_settings->{$key} = - join(', ', map { "$_:".$value->{$_} } keys %$value ); - } else { - #XXX - warn "serializing ". ref($value). " for table display not yet handled"; - } + $effective_settings->{$key} = _pretty( $effective_settings->{$key} ); } %{$settingsref} = %$effective_settings; @@ -843,6 +833,22 @@ sub export_getsettings_svc_acct { } +sub _pretty { + my $value = shift; + if ( ref($value) eq 'ARRAY' ) { + '['. join(' ', map { ref($_) ? _pretty($_) : $_ } @$value ). ']'; + } elsif ( ref($value) eq 'HASH' ) { + my $hv = $value->{$_}; + join(', ', map { my $v = $value->{$_}; + "$_:". ref($v) ? _pretty($v) : $_ + } + keys %$value + ); + } else { + warn "serializing ". ref($value). " for table display not yet handled"; + } +} + sub export_getsettings_svc_forward { my($self, $svc_forward, $settingsref, $defaultref ) = @_; -- 2.11.0