aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-08-02 16:39:41 +0100
committerStruan Donald <struan@exo.org.uk>2011-08-02 16:39:41 +0100
commit9415569a17bf3044c7f3253c923f556436d48942 (patch)
tree859ea21cf5ab2a5e48cbf2a784db9997656907a5
parent149412d1d4f680a5b7186814db0f1886157bb2d0 (diff)
include report url and also media url if present
-rwxr-xr-xbin/send-reports2
-rw-r--r--perllib/Open311.pm12
2 files changed, 9 insertions, 5 deletions
diff --git a/bin/send-reports b/bin/send-reports
index c74a796c5..298eb458d 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -269,7 +269,7 @@ while (my $row = $unsent->next) {
api_key => $conf->api_key,
);
- my $resp = $open311->send_service_request( $row, $contact->email );
+ my $resp = $open311->send_service_request( $row, \%h, $contact->email );
if ( $resp ) {
$row->external_id( $resp );
diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index 86a2c58fd..0c8c3fde6 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -24,15 +24,13 @@ sub get_service_meta_info {
my $service_id = shift;
my $service_meta_xml = $self->_get( "services/$service_id.xml" );
- my $xml = XML::Simple->new();
- my $obj = $xml->XMLin( $service_meta_xml );
-
- return $obj;
+ return $self->_get_xml_object( $service_meta_xml );
}
sub send_service_request {
my $self = shift;
my $problem = shift;
+ my $extra = shift;
my $service_code = shift;
my $description = <<EOT;
@@ -40,6 +38,8 @@ title: @{[$problem->title()]}
detail: @{[$problem->detail()]}
+url: $extra->{url}
+
Submitted via FixMyStreet
EOT
;
@@ -56,6 +56,10 @@ EOT
$params->{ phone } = $problem->user->phone;
}
+ if ( $extra->{image_url} ) {
+ $params->{media_url} = $extra->{image_url};
+ }
+
if ( $problem->extra ) {
my $extras = $problem->extra;