diff --git a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts index 6044fc57..00a845d1 100644 --- a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts +++ b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts @@ -261,7 +261,11 @@ export class EntitiesAutocompleteComponent { this.selected.push( data[0]); this.showInput = false; }, - err => console.log("An error occured")); + err => { + //console.log("An error occured")); + this.handleError("Error getting results of type: "+this.entityType+" with id: "+this.selectedValue, err); + } + ); } } @@ -282,4 +286,7 @@ export class EntitiesAutocompleteComponent { } } + private handleError(message: string, error) { + console.error("Autocomplete (component): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchDataproviders.class.ts b/utils/fetchEntitiesClasses/fetchDataproviders.class.ts index 415a2503..e162a274 100644 --- a/utils/fetchEntitiesClasses/fetchDataproviders.class.ts +++ b/utils/fetchEntitiesClasses/fetchDataproviders.class.ts @@ -1,10 +1,12 @@ import {SearchDataprovidersService} from '../../services/searchDataproviders.service'; import { ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import{EnvProperties} from '../../utils/properties/env-properties'; import {StringUtils} from '../../utils/string-utils.class'; export class FetchDataproviders { private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; public searchUtils:SearchUtilsClass = new SearchUtilsClass(); @@ -19,6 +21,7 @@ export class FetchDataproviders { constructor ( private _searchDataprovidersService: SearchDataprovidersService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; } @@ -55,7 +58,7 @@ export class FetchDataproviders { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -69,6 +72,9 @@ export class FetchDataproviders { } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; } + */ + this.handleError("Error getting content providers for keyword: "+keyword, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -91,7 +97,7 @@ export class FetchDataproviders { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) if(err.status == '404') { this.searchUtils.status = this.errorCodes.NOT_FOUND; @@ -99,7 +105,9 @@ export class FetchDataproviders { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers with parameters: "+parameters + " for Home", err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -121,7 +129,7 @@ export class FetchDataproviders { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -134,7 +142,9 @@ export class FetchDataproviders { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -154,7 +164,7 @@ export class FetchDataproviders { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -167,7 +177,9 @@ export class FetchDataproviders { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting number of content providers for keyword: "+keyword, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -208,7 +220,7 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number, this.oldTotalResults = this.searchUtils.totalResults; }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -221,7 +233,10 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers in share "+type+" for organization with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); + this.loadPaging = true; this.oldTotalResults = 0; } @@ -262,7 +277,7 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, this.oldTotalResults = this.searchUtils.totalResults; }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -275,7 +290,10 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers in share "+type+" by subject: "+subject, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); + this.loadPaging = true; this.oldTotalResults = 0; } @@ -307,7 +325,7 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -320,7 +338,9 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -343,7 +363,7 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -356,8 +376,14 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting content providers for entity registry with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } + + private handleError(message: string, error) { + console.error("Fetch Content Providers (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchDatasets.class.ts b/utils/fetchEntitiesClasses/fetchDatasets.class.ts index 3ac183f5..f18f77dc 100644 --- a/utils/fetchEntitiesClasses/fetchDatasets.class.ts +++ b/utils/fetchEntitiesClasses/fetchDatasets.class.ts @@ -1,5 +1,6 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service'; import { ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import {DOI} from '../../utils/string-utils.class'; import {Subject} from 'rxjs/Subject'; @@ -7,6 +8,7 @@ import{EnvProperties} from '../../utils/properties/env-properties'; import {StringUtils} from '../../utils/string-utils.class'; export class FetchDatasets{ private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; public requestComplete: Subject; @@ -20,6 +22,7 @@ export class FetchDatasets{ constructor ( private _searchDatasetsService: SearchDatasetsService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; this.requestComplete = new Subject(); @@ -70,6 +73,7 @@ export class FetchDatasets{ } }, err => { + /* console.log(err); //TODO check erros (service not available, bad request) // if( ){ @@ -84,6 +88,9 @@ export class FetchDatasets{ } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; } + */ + this.handleError("Error getting research data for keyword: "+keyword + (doisParams ? "(DOI)" : ""), err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -105,6 +112,7 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ } }, err => { + /* console.log(err); //TODO check erros (service not available, bad request) // if( ){ @@ -119,6 +127,9 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; } + */ + this.handleError("Error getting research data for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -151,6 +162,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, } }, err => { + /* console.log(err); //TODO check erros (service not available, bad request) // if( ){ @@ -165,6 +177,9 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; } + */ + this.handleError("Error getting research data for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -196,6 +211,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s } }, err => { + /* console.log(err); //TODO check erros (service not available, bad request) // if( ){ @@ -209,7 +225,9 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting research data for content provider ("+resultsFrom+") with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -233,6 +251,7 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.requestComplete.complete(); }, err => { + /* console.log(err); //console.info("status: "+err.status); //TODO check erros (service not available, bad request) @@ -247,11 +266,16 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting research data for aggregator with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); this.requestComplete.complete(); } ); } + private handleError(message: string, error) { + console.error("Fetch Research Data (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchOrganizations.class.ts b/utils/fetchEntitiesClasses/fetchOrganizations.class.ts index 97bdb4fb..5dbceb19 100644 --- a/utils/fetchEntitiesClasses/fetchOrganizations.class.ts +++ b/utils/fetchEntitiesClasses/fetchOrganizations.class.ts @@ -1,10 +1,12 @@ import {SearchOrganizationsService} from '../../services/searchOrganizations.service'; import { ErrorCodes} from '../../utils/properties/errorCodes'; + import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import{EnvProperties} from '../../utils/properties/env-properties'; import {StringUtils} from '../../utils/string-utils.class'; export class FetchOrganizations { private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; @@ -17,6 +19,7 @@ export class FetchOrganizations { constructor ( private _searchOrganizationsService: SearchOrganizationsService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; } @@ -54,7 +57,7 @@ export class FetchOrganizations { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -68,10 +71,14 @@ export class FetchOrganizations { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting organization for keyword: "+keyword, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } - + private handleError(message: string, error) { + console.error("Fetch Organizations (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchOrps.class.ts b/utils/fetchEntitiesClasses/fetchOrps.class.ts index 3bc5b457..3198f9c0 100644 --- a/utils/fetchEntitiesClasses/fetchOrps.class.ts +++ b/utils/fetchEntitiesClasses/fetchOrps.class.ts @@ -1,5 +1,6 @@ import {SearchOrpsService} from '../../services/searchOrps.service'; import { ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import {DOI} from '../../utils/string-utils.class'; import {Subject} from 'rxjs/Subject'; @@ -8,6 +9,7 @@ import {StringUtils} from '../../utils/string-utils.class'; export class FetchOrps{ private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; public requestComplete: Subject; @@ -21,6 +23,7 @@ export class FetchOrps{ constructor ( private _searchOrpsService: SearchOrpsService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; this.requestComplete = new Subject(); @@ -68,6 +71,7 @@ export class FetchOrps{ } }, err => { + /* console.log(err); //TODO check erros (service not available, bad request) if(err.status == '404') { @@ -76,7 +80,9 @@ export class FetchOrps{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting other research products for keyword: "+keyword+ (doisParams ? "(DOI)" : ""), err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -96,7 +102,7 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) if(err.status == '404') { this.searchUtils.status = this.errorCodes.NOT_FOUND; @@ -104,7 +110,9 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting number of other research products for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -133,7 +141,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) if(err.status == '404') { this.searchUtils.status = this.errorCodes.NOT_FOUND; @@ -141,7 +149,9 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting other research products for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -172,7 +182,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) if(err.status == '404') { this.searchUtils.status = this.errorCodes.NOT_FOUND; @@ -180,7 +190,9 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting other research products for content provider ("+resultsFrom+") with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -202,7 +214,7 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.requestComplete.complete(); }, err => { - console.log(err); + /*console.log(err); //console.info("status: "+err.status); //TODO check erros (service not available, bad request) if(err.status == '404') { @@ -211,11 +223,16 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting other research products for aggrgator with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); this.requestComplete.complete(); } ); } + private handleError(message: string, error) { + console.error("Fetch Other Research Data (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchProjects.class.ts b/utils/fetchEntitiesClasses/fetchProjects.class.ts index f01e59a6..2e836f22 100644 --- a/utils/fetchEntitiesClasses/fetchProjects.class.ts +++ b/utils/fetchEntitiesClasses/fetchProjects.class.ts @@ -1,10 +1,12 @@ import {SearchProjectsService} from '../../services/searchProjects.service'; import {ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import{EnvProperties} from '../../utils/properties/env-properties'; import {StringUtils} from '../../utils/string-utils.class'; export class FetchProjects{ private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; @@ -18,6 +20,7 @@ export class FetchProjects{ constructor (private _searchProjectsService: SearchProjectsService) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; } @@ -53,7 +56,7 @@ export class FetchProjects{ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -66,7 +69,9 @@ export class FetchProjects{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting projects for keyword: "+keyword, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -88,7 +93,7 @@ export class FetchProjects{ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -101,7 +106,9 @@ export class FetchProjects{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting projects for content provider with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -123,7 +130,7 @@ export class FetchProjects{ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -137,7 +144,9 @@ export class FetchProjects{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting number of projects for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -188,7 +197,7 @@ export class FetchProjects{ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -201,10 +210,14 @@ export class FetchProjects{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting projects for organization with id: "+organizationId, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } - + private handleError(message: string, error) { + console.error("Fetch Projects (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchPublications.class.ts b/utils/fetchEntitiesClasses/fetchPublications.class.ts index 7bd68dab..7f862913 100644 --- a/utils/fetchEntitiesClasses/fetchPublications.class.ts +++ b/utils/fetchEntitiesClasses/fetchPublications.class.ts @@ -1,6 +1,7 @@ import {SearchPublicationsService} from '../../services/searchPublications.service'; import {ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchFields, FieldDetails} from '../../utils/properties/searchFields'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import {DOI} from '../../utils/string-utils.class'; @@ -9,6 +10,7 @@ import{EnvProperties} from '../../utils/properties/env-properties'; import {StringUtils} from '../../utils/string-utils.class'; export class FetchPublications { private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; @@ -34,6 +36,7 @@ export class FetchPublications { constructor ( private _searchPublicationsService: SearchPublicationsService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; this.requestComplete = new Subject(); @@ -82,7 +85,7 @@ export class FetchPublications { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -95,7 +98,9 @@ export class FetchPublications { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting publications for keyword: "+keyword + (doisParams ? "(DOI)" : ""), err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -117,7 +122,7 @@ export class FetchPublications { } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -130,7 +135,9 @@ export class FetchPublications { this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting publications for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -162,7 +169,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -176,7 +183,9 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting publications for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -208,7 +217,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -221,7 +230,9 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting publications for content provider ("+resultsFrom+") with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -245,7 +256,7 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.requestComplete.complete(); }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -258,12 +269,16 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting publications for aggregator with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); this.requestComplete.complete(); } ); } - + private handleError(message: string, error) { + console.error("Fetch Publications (class): "+message, error); + } } diff --git a/utils/fetchEntitiesClasses/fetchSoftware.class.ts b/utils/fetchEntitiesClasses/fetchSoftware.class.ts index bb6ebcc2..1face028 100644 --- a/utils/fetchEntitiesClasses/fetchSoftware.class.ts +++ b/utils/fetchEntitiesClasses/fetchSoftware.class.ts @@ -1,5 +1,6 @@ import {SearchSoftwareService} from '../../services/searchSoftware.service'; import { ErrorCodes} from '../../utils/properties/errorCodes'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class'; import {DOI} from '../../utils/string-utils.class'; import {Subject} from 'rxjs/Subject'; @@ -8,6 +9,7 @@ import {StringUtils} from '../../utils/string-utils.class'; export class FetchSoftware{ private errorCodes: ErrorCodes; + private errorMessages: ErrorMessagesComponent; public results =[]; public requestComplete: Subject; @@ -21,6 +23,7 @@ export class FetchSoftware{ constructor ( private _searchSoftwareService: SearchSoftwareService ) { this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); this.searchUtils.status = this.errorCodes.LOADING; this.requestComplete = new Subject(); @@ -71,7 +74,7 @@ export class FetchSoftware{ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -84,7 +87,9 @@ export class FetchSoftware{ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting software for keyword: "+keyword + (doisParams ? "(DOI)" : ""), err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -106,7 +111,7 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -119,7 +124,9 @@ public getNumForEntity(entity:string, id:string, properties:EnvProperties){ this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting software for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -150,7 +157,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -163,7 +170,9 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number, this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting software for "+entity+" with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -195,7 +204,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s } }, err => { - console.log(err); + /*console.log(err); //TODO check erros (service not available, bad request) // if( ){ // this.searchUtils.status = ErrorCodes.ERROR; @@ -208,7 +217,9 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting software for content provider ("+resultsFrom+") with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } ); } @@ -232,7 +243,7 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.requestComplete.complete(); }, err => { - console.log(err); + /*console.log(err); //console.info("status: "+err.status); //TODO check erros (service not available, bad request) // if( ){ @@ -246,11 +257,16 @@ public getAggregatorResults(id:string, page: number, size: number, properties:En this.searchUtils.status = this.errorCodes.ERROR; } else { this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } + }*/ + this.handleError("Error getting software for aggregator with id: "+id, err); + this.searchUtils.status = this.errorMessages.getErrorCode(err.status); this.requestComplete.complete(); } ); } + private handleError(message: string, error) { + console.error("Fetch Software (class): "+message, error); + } } diff --git a/utils/helper/helper.component.ts b/utils/helper/helper.component.ts index bd12cc94..58131f80 100644 --- a/utils/helper/helper.component.ts +++ b/utils/helper/helper.component.ts @@ -55,8 +55,12 @@ export class HelperComponent { this.texts = data; }, err => { - console.log(err); - + //console.log(err); + if(this.div) { + this.handleError("Error getting helper for route: "+location.pathname+" and div: "+this.div+" in community with id: "+this.communityId, err); + } else { + this.handleError("Error getting helper for route: "+location.pathname+", position: "+this.position+", before parameter:"+this.before+" in community with id: "+this.communityId, err); + } } ); } @@ -78,4 +82,8 @@ buildTooltip():string{ text+=""; return text; } + + private handleError(message: string, error) { + console.error("Helper (component): "+message, error); + } } diff --git a/utils/staticAutoComplete/staticAutoComplete.component.ts b/utils/staticAutoComplete/staticAutoComplete.component.ts index d1f922b8..27cc49bc 100644 --- a/utils/staticAutoComplete/staticAutoComplete.component.ts +++ b/utils/staticAutoComplete/staticAutoComplete.component.ts @@ -103,7 +103,8 @@ export class StaticAutoCompleteComponent implements OnChanges{ }, err => { - console.log(err); + //console.log(err); + this.handleError("Error getting vocabulary with id: "+this.vocabularyId+" for "+this.entityName, err); this.warningMessage = "An Error occured..." } ); @@ -115,7 +116,8 @@ export class StaticAutoCompleteComponent implements OnChanges{ }, err => { - console.log(err); + //console.log(err); + this.handleError("Error getting results for refine field: "+this.fieldName+" for "+this.entityName, err); this.warningMessage = "An Error occured..." } ); @@ -297,4 +299,7 @@ export class StaticAutoCompleteComponent implements OnChanges{ } } + private handleError(message: string, error) { + console.error("Static Autocomplete (component): "+message, error); + } }