Changeset 169 for trunk/npemap.org.uk

Timestamp:

Oct 24, 2006, 8:06:02 PM (14 years ago)

Author:

Dominic Hargreaves

Message:

Have the deleted flag take effect.

Location:

trunk/npemap.org.uk/cgi

Files:

• bad-postcode.fcgi (modified) (2 diffs)
• get-postcodes.fcgi (modified) (1 diff)
• submit.fcgi (modified) (1 diff)

trunk/npemap.org.uk/cgi/bad-postcode.fcgi

@@ -49 +49 @@
 
     # Check that the requested ID exists
-    my $sth = $dbh->prepare('SELECT id FROM postcodes WHERE id = ?');
+    my $sth = $dbh->prepare('SELECT id FROM postcodes WHERE id = ? AND NOT deleted');
     unless ($sth->execute($cgi->param('postcode'))) {
         print_err('Database error when checking for the postcode', $returnlink);
@@ -56 +56 @@
 
     unless ($sth->rows) {
-        print_err('A postcode with that identifier does not exist.', $returnlink);
+        print_err('A postcode with that identifier does not exist, or has already been deleted.', $returnlink);
         next REQUEST;
     }

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

@@ -73 +73 @@
     }
 
-    my $sth = $dbh->prepare("SELECT outward || ' ' || inward AS postcode, easting, northing,id FROM postcodes WHERE easting BETWEEN ? AND ? AND northing BETWEEN ? AND ?");
+    my $sth = $dbh->prepare("SELECT outward || ' ' || inward AS postcode, easting, northing,id FROM postcodes WHERE easting BETWEEN ? AND ? AND northing BETWEEN ? AND ? AND NOT deleted");
     
     if ($sth->execute($cgi->param('mineasting'), $cgi->param('maxeasting'), $cgi->param('minnorthing'), $cgi->param('maxnorthing'))) {

trunk/npemap.org.uk/cgi/submit.fcgi

@@ -119 +119 @@
     # corroboration factor; this just catches accidental double-submission
     # really.
-    $sth = $dbh->prepare('SELECT raw_postcode_outward FROM postcodes WHERE raw_postcode_outward = ? AND raw_postcode_inward = ? AND easting = ? AND northing = ? AND ip = ?');
+    $sth = $dbh->prepare('SELECT raw_postcode_outward FROM postcodes WHERE raw_postcode_outward = ? AND raw_postcode_inward = ? AND easting = ? AND northing = ? AND ip = ? AND NOT deleted');
     unless ($sth->execute($cgi->param('postcode1'), $cgi->param('postcode2'), $easting, $northing, $ENV{'REMOTE_ADDR'})) {
         print_err('Database error when checking for duplicate data :(', $returnlink);