diff --git a/package.json b/package.json index efb10895..f19b0c81 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "url": "https://github.com/UW-Macrostrat/macrostrat-api.git" }, "scripts": { - "start": "nodemon --watch v2 --exec ts-node --transpileOnly server.ts", + "dev": "nodemon --watch v2 --exec ts-node --transpileOnly server.ts", + "start": "ts-node --transpileOnly server.ts", "docker": "docker build -t macrostrat-api . && docker run --rm -it -p 5000:5000 macrostrat-api", "serve": "ts-node --transpileOnly server.ts", "test": "mocha ./v2", diff --git a/v2/larkin.ts b/v2/larkin.ts index 969f8594..85f58837 100644 --- a/v2/larkin.ts +++ b/v2/larkin.ts @@ -573,7 +573,18 @@ const { Client, Pool } = require("pg"); // Macrostrat refs if (key === "refs" || key === "ref_id") { larkin.queryPg("burwell", - "SELECT refs.id AS ref_id, pub_year, author, ref, doi, url, COUNT(DISTINCT units_sections.unit_id) AS t_units FROM macrostrat.refs LEFT JOIN macrostrat.col_refs ON col_refs.ref_id = refs.id LEFT JOIN macrostrat.units_sections ON units_sections.col_id = col_refs.col_id WHERE refs.id = ANY(:ref_id) GROUP BY refs.id", + `SELECT refs.id AS ref_id, + pub_year, + author, + ref, + doi, + url, + COUNT(DISTINCT units_sections.unit_id) AS t_units + FROM macrostrat.refs + LEFT JOIN macrostrat.col_refs ON col_refs.ref_id = refs.id + LEFT JOIN macrostrat.units_sections ON units_sections.col_id = col_refs.col_id + WHERE refs.id = ANY (:ref_id) + GROUP BY refs.id, pub_year, author, ref, doi, url`, { ref_id: ref_ids }, function (error, data) { var refs = {}; @@ -596,7 +607,16 @@ const { Client, Pool } = require("pg"); } else { larkin.queryPg( "burwell", - "SELECT source_id, name, COALESCE(url, '') url, COALESCE(ref_title, '') ref_title, COALESCE(authors, '') authors, COALESCE(ref_year, '') ref_year, COALESCE(ref_source, '') ref_source, COALESCE(isbn_doi, '') isbn_doi FROM maps.sources WHERE source_id = ANY($1)", + `SELECT source_id, + name, + COALESCE(url, '') url, + COALESCE(ref_title, '') ref_title, + COALESCE(authors, '') authors, + COALESCE(ref_year, '') ref_year, + COALESCE(ref_source, '') ref_source, + COALESCE(isbn_doi, '') isbn_doi + FROM maps.sources + WHERE source_id = ANY ($1)`, [ref_ids], function (error, result) { var refs = {};