From 75159fa6df40171b78d19c1edaeb15d815b0b68b Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 28 Mar 2016 17:36:25 -0700 Subject: slightly better error reporting for DID selector, from #39914 --- httemplate/misc/areacodes.cgi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'httemplate/misc/areacodes.cgi') diff --git a/httemplate/misc/areacodes.cgi b/httemplate/misc/areacodes.cgi index 4b31deb00..afbe93e91 100644 --- a/httemplate/misc/areacodes.cgi +++ b/httemplate/misc/areacodes.cgi @@ -1,4 +1,4 @@ -<% encode_json(\@areacodes) %>\ +<% encode_json({ error => $error, areacodes => \@areacodes}) %>\ <%init> my( $state, $svcpart ) = $cgi->param('arg'); @@ -7,6 +7,8 @@ my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } ); die "unknown svcpart $svcpart" unless $part_svc; my @areacodes = (); +my $error; + if ( $state ) { my @exports = $part_svc->part_export_did; @@ -17,9 +19,12 @@ if ( $state ) { } my $export = $exports[0]; - my $something = $export->get_dids('state'=>$state); + local $@; + local $SIG{__DIE__}; + my $something = eval { $export->get_dids('state'=>$state) }; + $error = $@; - @areacodes = @{ $something }; + @areacodes = @{ $something } if $something; } -- cgit v1.2.1