Project

General

Profile

« Previous | Next » 

Revision 61286

Added by Antonis Lempesis 4 months ago

merged gradient and then querie_names branches

View differences:

data.service.ts
27 27
  }
28 28

  
29 29
  public getOverviewMapData(): Observable<RawData> {
30
    const mapDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.publications.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
30
    const mapDataQuery = `{"series":[{"query":{"name":"oso.results.affiliated","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data","profile":"${this.profileName}"}},{"query":{"name":"oso.journals","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
31 31
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(mapDataQuery), headerOptions);
32 32
  }
33 33

  
34 34
  public getCountryOverviewData(countryCode: string): Observable<RawData> {
35
    const countryOverviewDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.publications.deposited.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
35
    const countryOverviewDataQuery = `{"series":[{"query":{"name":"oso.results.affiliated.country", "parameters":["${countryCode}","publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited.country", "parameters":["${countryCode}","publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated.country", "parameters":["${countryCode}","dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited.country", "parameters":["${countryCode}","dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
36 36
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryOverviewDataQuery), headerOptions);
37 37
  }
38 38

  
39 39
  public getCountryOAData(countryCode: string): Observable<RawData> {
40
    const countryOADataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["software","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["other","${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
40
    const countryOADataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","other"],"profile":"${this.profileName}"}}],"verbose":true}`;
41 41
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryOADataQuery), headerOptions);
42 42
  }
43 43

  
44 44
  public getEuropeOverviewData(): Observable<RawData> {
45
    const overviewRawDataQuery = `{"series":[{"query":{"name":"new.oso.publications.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.europe","profile":"${this.profileName}"}}],"verbose":true}`;
45
    const overviewRawDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies.europe","profile":"${this.profileName}"}}],"verbose":true}`;
46 46
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewRawDataQuery), headerOptions);
47 47
  }
48 48

  
49 49
  public getOverviewTableAbsoluteData(content: string): Observable<RawData> {
50 50
    let overviewTableAbsoluteDataQuery = '';
51 51
    if (content === 'affiliated') {
52
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
52
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"oso.results.affiliated","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"oso.journals","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
53 53
    } else if (content === 'affiliated_peer_reviewed') {
54
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
54
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"oso.results.affiliated.peer_reviewed","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated.peer_reviewed","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated.peer_reviewed","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.affiliated.peer_reviewed","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"oso.journals","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
55 55
    } else if (content === 'deposited') {
56
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
56
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"oso.results.deposited","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"oso.journals","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
57 57
    } else if (content === 'deposited_peer_reviewed') {
58
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
58
      overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"oso.results.deposited.peer_reviewed","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited.peer_reviewed","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited.peer_reviewed","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.deposited.peer_reviewed","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"oso.journals","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
59 59
    }
60 60
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewTableAbsoluteDataQuery), headerOptions);
61 61
  }
......
63 63
  public getOverviewTablePercentageData(content: string): Observable<RawData> {
64 64
    let overviewTablePercentageDataQuery = '';
65 65
    if (content === 'affiliated') {
66
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
66
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
67 67
    } else if (content === 'affiliated_peer_reviewed') {
68
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
68
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
69 69
    } else if (content === 'deposited') {
70
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
70
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.deposited.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
71 71
    } else if (content === 'deposited_peer_reviewed') {
72
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
72
      overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
73 73
    }
74 74
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewTablePercentageDataQuery), headerOptions);
75 75
  }
76 76

  
77 77
  public getLeadingOpenScienceMobileData(): Observable<RawData> {
78
    const leadingOpenScienceMobileDataQuery = `{"series":[{"query":{"name":"new.oso.mobile.overview","profile":"${this.profileName}"}}],"verbose":true}`;
78
    const leadingOpenScienceMobileDataQuery = `{"series":[{"query":{"name":"oso.mobile.overview","profile":"${this.profileName}"}}],"verbose":true}`;
79 79
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(leadingOpenScienceMobileDataQuery), headerOptions);
80 80
  }
81 81

  
82 82
  public getEuropeOAPercentages(): Observable<RawData> {
83
    const europeOAPercentagesQuery = `{"series":[{"query":{"name":"new.oso.publications.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.oa_percentage","profile":"${this.profileName}"}}],"verbose":true}`;
83
    const europeOAPercentagesQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["other"],"profile":"${this.profileName}"}}],"verbose":true}`;
84 84
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(europeOAPercentagesQuery), headerOptions);
85 85
  }
86 86

  
87 87
  public getCountryPageOverviewData(countryCode: string): Observable<RawData> {
88
    const countryPageOverviewDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.rnd.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.funder.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.funding_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.ec_funded_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
88
    const countryPageOverviewDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.country", "parameters":["${countryCode}","dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage.deposited.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.rnd.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.funder.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.funding_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.ec_funded_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
89 89
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryPageOverviewDataQuery), headerOptions);
90 90
  }
91 91

  
92 92
  public getFundersResults(): Observable<RawData> {
93
    const fundersResultsQuery = `{"series":[{"query":{"name":"new.oso.funders.results","profile":"${this.profileName}"}}],"verbose":true}`;
93
    const fundersResultsQuery = `{"series":[{"query":{"name":"oso.funders.results","profile":"${this.profileName}"}}],"verbose":true}`;
94 94
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsQuery), headerOptions);
95 95
  }
96 96

  
97 97
  public getFundersResultsByType(type: string): Observable<RawData> {
98
    const fundersResultsByTypeQuery = `{"series":[{"query":{"name":"new.oso.funders.results.type", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
98
    const fundersResultsByTypeQuery = `{"series":[{"query":{"name":"oso.funders.results.type", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
99 99
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeQuery), headerOptions);
100 100
  }
101 101

  
102 102
  public getFundersResultsByTypeForPID(type: string): Observable<RawData> {
103
    const fundersResultsByTypeForPIDQuery = `{"series":[{"query":{"name":"new.oso.results.pid.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
103
    const fundersResultsByTypeForPIDQuery = `{"series":[{"query":{"name":"oso.results.pid.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
104 104
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForPIDQuery), headerOptions);
105 105
  }
106 106

  
107 107
  public getFundersResultsByTypeForLicence(type: string): Observable<RawData> {
108
    const fundersResultsByTypeForLicenceQuery = `{"series":[{"query":{"name":"new.oso.results.licence.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
108
    const fundersResultsByTypeForLicenceQuery = `{"series":[{"query":{"name":"oso.results.licence.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
109 109
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForLicenceQuery), headerOptions);
110 110
  }
111 111

  
112 112
  public getFundersResultsByTypeForGold(type: string): Observable<RawData> {
113
    const fundersResultsByTypeForGoldQuery = `{"series":[{"query":{"name":"new.oso.results.gold.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
113
    const fundersResultsByTypeForGoldQuery = `{"series":[{"query":{"name":"oso.results.gold.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
114 114
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForGoldQuery), headerOptions);
115 115
  }
116 116

  
117 117
  public getFundersResultsByTypeForGreen(type: string): Observable<RawData> {
118
    const fundersResultsByTypeForGreenQuery = `{"series":[{"query":{"name":"new.oso.results.green.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
118
    const fundersResultsByTypeForGreenQuery = `{"series":[{"query":{"name":"oso.results.green.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
119 119
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForGreenQuery), headerOptions);
120 120
  }
121 121

  
122 122
  public getFundersResultsByTypeForCountry(type: string, countryCode: string): Observable<RawData> {
123
    const fundersResultsByTypeForCountryQuery = `{"series":[{"query":{"name":"new.oso.results.affiliated.byfunder.country", "parameters":["${countryCode}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
123
    const fundersResultsByTypeForCountryQuery = `{"series":[{"query":{"name":"oso.results.affiliated.byfunder.country", "parameters":["${countryCode}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
124 124
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForCountryQuery), headerOptions);
125 125
  }
126 126

  
127 127
  public getFundersResultsByTypeForIndicatorForCountry(type: string, indicator: string, countryCode: string): Observable<RawData> {
128
    const fundersResultsByTypeForPIDForCountryQuery = `{"series":[{"query":{"name":"new.oso.results.${indicator}.affiliated.byfunder.country", "parameters":["${type}","${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
128
    const fundersResultsByTypeForPIDForCountryQuery = `{"series":[{"query":{"name":"oso.results.${indicator}.affiliated.byfunder.country", "parameters":["${type}","${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
129 129
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForPIDForCountryQuery), headerOptions);
130 130
  }
131 131

  
......
133 133

  
134 134
    let indicatorsTableDataQuery = '';
135 135
    if (content === 'affiliated') {
136
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
136
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
137 137
    } else if (content === 'affiliated_peer_reviewed') {
138
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
138
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
139 139
    } else if (content === 'deposited') {
140
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
140
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
141 141
    } else if (content === 'deposited_peer_reviewed') {
142
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
142
      indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
143 143
    }
144 144
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(indicatorsTableDataQuery), headerOptions);
145 145
  }

Also available in: Unified diff