summaryrefslogtreecommitdiff
path: root/httemplate/misc/regions.cgi
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-03-28 17:36:25 -0700
committerMark Wells <mark@freeside.biz>2016-03-28 17:59:20 -0700
commit75159fa6df40171b78d19c1edaeb15d815b0b68b (patch)
treeae8acfc896bec564f228a2df759b385ec67b569d /httemplate/misc/regions.cgi
parent6e2d51d0825c6dbb92fe7fb4c4e15868fdd6b611 (diff)
slightly better error reporting for DID selector, from #39914
Diffstat (limited to 'httemplate/misc/regions.cgi')
-rw-r--r--httemplate/misc/regions.cgi11
1 files changed, 8 insertions, 3 deletions
diff --git a/httemplate/misc/regions.cgi b/httemplate/misc/regions.cgi
index 31538b08e..882dd48df 100644
--- a/httemplate/misc/regions.cgi
+++ b/httemplate/misc/regions.cgi
@@ -1,4 +1,4 @@
-<% encode_json(\@regions) %>\
+<% encode_json({ error => $error, regions => \@regions}) %>\
<%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 @regions = ();
+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 = $@;
- @regions = @{ $something };
+ @regions = @{ $something } if $something;
}