Project

General

Profile

« Previous | Next » 

Revision 55964

Added by Argiro Kokogiannaki almost 5 years ago

[Library|Trunk]

Merge into trunk branch angular7 rev 55729

View differences:

searchCrossref.service.ts
1 

  		




  
  2
  
    
import {throwError as observableThrowError, Observable} from 'rxjs';


  		




  1
  3
  
    
import {Injectable} from '@angular/core';


  		




  2
  4
  
    
import {Http, Response} from '@angular/http';


  		




  3
  
  
    
import {Observable}     from 'rxjs/Observable';


  		




  4
  
  
    
import 'rxjs/add/observable/of';


  		




  5
  
  
    
import 'rxjs/add/operator/do';


  		




  6
  
  
    
import 'rxjs/add/operator/share';


  		




  
  5
  
    

  		




  
  6
  
    

  		




  
  7
  
    

  		




  
  8
  
    
import { HttpClient } from '@angular/common/http';


  		




  
  9
  
    

  		




  7
  10
  
    
import { ClaimResult} from  '../claimEntities.class';


  		




  
  11
  
    
import {map} from "rxjs/operators";


  		




  8
  12
  
    
@Injectable()


  		




  9
  13
  
    
export class SearchCrossrefService {


  		




  10
  
  
    
  constructor( private http: Http ) {}


  		




  
  14
  
    
  constructor( private http: HttpClient ) {}


  		




  11
  15
  
    

  		




  12
  16
  
    

  		




  13
  17
  
    
  searchCrossrefResults (term: string, size : number, page : number, apiUrl:string, parse:boolean = false):any {


  		




  ......




  15
  19
  
    
     let key = url;


  		




  16
  20
  
    

  		




  17
  21
  
    
     return this.http.get(url)


  		




  18
  
  
    
                     .map(request => <any> request.json().message)


  		




  19
  
  
    
                     .map(request => (parse?this.parse(request.items):request))


  		




  
  22
  
    
                     //.map(request => <any> request.json().message)


  		




  
  23
  
    
                     .pipe(map(request => request['message']))


  		




  
  24
  
    
                     .pipe(map(request => (parse?this.parse(request.items):request)))


  		




  20
  25
  
    
                     //.catch(this.handleError);


  		




  21
  26
  
    

  		




  22
  27
  
    
    }


  		




  ......




  31
  36
  
    

  		




  32
  37
  
    

  		




  33
  38
  
    
       return this.http.get(url)


  		




  34
  
  
    
                       .map(request => <any> request.json().message)


  		




  35
  
  
    
                       .map(request => (parse?this.parse(request.items):request))


  		




  
  39
  
    
                       //.map(request => <any> request.json().message)


  		




  
  40
  
    
                       .pipe(map(request => request['message']))


  		




  
  41
  
    
                       .pipe(map(request => (parse?this.parse(request.items):request)))


  		




  36
  42
  
    
                       //.catch(this.handleError);


  		




  37
  43
  
    

  		




  38
  44
  
    
      }


  		




  ......




  46
  52
  
    

  		




  47
  53
  
    

  		




  48
  54
  
    
         return this.http.get(url)


  		




  49
  
  
    
                         .map(request => <any> request.json().message)


  		




  50
  
  
    
                         .map(request => (parse?this.parse(request.items):request))


  		




  
  55
  
    
                         //.map(request => <any> request.json().message)


  		




  
  56
  
    
                         .pipe(map(request => request['message']))


  		




  
  57
  
    
                         .pipe(map(request => (parse?this.parse(request.items):request)))


  		




  51
  58
  
    
                         //.catch(this.handleError);


  		




  52
  59
  
    

  		




  53
  60
  
    
        }


  		




  ......




  56
  63
  
    
    // in a real world app, we may send the error to some remote logging infrastructure


  		




  57
  64
  
    
    // instead of just logging it to the console


  		




  58
  65
  
    
    console.log(error);


  		




  59
  
  
    
    return Observable.throw(error  || 'Server error');


  		




  
  66
  
    
    return observableThrowError(error  || 'Server error');


  		




  60
  67
  
    
  }


  		




  61
  68
  
    
  parse(response):ClaimResult[]{


  		




  62
  69
  
    
    var results:ClaimResult[] = [];


  		












Also available in:  Unified diff