projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4.x style
[freeside.git]
/
httemplate
/
misc
/
exchanges.cgi
diff --git
a/httemplate/misc/exchanges.cgi
b/httemplate/misc/exchanges.cgi
index
8a67f7b
..
d626791
100644
(file)
--- a/
httemplate/misc/exchanges.cgi
+++ b/
httemplate/misc/exchanges.cgi
@@
-1,4
+1,4
@@
-<%
objToJson(\@exchanges) %>
+<%
encode_json({ error => $error, exchanges => \@exchanges}) %>\
<%init>
my( $areacode, $svcpart ) = $cgi->param('arg');
<%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 = ();
die "unknown svcpart $svcpart" unless $part_svc;
my @exchanges = ();
+my $error;
+
if ( $areacode ) {
my @exports = $part_svc->part_export_did;
if ( $areacode ) {
my @exports = $part_svc->part_export_did;
@@
-17,9
+19,12
@@
if ( $areacode ) {
}
my $export = $exports[0];
}
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
;
}
}