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

[Library|Trunk] 

Landing Page - Organization:
		use objIdentifier for relcan, parse it and add it in OrganizationInfo class

	Datasource Refine Fields: add country


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56005 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-06-06 09:15:54 +00:00
parent 8b8c02eab9
commit db67453565
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
landingPages/organization/organization.component.ts
View File

@ -201,7 +201,7 @@ export class OrganizationComponent {
this.errorMessage = 'No organization found';
} else {
this.organizationInfo = data;
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url);
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this.properties.searchLinkToOrganization + this.organizationInfo.objIdentifier);
this.updateTitle(this.organizationInfo.title.name);
this.updateDescription("Organization, country, "+this.organizationInfo.title.name +((this.organizationInfo.title.name && this.organizationInfo.title.name != this.organizationInfo.name)?(", "+this.organizationInfo.name):"") );
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){

2
services/organization.service.ts
View File

@ -50,7 +50,7 @@ export class OrganizationService {
let organization;
let relations;
this.organizationInfo.objIdentifier = data["result"]["header"]["dri:objIdentifier"];
if(data != null) {
organization = data['result']['metadata']['oaf:entity']['oaf:organization'];
relations = data['result']['metadata']['oaf:entity']['oaf:organization']['rels']['rel'];

1
utils/entities/organizationInfo.ts
View File

@ -2,6 +2,7 @@ export class OrganizationInfo {
title: { "name": string, "url": string };
name: string;
country: string;
objIdentifier: string;
projects: Map<string, { "name": string, "id":string, "code": string,

5
utils/properties/searchFields.ts
View File

@ -74,7 +74,7 @@ export class SearchFields {
//DATAPROVIDERS
public DATASOURCE_REFINE_FIELDS:string[] = ["datasourcetypeuiname", "datasourceodlanguages", "datasourceodcontenttypes",
"datasourcecompatibilityname"];
"datasourcecompatibilityname", "country"];
public DATASOURCE_ADVANCED_FIELDS:string[] = ["q", "datasourceofficialname",
"datasourceenglishname","datasourceodsubjects", "datasourcetypename","datasourceodlanguages",
"datasourceodcontenttypes", "datasourcecompatibilityname","relorganizationid", "collectedfromdatasourceid"];
@ -92,7 +92,8 @@ export class SearchFields {
["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"refine", param:"compatibility", operator: "cm", equalityOperator: " exact "},
["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", operator: "cm", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", operator: "og", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", operator: "cl", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", operator: "cl", equalityOperator: " exact "},
["country"]:{name:"Country", type:"vocabulary", param:"country", operator: "cu", equalityOperator: "="}
};
public COMPATIBLE_DATAPROVIDER_FIELDS:string[] = ["datasourcetypeuiid","datasourcecompatibilityname"];