From 97195953001d6934f976b636a083fea701a6b0f1 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 17 May 2019 12:10:13 +0000 Subject: [PATCH] [Trunk|Library]: Bug fix: In Landing and Search Pages for results (publ, datas, soft, orp), make description string necessarily (may be number). git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55589 d315682c-612b-4755-9ff5-7f18f6832af3 --- landingPages/dataset/dataset.service.ts | 4 ++-- landingPages/orp/orp.service.ts | 4 ++-- landingPages/publication/publication.service.ts | 4 ++-- landingPages/software/software.service.ts | 4 ++-- services/searchDatasets.service.ts | 4 ++-- services/searchOrps.service.ts | 6 +++--- services/searchPublications.service.ts | 4 ++-- services/searchSoftware.service.ts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/landingPages/dataset/dataset.service.ts b/landingPages/dataset/dataset.service.ts index 4ed63e5f..9af7342d 100644 --- a/landingPages/dataset/dataset.service.ts +++ b/landingPages/dataset/dataset.service.ts @@ -64,9 +64,9 @@ export class DatasetService { this.datasetInfo.dateofacceptance = data[0].dateofacceptance; this.datasetInfo.publisher = data[0].publisher; if(!Array.isArray(data[0].description)) { - this.datasetInfo.description = data[0].description; + this.datasetInfo.description = String(data[0].description); } else { - this.datasetInfo.description = data[0].description[0]; + this.datasetInfo.description = String(data[0].description[0]); } this.datasetInfo.embargoEndDate = data[0].embargoenddate; } diff --git a/landingPages/orp/orp.service.ts b/landingPages/orp/orp.service.ts index c0885dd3..c5286fac 100644 --- a/landingPages/orp/orp.service.ts +++ b/landingPages/orp/orp.service.ts @@ -61,9 +61,9 @@ export class OrpService { this.orpInfo.dateofacceptance = data[0].dateofacceptance; this.orpInfo.publisher = data[0].publisher; if(!Array.isArray(data[0].description)) { - this.orpInfo.description = data[0].description; + this.orpInfo.description = String(data[0].description); } else { - this.orpInfo.description = data[0].description[0]; + this.orpInfo.description = String(data[0].description[0]); } this.orpInfo.embargoEndDate = data[0].embargoenddate; } diff --git a/landingPages/publication/publication.service.ts b/landingPages/publication/publication.service.ts index 3973fd49..5809056f 100644 --- a/landingPages/publication/publication.service.ts +++ b/landingPages/publication/publication.service.ts @@ -66,9 +66,9 @@ export class PublicationService { this.publicationInfo.dateofacceptance = data[0].dateofacceptance; this.publicationInfo.publisher = data[0].publisher; if(!Array.isArray(data[0].description)) { - this.publicationInfo.description = data[0].description; + this.publicationInfo.description = String(data[0].description); } else { - this.publicationInfo.description = data[0].description[0]; + this.publicationInfo.description = String(data[0].description[0]); } this.publicationInfo.embargoEndDate = data[0].embargoenddate; } diff --git a/landingPages/software/software.service.ts b/landingPages/software/software.service.ts index 7fcbef32..5685615e 100644 --- a/landingPages/software/software.service.ts +++ b/landingPages/software/software.service.ts @@ -63,9 +63,9 @@ export class SoftwareService { this.softwareInfo.dateofacceptance = data[0].dateofacceptance; this.softwareInfo.publisher = data[0].publisher; if(!Array.isArray(data[0].description)) { - this.softwareInfo.description = data[0].description; + this.softwareInfo.description = String(data[0].description); } else { - this.softwareInfo.description = data[0].description[0]; + this.softwareInfo.description = String(data[0].description[0]); } this.softwareInfo.embargoEndDate = data[0].embargoenddate; } diff --git a/services/searchDatasets.service.ts b/services/searchDatasets.service.ts index 15c72287..ea398032 100644 --- a/services/searchDatasets.service.ts +++ b/services/searchDatasets.service.ts @@ -238,9 +238,9 @@ export class SearchDatasetsService { var date:string = (resData.dateofacceptance)+""; // transform to string in case it is an integer result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date; if(!Array.isArray(resData.description)) { - result.description = resData.description; + result.description = String(resData.description); } else { - result.description = resData.description[0]; + result.description = String(resData.description[0]); } if(result.description && result.description.length > this.sizeOfDescription) { result.description = result.description.substring(0, this.sizeOfDescription)+"..."; diff --git a/services/searchOrps.service.ts b/services/searchOrps.service.ts index bff49d75..00e68282 100644 --- a/services/searchOrps.service.ts +++ b/services/searchOrps.service.ts @@ -243,15 +243,15 @@ export class SearchOrpsService { var date:string = (resData.dateofacceptance)+""; // transform to string in case it is an integer result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date; if(!Array.isArray(resData.description)) { - result.description = resData.description; + result.description = String(resData.description); } else { - result.description = resData.description[0]; + result.description = String(resData.description[0]); } if(result.description && result.description.length > this.sizeOfDescription) { result.description = result.description.substring(0, this.sizeOfDescription)+"..."; } - result.embargoEndDate = resData.embargoenddate; + result.embargoEndDate = resData.embargoenddate; if(!Array.isArray(resData.publisher)) { result.publisher = resData.publisher; diff --git a/services/searchPublications.service.ts b/services/searchPublications.service.ts index a4f2d3a7..162d61e7 100644 --- a/services/searchPublications.service.ts +++ b/services/searchPublications.service.ts @@ -275,9 +275,9 @@ export class SearchPublicationsService { result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date; if(!Array.isArray(resData.description)) { - result.description = resData.description; + result.description = String(resData.description); } else { - result.description = resData.description[0]; + result.description = String(resData.description[0]); } if(result.description && result.description.length > this.sizeOfDescription) { diff --git a/services/searchSoftware.service.ts b/services/searchSoftware.service.ts index ab27608c..ba9d7075 100644 --- a/services/searchSoftware.service.ts +++ b/services/searchSoftware.service.ts @@ -254,7 +254,7 @@ export class SearchSoftwareService { var date:string = (resData.dateofacceptance)+""; // transform to string in case it is an integer result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date; - result.description = Array.isArray(resData.description) ? resData.description[0] : resData.description; + result.description = Array.isArray(resData.description) ? String(resData.description[0]) : String(resData.description); if(result.description && result.description.length > this.sizeOfDescription) { result.description = result.description.substring(0, this.sizeOfDescription)+"..."; }