diff options
Diffstat (limited to 'perllib/FixMyStreet/SendReport')
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Barnet.pm | 11 | ||||
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Open311.pm | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/SendReport/Barnet.pm b/perllib/FixMyStreet/SendReport/Barnet.pm index 9a54dd91d..ecbe82872 100644 --- a/perllib/FixMyStreet/SendReport/Barnet.pm +++ b/perllib/FixMyStreet/SendReport/Barnet.pm @@ -149,14 +149,21 @@ sub send { 'string' => $result->get_faultstring(), 'detail' => $result->get_detail(), # possibly only contains debug info ); - $fault{$_}=~s/^\s*|\s*$//g foreach keys %fault; + foreach (keys %fault) { + $fault{$_}="" unless defined $fault{$_}; + $fault{$_}=~s/^\s*|\s*$//g; + } $fault{actor}&&=" (actor: $fault{actor})"; $fault{'detail'} &&= "\n" . $fault{'detail'}; $err_msg = "Failed (problem id $h{id}): Fault $fault{code}$fault{actor}\n$fault{string}$fault{detail}"; } }; - print "$err_msg\n" if $err_msg; + if ($err_msg) { + # for timeouts, we can tidy the message a wee bit (i.e. strip the 'error deserializing...' message) + $err_msg=~s/(?:Error deserializing message:.*)(Can't connect to [a-zA-Z0-9.:]+\s*\(Connection timed out\)).*/$1/s; + print "$err_msg\n"; + } if ($@) { my $e = shift; print "Caught an error: $@\n"; diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 845a6295c..9bb33b9ef 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -54,7 +54,6 @@ sub send { $always_send_latlong = 0; $send_notpinpointed = 1; - $basic_desc = 1; } @@ -93,6 +92,7 @@ sub send { if ( $resp ) { $row->external_id( $resp ); + $row->send_method_used('Open311'); $result *= 0; $self->success( 1 ); } else { |