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

Resolve conflict after merge

This commit is contained in:
Konstantinos Triantafyllou 2024-09-20 15:42:28 +03:00
parent 6873cd3887 13daf1b5d4
commit a5178adefd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orcid/orcidWork.ts
View File

@ -141,7 +141,7 @@ export class WorkV3_0 {
}
}
if(resultLandingInfo.identifiers) {
if(resultLandingInfo.identifiers && resultLandingInfo.identifiers.size > 0) {
work['external-ids'] = { 'external-id': [] };
resultLandingInfo.identifiers.forEach(((values, key) => {
values.forEach(value => {

8
services/refineFieldResults.service.ts
View File

@ -41,7 +41,7 @@ export class RefineFieldResultsService {
getRefineFieldResultsByFieldName(fieldName:string, entityName:string, properties:EnvProperties):any{
let keys:string[]=["funder", "fundinglevel"]; // this covers funder, relfunder, funding stream fields and funding level fields
let link = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +(this.fieldIncludesAnyOfTheKeywords(fieldName, keys)?('&sf='+fieldName):'')+ "&format=json";
let link = properties.searchAPIURLLAst +this.getSearchAPIURLForEntity(entityName)+"?fields="+fieldName +(entityName == "service" ? "&type=services" : "")+(this.fieldIncludesAnyOfTheKeywords(fieldName, keys)?('&sf='+fieldName):'')+ "&format=json";
return this.getField(link,fieldName, properties);
}
@ -94,8 +94,10 @@ export class RefineFieldResultsService {
suffix="other/";
}else if(entityType == "organization"){
suffix="organizations/";
}else if(entityType == "dataprovider"){
suffix="datasources/";
}else if(entityType == "dataprovider") {
suffix = "datasources/";
}else if(entityType == "service") {
suffix = "resources2/";
}else if(entityType == "person"){
suffix="people/";
}else if(entityType == "result"){

2
utils/properties/environments/environment.ts
View File

@ -111,7 +111,7 @@ export let commonDev: EnvProperties = {
orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?",
orcidClientId: "APP-A5M3KTX6NCN67L91",
utilsService: "http://scoobydoo.di.uoa.gr:8000",
vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
loginServiceURL: "http://dl170.madgik.di.uoa.gr:19080/login-service/",
cookieDomain: ".di.uoa.gr",
feedbackmail: "kostis30fylloy@gmail.com",