Fixing multi-dataset downloads

With the new site object there was a problem getting downloads for multiple datasets simultaneously.  This fix adds a new method for ap.siteobject for datasetids as an int[].  This then passes through to the 01_datasetinfo file where we also improve handling of arrays in the siteobj subquery.

Author: SimonGoring

function/ap/siteobject.sql

@@ -18,3 +18,24 @@ AS $function$
     GROUP BY sts.siteid, sts.sitename, sts.sitedescription, ST_AsGeoJSON(sts.geog,5,2), 
    sts.area, sts.altitude, sts.notes, gpn.names;
 $function$;
+
+CREATE OR REPLACE FUNCTION ap.siteobject(_siteid integer[])
+ RETURNS TABLE(siteid integer, site jsonb)
+ LANGUAGE sql
+AS $function$
+    SELECT sts.siteid,
+        jsonb_build_object(  'siteid', sts.siteid,
+                           'sitename', sts.sitename,
+                    'sitedescription', sts.sitedescription,
+                          'geography', ST_AsGeoJSON(sts.geog,5,2),
+                               'area', sts.area,
+                           'altitude', sts.altitude,
+                              'notes', sts.notes,
+                       'geopolitical', gpn.names) AS site
+    FROM
+    ndb.sites AS sts
+    LEFT JOIN ap.geopolnames AS gpn ON gpn.siteid = sts.siteid
+    WHERE sts.siteid = ANY(_siteid)
+    GROUP BY sts.siteid, sts.sitename, sts.sitedescription, ST_AsGeoJSON(sts.geog,5,2), 
+   sts.area, sts.altitude, sts.notes, gpn.names;
+$function$;

function/doi/01_datasetinfo.sql

@@ -12,7 +12,7 @@ WITH siteid AS (
 siteobj AS (
     SELECT * 
     FROM
-        ap.siteobject((SELECT siteid FROM siteid))
+         ap.siteobject((SELECT array_agg(siteid) FROM siteid))
 )
 SELECT dts.datasetid,
        sts.site ||