Revision 55964
Added by Argiro Kokogiannaki almost 5 years ago
| project.service.ts | ||
|---|---|---|
| 1 | 1 |
import {Injectable} from '@angular/core';
|
| 2 | 2 |
import {Http, Response} from '@angular/http';
|
| 3 |
import {Observable} from 'rxjs/Observable';
|
|
| 3 |
import {HttpClient, HttpErrorResponse} from "@angular/common/http";
|
|
| 4 |
import {Observable, throwError} from 'rxjs';
|
|
| 4 | 5 |
import {ProjectInfo} from '../../utils/entities/projectInfo';
|
| 5 |
import 'rxjs/add/observable/of'; |
|
| 6 |
import 'rxjs/add/operator/do'; |
|
| 7 |
import 'rxjs/add/operator/share'; |
|
| 6 |
|
|
| 7 |
|
|
| 8 |
|
|
| 8 | 9 |
import{EnvProperties} from '../../utils/properties/env-properties';
|
| 9 | 10 |
|
| 10 | 11 |
import { ParsingFunctions } from '../landing-utils/parsingFunctions.class';
|
| 12 |
import {map} from "rxjs/operators";
|
|
| 11 | 13 |
|
| 12 | 14 |
@Injectable() |
| 13 | 15 |
export class ProjectService {
|
| 14 | 16 |
|
| 15 |
constructor(private http: Http ) {
|
|
| 17 |
constructor(private http: HttpClient ) {
|
|
| 16 | 18 |
this.parsingFunctions = new ParsingFunctions(); |
| 17 | 19 |
} |
| 18 | 20 |
|
| ... | ... | |
| 25 | 27 |
let key = url; |
| 26 | 28 |
|
| 27 | 29 |
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) |
| 28 |
.map(res => <any> res.json()) |
|
| 29 |
.map(res => res['result']['metadata']['oaf:entity']['oaf:project'])
|
|
| 30 |
.map(res => [res, |
|
| 30 |
//.map(res => <any> res.json())
|
|
| 31 |
.pipe(map(res => res['result']['metadata']['oaf:entity']['oaf:project']))
|
|
| 32 |
.pipe(map(res => [res,
|
|
| 31 | 33 |
res['fundingtree'], |
| 32 |
res['rels']['rel']]) |
|
| 33 |
.map(res => this.parseProjectInfo(res, properties));
|
|
| 34 |
res['rels']['rel']]))
|
|
| 35 |
.pipe(map(res => this.parseProjectInfo(res, properties)));
|
|
| 34 | 36 |
|
| 35 | 37 |
} |
| 36 | 38 |
|
| ... | ... | |
| 43 | 45 |
let key = url; |
| 44 | 46 |
|
| 45 | 47 |
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) |
| 46 |
.map(res => <any> res.json()) |
|
| 47 |
.map(res => res['results'][0])
|
|
| 48 |
.map(res => [res['result']['metadata']['oaf:entity']['oaf:project'],res['result']['header']['dri:objIdentifier']])
|
|
| 49 |
.map(res => [res[0], |
|
| 48 |
//.map(res => <any> res.json())
|
|
| 49 |
.pipe(map(res => res['results'][0]))
|
|
| 50 |
.pipe(map(res => [res['result']['metadata']['oaf:entity']['oaf:project'],res['result']['header']['dri:objIdentifier']]))
|
|
| 51 |
.pipe(map(res => [res[0],
|
|
| 50 | 52 |
res[0]['fundingtree'], |
| 51 |
res[0]['rels']['rel'],res[1]]) |
|
| 52 |
.map(res => this.parseProjectInfo(res, properties));
|
|
| 53 |
res[0]['rels']['rel'],res[1]]))
|
|
| 54 |
.pipe(map(res => this.parseProjectInfo(res, properties)));
|
|
| 53 | 55 |
|
| 54 | 56 |
} |
| 55 | 57 |
/* |
| ... | ... | |
| 61 | 63 |
let key = url+'_projectDates'; |
| 62 | 64 |
|
| 63 | 65 |
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) |
| 64 |
.map(res => <any> res.json()) |
|
| 65 |
.map(res => res['result']['metadata']['oaf:entity']['oaf:project'])
|
|
| 66 |
.map(res => [res, |
|
| 66 |
//.map(res => <any> res.json())
|
|
| 67 |
.pipe(map(res => res['result']['metadata']['oaf:entity']['oaf:project']))
|
|
| 68 |
.pipe(map(res => [res,
|
|
| 67 | 69 |
res['fundingtree'], |
| 68 |
res['rels']['rel']]) |
|
| 69 |
.map(res => this.parseProjectDates(id,res))
|
|
| 70 |
res['rels']['rel']]))
|
|
| 71 |
.pipe(map(res => this.parseProjectDates(id,res)))
|
|
| 70 | 72 |
|
| 71 | 73 |
} |
| 72 | 74 |
|
| ... | ... | |
| 75 | 77 |
let key = url; |
| 76 | 78 |
|
| 77 | 79 |
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) |
| 78 |
.map(res => <any> res.json()) |
|
| 79 |
.map(res => res['result']['metadata']['oaf:entity']['oaf:project'])
|
|
| 80 |
.map(res => this.parseHTMLInfo(res));
|
|
| 80 |
//.map(res => <any> res.json())
|
|
| 81 |
.pipe(map(res => res['result']['metadata']['oaf:entity']['oaf:project']))
|
|
| 82 |
.pipe(map(res => this.parseHTMLInfo(res)));
|
|
| 81 | 83 |
} |
| 82 | 84 |
|
| 83 |
private handleError (error: Response) {
|
|
| 85 |
private handleError (error: HttpErrorResponse) {
|
|
| 84 | 86 |
console.log(error); |
| 85 |
return Observable.throw(error || 'Server error');
|
|
| 87 |
return throwError(error || 'Server error');
|
|
| 86 | 88 |
} |
| 87 | 89 |
|
| 88 | 90 |
parseHTMLInfo (data: any):any {
|
Also available in: Unified diff
[Library|Trunk]
Merge into trunk branch angular7 rev 55729