Changeset 74 for trunk/npemap.org.uk

Timestamp:

Oct 18, 2006, 12:34:58 AM (14 years ago)

Author:

David Sheldon

Message:

Remove dependency on JSON and return error codes on error.

Fixes ticket:14

File:

• trunk/npemap.org.uk/cgi/get-postcodes.fcgi (modified) (5 diffs)

trunk/npemap.org.uk/cgi/get-postcodes.fcgi

@@ -6 +6 @@
 use DBI;
 use CGI::Fast qw/:standard -debug/;
-use JSON;
 
 use vars qw($dbname $dbhost $dbuser $dbpass);
@@ -35 +34 @@
     # In case the database went away, make sure we have a connection
     unless (setup_dbh()) {
-        print_err('Error setting up database connection');
+        print_internal_err('Error setting up database connection');
         next REQUEST;
     }
@@ -68 +67 @@
     if (($cgi->param('maxeasting') - $cgi->param('mineasting') > $max_distance) or ($cgi->param('maxnorthing') - $cgi->param('minnorthing') > $max_distance)) {
         print_err("The requested box is too large");
+        next REQUEST;
     }
 
@@ -79 +79 @@
             print "addMarker('$$hash{postcode}', $$hash{easting}, $$hash{northing});\n";
         }
-        #print objToJson($hr) . "\n";
     } else {
-        print_err("Database error retrieving data");
+        print_internal_err("Database error retrieving data");
     }
 
@@ -92 +91 @@
 sub print_err($) {
     my $err = shift;
-    my $obj = { 'error' => $err };
-    print "Content-type: text/x-json\n\n";
-    print objToJson($obj) . "\n";
+    print header("text/plain", "400 $err");
+    print "Error: $err\n";
+}
+
+sub print_internal_err($) {
+    my $err = shift;
+    print header("text/plain", "500 $err");
+    print "Error: $err\n";
 }