Nick datasetquery

v2.0/helpers/datasets/datasetqueryfaster.sql

@@ -25,8 +25,8 @@ WITH filtered_datasets AS (
     ORDER BY bigq.siteid, bigq.datasetid
     -- This is cheating a bit. We're querying a smaller chunk here and hoping that taking 3 times the datasets is enough
     -- to get us the actual limit.
-    LIMIT COALESCE(${limit}, 25) * 3
-    OFFSET COALESCE(${offset}, 0)
+    -- LIMIT COALESCE(${limit}, 25) * 3
+    -- OFFSET COALESCE(${offset}, 0)
 ),
 -- Now these CTEs work on a much smaller dataset
 dataset_dois AS (

v2.0/helpers/publications/pubdsidquery.sql

@@ -1,7 +1,7 @@
-WITH dpub AS
-  (SELECT * FROM
-  	ndb.datasetpublications as dp
-    WHERE ($1 IS NULL OR dp.datasetid IN ($1:csv)))
+WITH dpub AS (
+  SELECT * FROM ndb.datasetpublications AS dp
+  WHERE ($1 IS NULL OR dp.datasetid IN ($1:csv))
+)
 SELECT json_build_object(
               'datasets', json_agg(DISTINCT jsonb_build_object('siteid', dsl.siteid,
                                                                    'datasetid', dpub.datasetid,
@@ -35,9 +35,9 @@ SELECT json_build_object(
                                                    'givennames', ca.givennames,
                                                    'order', pa.authororder))) AS publication
 FROM ndb.publications AS pub
-  INNER JOIN ndb.publicationauthors AS pa ON pub.publicationid = pa.publicationid
-  INNER JOIN ndb.contacts as ca ON ca.contactid = pa.contactid
-  INNER JOIN ndb.publicationtypes AS pt  ON     pub.pubtypeid = pt.pubtypeid
-  INNER JOIN (SELECT * FROM dpub) AS dpub ON dpub.publicationid = pub.publicationid
+  INNER JOIN dpub ON dpub.publicationid = pub.publicationid
+  LEFT JOIN ndb.publicationauthors AS pa ON pub.publicationid = pa.publicationid
+  LEFT JOIN ndb.contacts as ca ON ca.contactid = pa.contactid
+  LEFT JOIN ndb.publicationtypes AS pt ON pub.pubtypeid = pt.pubtypeid
   LEFT JOIN ndb.dslinks AS dsl ON dsl.datasetid = dpub.datasetid
 GROUP BY pub.publicationid, pt.pubtype

v2.0/helpers/publications/publications.js

@@ -154,33 +154,10 @@ function publicationbydataset (req, res, next) {
 
   db.any(pubbydsid, [datasetid])
     .then(function (data) {
-      // var bibOutput = bib.formatpublbib(data);
-      var bibOutput = data;
-
-      /* This is a sequence I use to aggregate the publications by site */
-      var returner = [];
-      var uniquepubs = bibOutput.map(x => x.publicationid).filter((x, i, a) => a.indexOf(x) === i)
-
-      for (var i = 0; i < uniquepubs.length; i++) {
-        returner[i] = { 'publicationid': uniquepubs[i] }
-      }
-
-      for (i = 0; i < bibOutput.length; i++) {
-        var returnid = returner.map(x => x.publicationid).indexOf(bibOutput[i].publicationid)
-
-        if (!('title' in returner[returnid])) {
-          /* Using `title` as a placeholder for any record that hasn't been added. */
-          returner[returnid] = bibOutput[i]
-          returner[returnid].datasetid = [returner[returnid].datasetid]
-        } else {
-          returner[returnid]['datasetid'].push(bibOutput[i].datasetid);
-        }
-      }
-
       res.status(200)
         .json({
           status: 'success',
-          data: bibOutput,
+          data: data,
           message: 'Retrieved all tables'
         });
     })