MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Trunk|Library]: 

1. env-properties.json: Add 'openDoarURL' and 'r3DataURL' properties.
2. Dataprovider Landing page (service): Add match pattern (regex) for originalId field & handle case where there are multiple values for this field.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55139 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2019-04-01 13:31:55 +00:00
parent 0b9253cc45
commit 30dacd67a7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
landingPages/dataProvider/dataProvider.service.ts
View File

@ -69,17 +69,26 @@ export class DataProviderService {
if(data[0] != null) {
this.dataProviderInfo.title = {"name": (data[0].englishname)?data[0].englishname: data[0].officialname, "url": data[0].websiteurl};
this.dataProviderInfo.officialName = data[0].officialname;
var originalId =(data[0].originalId)?data[0].originalId:"";
if(originalId && originalId != ""){
if(originalId.indexOf("opendoar____::") != -1){
this.dataProviderInfo.openDoarId = originalId.split("opendoar____::")[1];
}else if (originalId.indexOf("re3data_____::") != -1){
this.dataProviderInfo.r3DataId = originalId.split("re3data_____::")[1];
var pattern = /.{12}::.+/;
var originalIds =(data[0].originalId)?data[0].originalId:"";
let length = originalIds.length!=undefined ? originalIds.length : 1;
for(let i=0; i<length; i++) {
var originalId = originalIds.length!=undefined ? originalIds[i] : originalIds;
var matched = originalId.match(pattern);
if(matched && originalId && originalId != ""){
if(originalId.indexOf("opendoar____::") != -1){
this.dataProviderInfo.openDoarId = originalId.split("opendoar____::")[1];
}else if (originalId.indexOf("re3data_____::") != -1){
this.dataProviderInfo.r3DataId = originalId.split("re3data_____::")[1];
}
this.dataProviderInfo.originalId = originalId;
}
this.dataProviderInfo.originalId = originalId;
}
}
if(data[1] != null) {