Revision 44766
Added by Argiro Kokogiannaki over 7 years ago
searchDatasets.service.ts | ||
---|---|---|
16 | 16 |
|
17 | 17 |
searchDatasets (params: string, refineParams:string, page: number, size: number, refineFields:string[] ):any { |
18 | 18 |
|
19 |
let link = OpenaireProperties.getSearchAPIURL()+"datasets"; |
|
19 |
let link = OpenaireProperties.getSearchAPIURLLast()+"datasets";
|
|
20 | 20 |
|
21 | 21 |
let url = link+"?"; |
22 | 22 |
if(params!= null && params != '' ) { |
... | ... | |
25 | 25 |
if(refineParams!= null && refineParams != '' ) { |
26 | 26 |
url += refineParams; |
27 | 27 |
} |
28 |
url += "&page="+page+"&size="+size;
|
|
28 |
url += "&page="+ (page-1) +"&size="+size+"&format=json";
|
|
29 | 29 |
|
30 | 30 |
let key = url; |
31 | 31 |
if (this._cache.has(key)) { |
... | ... | |
65 | 65 |
}); |
66 | 66 |
} |
67 | 67 |
searchDatasetsForEntity (params: string, page: number, size: number):any { |
68 |
let link = OpenaireProperties.getSearchAPIURL(); |
|
69 |
let url = link+params+"/datasets"; |
|
68 |
let link = OpenaireProperties.getSearchAPIURLLast();
|
|
69 |
let url = link+params+"/datasets"+"?format=json";
|
|
70 | 70 |
let key = url; |
71 | 71 |
if (this._cache.has(key)) { |
72 | 72 |
return Observable.of(this._cache.get(key)); |
... | ... | |
80 | 80 |
} |
81 | 81 |
|
82 | 82 |
searchDatasetsForDataproviders(params: string, page: number, size: number):any { |
83 |
let link = OpenaireProperties.getSearchAPIURL(); |
|
84 |
let url = link+params; |
|
83 |
let link = OpenaireProperties.getSearchAPIURLLast();
|
|
84 |
let url = link+params+"&format=json";
|
|
85 | 85 |
let key = url; |
86 | 86 |
if (this._cache.has(key)) { |
87 | 87 |
return Observable.of(this._cache.get(key)); |
... | ... | |
206 | 206 |
|
207 | 207 |
numOfEntityDatasets(id: string, entity: string):any { |
208 | 208 |
|
209 |
//OpenaireProperties.getSearchAPIURL() |
|
209 |
//OpenaireProperties.getSearchAPIURLLast()
|
|
210 | 210 |
//"http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/" |
211 |
let url = OpenaireProperties.getSearchAPIURL()+entity+id+"/datasets/count"
|
|
211 |
let url = OpenaireProperties.getSearchAPIURLLast()+entity+id+"/datasets/count"+"?format=json";
|
|
212 | 212 |
let key = url; |
213 | 213 |
if (this._cache.has(key)) { |
214 | 214 |
return Observable.of(this._cache.get(key)); |
... | ... | |
223 | 223 |
|
224 | 224 |
numOfSearchDatasets(params: string):any { |
225 | 225 |
|
226 |
//OpenaireProperties.getSearchAPIURL() |
|
226 |
//OpenaireProperties.getSearchAPIURLLast()
|
|
227 | 227 |
//"http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/" |
228 |
let url = OpenaireProperties.getSearchAPIURL()+"datasets/count?q="+params;
|
|
228 |
let url = OpenaireProperties.getSearchAPIURLLast()+"datasets/count?q="+params+"&format=json";
|
|
229 | 229 |
let key = url; |
230 | 230 |
if (this._cache.has(key)) { |
231 | 231 |
return Observable.of(this._cache.get(key)); |
Also available in: Unified diff
Use the new API - not only in Publications but also in any other component