Changeset 365 for trunk/npemap.org.uk

Timestamp:

Nov 12, 2006, 5:09:10 PM (14 years ago)

Author:

Nick Burch

Message:

Finish off geocoder

File:

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

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

@@ -65 +65 @@
         my $inward;
         if(defined $cgi->param("postcode")) {
-                $postcode = $cgi->param("postcode");
-                ($outward,$inward) = ($postcode =~ /^(\w+\d+\w?)\s*(\d\w\w)$/);
+                $postcode = uc($cgi->param("postcode"));
+                ($outward,$inward) = ($postcode =~ /^([A-Z]+\d+[A-Z]?)\s*(\d[A-Z][A-Z])$/);
                 unless($outward && $inward) {
                         print_err ("Invalid postcode '$postcode' supplied");
@@ -90 +90 @@
         }
         unless($matched) {
-                my ($mpart) = ($outward =~ /^(\w+)\d/);
+                my ($mpart) = ($outward =~ /^([A-Z]+)\d/);
                 my $mlen = length($mpart);
 
                 ($easting,$northing,$matched,$pc) = 
-                                execute($area_matcher,$mlen,$mlen,$mpart,$mlen);
+                                execute($area_matcher,$mpart,$mlen,$mlen,$mpart,$mlen);
+
+                unless($matched) {
+                        print_err "Postcode area '$mpart' not found, postcode probably invalid";
+                        next REQUEST;
+                }
         }
 
-        print "$easting $northing $matched $pc\n";
-
+        # Render
+        if($output eq "xml") {
+                print header("text/xml");
+                print "<?xml version='1.0'?>\n";
+                print "<geocoder>\n";
+                print "  <request>\n";
+                print "     <postcode>$postcode</postcode>\n";
+                print "     <outward>$outward</outward>\n";
+                print "     <inward>$inward</inward>\n";
+                print "  </request>\n\n";
+                print "  <easting>".int($easting)."</easting>\n";
+                print "  <northing>".int($northing)."</northing>\n";
+                print "  <postcode>$pc</postcode>\n";
+                print "</geocoder>\n";
+        } else {
+                print header("text/plain");
+                print "# Easting,Northing,Matched Postcode\n";
+                print int($easting).",".int($northing).",'$pc'\n";
+        }
 }
 
@@ -137 +159 @@
         my $outer_sql = $base_sql_a . " outward || ' ###'". $base_sql_b . 
                    "AND outward = ? GROUP BY outward";
-        my $area_sql = $base_sql_a . " substr(outward,1,?) " . $base_sql_b . 
+        my $area_sql = $base_sql_a . " substr(?,1,?) " . $base_sql_b . 
                        "AND substr(outward,1,?) = ? ".
                        "GROUP BY substr(outward,1,?)";
-print $area_sql."\n";
 
         my $full_matcher = $dbh->prepare($full_sql);