diff options
| author | Mark Wells <mark@freeside.biz> | 2016-03-28 17:36:25 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2016-03-28 17:36:54 -0700 |
| commit | 6f30185e698e138885182b9c6e2b503fb46d1e28 (patch) | |
| tree | 04465ccdec680f38aa75d68b917c95d637159e56 /httemplate/misc/exchanges.cgi | |
| parent | e002ba6d2f3c6f7dac37ea6fb4cc85d1af0c1e39 (diff) | |
slightly better error reporting for DID selector, from #39914
Diffstat (limited to 'httemplate/misc/exchanges.cgi')
| -rw-r--r-- | httemplate/misc/exchanges.cgi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/httemplate/misc/exchanges.cgi b/httemplate/misc/exchanges.cgi index 0de4ace25..d62679191 100644 --- a/httemplate/misc/exchanges.cgi +++ b/httemplate/misc/exchanges.cgi @@ -1,4 +1,4 @@ -<% encode_json(\@exchanges) %>\ +<% encode_json({ error => $error, exchanges => \@exchanges}) %>\ <%init> my( $areacode, $svcpart ) = $cgi->param('arg'); @@ -7,6 +7,8 @@ my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } ); die "unknown svcpart $svcpart" unless $part_svc; my @exchanges = (); +my $error; + if ( $areacode ) { my @exports = $part_svc->part_export_did; @@ -17,9 +19,12 @@ if ( $areacode ) { } my $export = $exports[0]; - my $something = $export->get_dids('areacode'=>$areacode); + local $@; + local $SIG{__DIE__}; + my $something = eval { $export->get_dids('areacode'=>$areacode) }; + $error = $@; - @exchanges = @{ $something }; + @exchanges = @{ $something } if $something; } |
