-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bumped v to 2.6.0 in this branch; added back the lat/lon contained-in…
… box logic, new release notes
- Loading branch information
Showing
33 changed files
with
3,108 additions
and
3,595 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,153 @@ | ||
| 'use strict'; | ||
|
|
||
| const { dd, commonParams } = require('../../../dataDictionary/dd'); | ||
|
|
||
| module.exports = (function() { | ||
| /*********************************************************************** | ||
| * | ||
| * Here we import the raw data definitions defined in dd.js and the | ||
| * files included therein, and export a combined and flattened data- | ||
| * dictionary as well as the resources grouped by resourceGroups to | ||
| * facilitate fast and convenient lookups. | ||
| * | ||
| **********************************************************************/ | ||
|
|
||
| const dataDictionary = []; | ||
| const { dd, commonParams } = require('../../../dataDictionary/dd'); | ||
|
|
||
| const dd2datadictionary = function() { | ||
|
|
||
| // We will flatten and compile the data dictionary by | ||
| // converting the following | ||
| // | ||
| // dd = { | ||
| // zenodeoCore: { treatments: [] }, | ||
| // zenodeoRelated: { | ||
| // figureCitations: [], | ||
| // bibRefCitations: [], | ||
| // … | ||
| // } | ||
| // } | ||
| // | ||
| // to the following | ||
| // | ||
| // dataDictionary = { | ||
| // treatments: [], | ||
| // figureCitations: [], | ||
| // bibRefCitations: [], | ||
| // … | ||
| // } | ||
| // | ||
| // In the process, we will also add the required | ||
| // common parameters to all the resources | ||
| const dataDictionary = {}; | ||
|
|
||
| // We will also create a bundle of all the resources | ||
| // grouped by their resource groups, and carrying with | ||
| // them the name of the 'resource' and the name of the | ||
| // 'resourceId'. This will look like | ||
| // | ||
| // "zenodeoCore": [ | ||
| // { | ||
| // "name": "treatments", | ||
| // "resourceId": "treatmentId" | ||
| // } | ||
| // ], | ||
| // "zenodeoRelated": [ | ||
| // { | ||
| // "name": "figureCitations", | ||
| // "resourceId": "figureCitationId" | ||
| // }, | ||
| // { | ||
| // "name": "bibRefCitations", | ||
| // "resourceId": "bibRefCitationId" | ||
| // }, | ||
| const resourceGroups = {}; | ||
|
|
||
| // loop over each resourceGroup 'rg' in the raw dd | ||
| // 'rg' will be one of | ||
| // - zenodeoCore | ||
| // - zendeoRelated | ||
| // - zenodo | ||
| // - lookups | ||
| for (let rg in dd) { | ||
|
|
||
| resourceGroups[rg] = []; | ||
| const resources = dd[rg]; | ||
|
|
||
| for (let r in resources) { | ||
|
|
||
| resources[r].push(...commonParams['all']); | ||
| resourceGroups[rg] = []; | ||
|
|
||
| // loop over each resource in the respective resource groups | ||
| const groupResources = dd[rg]; | ||
| for (let resource in groupResources) { | ||
|
|
||
| // this ensures that nothing is added to 'treatments' | ||
| if (commonParams[rg].length) { | ||
| resources[r].push(...commonParams[rg]); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| //if (rg === 'zenodo') { | ||
|
|
||
| // resources[r].push(...commonZenodoQueryParams); | ||
| //} | ||
| //else if (rg === 'zenodeo') { | ||
|
|
||
| // if (r !== 'treatments') { | ||
| // Add the commonParams to 'all' the resources no matter | ||
| // which resourceGroup they are in (hence, the 'all') | ||
| let gr = groupResources[resource]; | ||
| gr.push(...commonParams['all']); | ||
|
|
||
| // Don't add any params if a particular resourceGroup's | ||
| // specific commonParams are empty. This ensures nothing | ||
| // is added to 'treatments' which is a part of 'zenodeoCore' | ||
| // and to all the lookups. We do this by testing whether the | ||
| // commonParams of a 'rg' are empty by checking its .length() | ||
| if (commonParams[rg].length) { | ||
|
|
||
| // resources[r].push(...commonZenodeoQueryParams); | ||
| // } | ||
| //} | ||
| // we are using concat() instead of push() because we | ||
| // want to add these parameters in front of the array | ||
| // rather than at the end of the array | ||
| gr = [].concat(commonParams[rg], gr) | ||
| } | ||
|
|
||
| for (let i = 0, j = resources[r].length; i < j; i++) { | ||
| // For every resource, we add its name and the name of its | ||
| // resourceId key to the resourceGroups hash | ||
| let name = resource; | ||
| let resourceId = ''; | ||
| for (let i = 0, j = gr.length; i < j; i++) { | ||
|
|
||
| if (rg === 'lookups') { | ||
| if (rg !== 'lookups') { | ||
|
|
||
| resourceGroups[rg].push({ | ||
| name: r, | ||
| resourceId: '' | ||
| }); | ||
| break; | ||
| } | ||
| else { | ||
| if (gr[i].resourceId) { | ||
|
|
||
| if (resources[r][i].resourceId && resources[r][i].resourceId === true) { | ||
| if (gr[i].resourceId === true) { | ||
|
|
||
| resourceGroups[rg].push({ | ||
| name: r, | ||
| resourceId: resources[r][i].plaziName | ||
| }); | ||
| break; | ||
| resourceId = gr[i].plaziName; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| dataDictionary.push(...resources[r]); | ||
| resourceGroups[rg].push({ | ||
| name: name, | ||
| resourceId: resourceId | ||
| }); | ||
|
|
||
| dataDictionary[resource] = gr; | ||
|
|
||
| } | ||
|
|
||
|
|
||
|
|
||
| } | ||
|
|
||
| return { | ||
| dataDictionary: dataDictionary, | ||
| resourceGroups: resourceGroups | ||
| }; | ||
|
|
||
| })(); | ||
| }; | ||
|
|
||
| const test = function() { | ||
|
|
||
| const dd = dd2datadictionary(); | ||
| console.log(JSON.stringify(dd, null, ' ')); | ||
|
|
||
| }; | ||
|
|
||
| // https://stackoverflow.com/questions/6398196/detect-if-called-through-require-or-directly-by-command-line?rq=1 | ||
| if (require.main === module) { | ||
|
|
||
| test(); | ||
| } | ||
| else { | ||
|
|
||
| module.exports = (dd2datadictionary)(); | ||
| } |
Oops, something went wrong.