Revision 58259
Added by Konstantina Galouni about 4 years ago
searchDataproviders.service.ts | ||
---|---|---|
204 | 204 |
var basicQuery = "(oaftype exact datasource) " |
205 | 205 |
url += "?query="; |
206 | 206 |
if(datasourceId!= null && datasourceId != '' ) { |
207 |
url +=" ( "+basicQuery+ " ) " +" and (collectedfromdatasourceid exact \"" + datasourceId + "\")"; |
|
207 |
url +=" ( "+basicQuery+ " ) " +" and (collectedfromdatasourceid exact \"" + datasourceId + "\" or resulthostingdatasourceid exact \""+ datasourceId + "\")";
|
|
208 | 208 |
}else{ |
209 | 209 |
url +=" ( "+basicQuery+ " ) "; |
210 | 210 |
} |
Also available in: Unified diff
[Library | Landing Redesign]:
1. fetchResearchResults.class.ts: 'getResultsForDataproviders()' & 'getAggregatorResults()', searchProjects.service.ts: 'getProjectsforDataProvider()', searchDataproviders.service.ts: 'getDataProvidersforEntityRegistry()':
in query parameters add exact id for 'collectedfromdatasourceid or resulthostingdatasourceid'.
2. searchResearchResults.service.ts: unused 'resultType' parameter removed from 'searchAggregators()'.
3. dataProviderInfo.ts: 'relatedDatasources' structure changed from:
Map<string, {"name": string, "countPublications": string, "countDatasets": string, "countSoftware": string, "countOrps": string}>;
to {"id": string, "name": string, "count": number}[];, where count is the number for all research outcomes (publications, datasets, software, other).
4. relatedDatasourcesTab.component.ts:
a. Close modal when clicking an internal link
b. Change view and structure to show number of all research outcomes
c. Search links with parameters for 'collectedfromdatasourceid or resulthostingdatasourceid'.
5. dataProvider.component.ts:
a. Count and search everything with parameters for 'collectedfromdatasourceid or resulthostingdatasourceid'
b. Only 1 query for relatedDatasources (all research outcomes in 1 query).
6. dataProvider.component.html: Show all "tabs" no matter what the type of content provider is.