Revision 44766
Added by Argiro Kokogiannaki over 7 years ago
searchProjects.service.ts | ||
---|---|---|
19 | 19 |
|
20 | 20 |
console.info("In searchProjects"); |
21 | 21 |
|
22 |
let link = OpenaireProperties.getSearchAPIURL()+"projects"; |
|
22 |
let link = OpenaireProperties.getSearchAPIURLLast()+"projects";
|
|
23 | 23 |
|
24 | 24 |
let url = link+"?"; |
25 | 25 |
if(params!= null && params != '' ) { |
... | ... | |
28 | 28 |
if(refineParams!= null && refineParams != '' ) { |
29 | 29 |
url += refineParams; |
30 | 30 |
} |
31 |
url += "&page="+page+"&size="+size;
|
|
31 |
url += "&page="+(page-1)+"&size="+size + "&format=json";
|
|
32 | 32 |
let key = url; |
33 | 33 |
if (this._cache.has(key)) { |
34 | 34 |
return Observable.of(this._cache.get(key)); |
... | ... | |
90 | 90 |
}); |
91 | 91 |
} |
92 | 92 |
getFunders():any { |
93 |
let url = OpenaireProperties.getSearchAPIURL()+"projects?refine=true&fields=funderid&size=0";
|
|
93 |
let url = OpenaireProperties.getSearchAPIURLLast()+"projects?refine=true&fields=funderid&size=0"+ "&format=json";;
|
|
94 | 94 |
let key = url; |
95 | 95 |
if (this._cache.has(key)) { |
96 | 96 |
return Observable.of(this._cache.get(key)); |
... | ... | |
206 | 206 |
|
207 | 207 |
numOfEntityProjects(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+"/projects/count"
|
|
211 |
let url = OpenaireProperties.getSearchAPIURLLast()+entity+id+"/projects/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 |
numOfSearchProjects(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()+"projects/count?q="+params;
|
|
228 |
let url = OpenaireProperties.getSearchAPIURLLast()+"projects/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