From 500945197af56550dc5926278f9a8fa2e655162c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 27 Apr 2016 10:28:21 +0100
Subject: [UK] Remove West Berkshire temporary fix.

---
 perllib/FixMyStreet/SendReport/Open311.pm | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'perllib')

diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 5c7fa30f3..0581a7313 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -144,10 +144,6 @@ sub send {
             $self->success( 1 );
         } else {
             $result *= 1;
-            # temporary fix to resolve some issues with west berks
-            if ( $row->bodies_str =~ /2619/ ) {
-                $result *= 0;
-            }
         }
     }
 
-- 
cgit v1.2.3


From 287aeeb8ca593e7d547ea1595abf3d942a7139cf Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 27 Apr 2016 10:28:45 +0100
Subject: Store Open311 error in report on failure.

It will still output via cron on the first failure. However, reduce the
verbosity of a couple of SendReport modules which are reporting failure
every time.
---
 perllib/FixMyStreet/SendReport/Angus.pm     | 1 -
 perllib/FixMyStreet/SendReport/EastHants.pm | 1 -
 perllib/FixMyStreet/SendReport/Open311.pm   | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'perllib')

diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm
index 15441cc1f..cab5de173 100644
--- a/perllib/FixMyStreet/SendReport/Angus.pm
+++ b/perllib/FixMyStreet/SendReport/Angus.pm
@@ -160,7 +160,6 @@ sub send {
         }
     } catch {
         my $e = $_;
-        print "Caught an error: $e\n";
         $self->error( "Error sending to Angus: $e" );
     };
     $self->success( !$return );
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index cc302b8b3..55ec79613 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -52,7 +52,6 @@ sub send {
         $return = 0 if $result eq 'Report received';
     } catch {
         my $e = $_;
-        print "Caught an error: $e\n";
         $self->error( "Error sending to East Hants: $e" );
     };
     $self->success( !$return );
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 0581a7313..bf5ed3e30 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -144,10 +144,11 @@ sub send {
             $self->success( 1 );
         } else {
             $result *= 1;
+            $self->error( "Failed to send over Open311\n" ) unless $self->error;
+            $self->error( $self->error . "\n" . $open311->error );
         }
     }
 
-    $self->error( 'Failed to send over Open311' ) unless $self->success;
 
     return $result;
 }
-- 
cgit v1.2.3