mod of admin0 geocoder to consolidate search function

geocoder/admin0/sql/geocoder.sql

@@ -1,28 +1,12 @@
-CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
+--CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN);
+
+CREATE OR REPLACE FUNCTION test_geocode_admin0_polygons(name text[])
   RETURNS SETOF geocode_admin_v1 AS $$
   DECLARE 
     ret geocode_admin_v1%rowtype;
   BEGIN
-  FOR ret IN
-    SELECT
-       q, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success
-    FROM (
-      SELECT 
-        q, (
-          SELECT the_geom 
-          FROM ne_admin0_v3
-          WHERE adm0_a3 = (
-            SELECT adm0_a3 FROM admin0_synonyms
-            WHERE name_ = 
-                lower(regexp_replace(d.q, '[^A-z\u00C0-\u00ff]+', '', 'g'))
-            ORDER BY rank ASC LIMIT 1
-          )
-        ) geom
-      FROM (SELECT unnest(name) q) d
-    ) v
-  LOOP 
-    RETURN NEXT ret;
-  END LOOP;
-  RETURN;
+  -- FOR ret IN
+  RETURN QUERY
+    SELECT d.q, n.the_geom as geom, CASE WHEN s.adm0_a3 IS NULL then FALSE ELSE TRUE END AS success FROM (SELECT q, lower(regexp_replace(q, '[^A-z\u00C0-\u00ff]+', '', 'g'))::text x FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3;
 END
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;