Merge branch 'angular-14' of code-repo.d4science.org:MaDgIK/openaire-library into angular-14
This commit is contained in:
commit
ee71b895bf
|
@ -107,14 +107,14 @@ export class ISVocabulariesService {
|
||||||
|
|
||||||
getLocalVocabularyFromService(vocabularyName: string, properties: EnvProperties): Observable<AutoCompleteValue[]> {
|
getLocalVocabularyFromService(vocabularyName: string, properties: EnvProperties): Observable<AutoCompleteValue[]> {
|
||||||
if(vocabularyName == "sdg"){
|
if(vocabularyName == "sdg"){
|
||||||
let url = properties.domain+"/assets/vocabulary/sdg.json";
|
let url = properties.domain+"/assets/common-assets/vocabulary/sdg.json";
|
||||||
return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
||||||
//.map(res => <any> res.json())
|
//.map(res => <any> res.json())
|
||||||
.pipe(map(res => res['sdg']))
|
.pipe(map(res => res['sdg']))
|
||||||
.pipe(map(res => this.parseSDGs(res)))
|
.pipe(map(res => this.parseSDGs(res)))
|
||||||
.pipe(catchError(this.handleError));
|
.pipe(catchError(this.handleError));
|
||||||
}else if( vocabularyName == "fos"){
|
}else if( vocabularyName == "fos"){
|
||||||
let url = properties.domain+"/assets/vocabulary/fos.json";
|
let url = properties.domain+"/assets/common-assets/vocabulary/fos.json";
|
||||||
return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
||||||
//.map(res => <any> res.json())
|
//.map(res => <any> res.json())
|
||||||
.pipe(map(res => res['fos']))
|
.pipe(map(res => res['fos']))
|
||||||
|
|
Loading…
Reference in New Issue