Changeset 41 for trunk/npemap.org.uk

Timestamp:

Oct 15, 2006, 3:15:23 PM (14 years ago)

Author:

David Sheldon

Message:

Trim whitespace from submitted postcode.

Change default back link.

Change the DB link to connect to my DB sorry, we should probably extract this into a config file.

File:

• trunk/npemap.org.uk/cgi/submit.fcgi (modified) (3 diffs)

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

@@ -29 +29 @@
     # If we're given return URL parameters, basic sanity check to stop
     # funny business
-    my $returnlink = '<a href="'. $returnBaseURL . '/">Go back to the start</a>';   
+    
+    my $returnlink = '<a href="/tiles/map.html?' .int($cgi->param('easting')/1000). ",".int($cgi->param('northing')/1000)  . ',1">Go back</a>';   
 
     if (defined $cgi->param('returnX') and ($cgi->param('returnX') =~ /\d+/) and
-        defined $cgi->param('returnY') and ($cgi->param('returnY') =~ /\d+/) and
-        defined $cgi->param('returnZoom') and ($cgi->param('returnZoom') =~ /\d+/)) {
-        $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html?' . $cgi->param('returnX') . ',' . $cgi->param('returnY') . ',' . $cgi->param('returnZoom') . '">Go back to the map</a>';
+        defined $cgi->param('returnY') and ($cgi->param('returnY') =~ /\d+/) ) {
+        $returnlink = '<a href="' . $returnBaseURL . '/tiles/map.html?' . $cgi->param('returnX') . ',' . $cgi->param('returnY') . ',1">Go back to the map</a>';
     }
 
@@ -76 +76 @@
     # Now validate the postcode input format
     my $raw_postcode = $cgi->param('postcode');
-    my $postcode = Geo::Postcode->new($raw_postcode);
+    my $trimmed_postcode = $raw_postcode; 
+    $trimmed_postcode =~ s/^\s+//;
+    $trimmed_postcode =~ s/\s+$//;
+    my $postcode = Geo::Postcode->new($trimmed_postcode);
     my ($first, $second, $third, $fourth) = @{$postcode->fragments};
     my ($outward, $inward);
@@ -149 +152 @@
 sub setup_dbh {
     # $dbh is global
-    return $dbh = DBI->connect_cached("dbi:Pg:dbname=npemaps","npemaps","");
+    return $dbh = DBI->connect_cached("dbi:Pg:dbname=npemaps;host=127.0.0.1","npemaps","npemaps");
 }