Revision 44907
Added by Argiro Kokogiannaki over 7 years ago
searchDataproviders.service.ts | ||
---|---|---|
27 | 27 |
|
28 | 28 |
let key = url; |
29 | 29 |
if (this._cache.has(key)) { |
30 |
return Observable.of(this._cache.get(key)); |
|
30 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]);
|
|
31 | 31 |
} |
32 | 32 |
return this.http.get(url) |
33 | 33 |
.map(res => <any> res.json()) |
34 | 34 |
//.do(res => console.info(res)) |
35 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]) |
|
36 | 35 |
.do(res => { |
37 | 36 |
this._cache.set(key, res); |
38 |
}); |
|
37 |
}) |
|
38 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]); |
|
39 | 39 |
} |
40 | 40 |
//((oaftype exact datasource) and(collectedfromdatasourceid exact "openaire____::47ce9e9f4fad46e732cff06419ecaabb")) |
41 | 41 |
advancedSearchDataproviders (params: string, page: number, size: number ):any { |
... | ... | |
52 | 52 |
url += "&format=json"; |
53 | 53 |
let key = url; |
54 | 54 |
if (this._cache.has(key)) { |
55 |
return Observable.of(this._cache.get(key));
|
|
55 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results'])])
|
|
56 | 56 |
} |
57 | 57 |
return this.http.get(url) |
58 | 58 |
.map(res => <any> res.json()) |
59 | 59 |
//.do(res => console.info(res)) |
60 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]) |
|
61 | 60 |
.do(res => { |
62 | 61 |
this._cache.set(key, res); |
63 |
}); |
|
62 |
}) |
|
63 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]) |
|
64 | 64 |
} |
65 | 65 |
searchCompatibleDataproviders (params: string,refineParams:string, page: number, size: number, refineFields:string[] ):any { |
66 | 66 |
let url = OpenaireProperties.getSearchResourcesAPIURL(); |
... | ... | |
75 | 75 |
url += "&format=json"; |
76 | 76 |
let key = url; |
77 | 77 |
if (this._cache.has(key)) { |
78 |
return Observable.of(this._cache.get(key)); |
|
78 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]);
|
|
79 | 79 |
} |
80 | 80 |
return this.http.get(url) |
81 | 81 |
.map(res => <any> res.json()) |
82 | 82 |
//.do(res => console.info(res)) |
83 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]) |
|
84 | 83 |
.do(res => { |
85 | 84 |
this._cache.set(key, res); |
86 |
}); |
|
85 |
}) |
|
86 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]); |
|
87 | 87 |
} |
88 | 88 |
searchEntityRegistries (params: string,refineParams:string, page: number, size: number, refineFields:string[] ):any { |
89 | 89 |
let url = OpenaireProperties.getSearchResourcesAPIURL(); |
... | ... | |
98 | 98 |
url += "&format=json"; |
99 | 99 |
let key = url; |
100 | 100 |
if (this._cache.has(key)) { |
101 |
return Observable.of(this._cache.get(key)); |
|
101 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]);
|
|
102 | 102 |
} |
103 | 103 |
return this.http.get(url) |
104 | 104 |
.map(res => <any> res.json()) |
105 | 105 |
//.do(res => console.info(res)) |
106 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]) |
|
107 | 106 |
.do(res => { |
108 | 107 |
this._cache.set(key, res); |
109 |
}); |
|
108 |
}) |
|
109 |
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]); |
|
110 | 110 |
} |
111 | 111 |
|
112 | 112 |
searchDataprovidersForDeposit (id: string,type:string, page: number, size: number):any { |
... | ... | |
123 | 123 |
|
124 | 124 |
let key = url; |
125 | 125 |
if (this._cache.has(key)) { |
126 |
return Observable.of(this._cache.get(key)); |
|
126 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results'])]);
|
|
127 | 127 |
} |
128 | 128 |
return this.http.get(url) |
129 | 129 |
.map(res => <any> res.json()) |
130 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]) |
|
131 | 130 |
.do(res => { |
132 | 131 |
this._cache.set(key, res); |
133 |
}); |
|
132 |
}) |
|
133 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]); |
|
134 | 134 |
} |
135 | 135 |
getDataProvidersforEntityRegistry(datasourceId: string, page: number, size: number ):any { |
136 | 136 |
let url = OpenaireProperties.getSearchResourcesAPIURL(); |
... | ... | |
146 | 146 |
url += "&format=json"; |
147 | 147 |
let key = url; |
148 | 148 |
if (this._cache.has(key)) { |
149 |
return Observable.of(this._cache.get(key)); |
|
149 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results'])]);
|
|
150 | 150 |
} |
151 | 151 |
return this.http.get(url) |
152 | 152 |
.map(res => <any> res.json()) |
153 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]) |
|
154 | 153 |
.do(res => { |
155 | 154 |
this._cache.set(key, res); |
156 |
}); |
|
155 |
}) |
|
156 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]); |
|
157 | 157 |
} |
158 | 158 |
searchDataprovidersForEntity (params: string, page: number, size: number):any { |
159 | 159 |
let link = OpenaireProperties. getSearchAPIURLLast(); |
160 | 160 |
let url = link+params+"/datasources?format=json"; |
161 | 161 |
let key = url; |
162 | 162 |
if (this._cache.has(key)) { |
163 |
return Observable.of(this._cache.get(key)); |
|
163 |
return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, this.parseResults(res['results'])]);
|
|
164 | 164 |
} |
165 | 165 |
return this.http.get(url) |
166 | 166 |
.map(res => <any> res.json()) |
167 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]) |
|
168 | 167 |
.do(res => { |
169 | 168 |
this._cache.set(key, res); |
170 |
}); |
|
169 |
}) |
|
170 |
.map(res => [res['meta'].total, this.parseResults(res['results'])]); |
|
171 | 171 |
} |
172 | 172 |
|
173 | 173 |
searchDataprovidersCSV (params: string, refineParams:string, page: number, size: number):any { |
... | ... | |
185 | 185 |
|
186 | 186 |
let key = url; |
187 | 187 |
if (this._cache.has(key)) { |
188 |
return Observable.of(this._cache.get(key)); |
|
188 |
return Observable.of(this._cache.get(key)).map(res => this.parseResultsCSV(res['results']));
|
|
189 | 189 |
} |
190 | 190 |
return this.http.get(url) |
191 | 191 |
.map(res => <any> res.json()) |
192 | 192 |
//.do(res => console.info(res)) |
193 |
.map(res => this.parseResultsCSV(res['results'])) |
|
194 | 193 |
.do(res => { |
195 | 194 |
this._cache.set(key, res); |
196 |
}); |
|
195 |
}) |
|
196 |
.map(res => this.parseResultsCSV(res['results'])); |
|
197 | 197 |
} |
198 | 198 |
|
199 | 199 |
searchEntityRegistriesCSV (params: string,refineParams:string, page: number, size: number):any { |
... | ... | |
208 | 208 |
url += "&page="+(page - 1)+"&size="+size+"&format=json"; |
209 | 209 |
let key = url; |
210 | 210 |
if (this._cache.has(key)) { |
211 |
return Observable.of(this._cache.get(key)); |
|
211 |
return Observable.of(this._cache.get(key)).map(res => this.parseResultsCSV(res['results']));
|
|
212 | 212 |
} |
213 | 213 |
return this.http.get(url) |
214 | 214 |
.map(res => <any> res.json()) |
215 | 215 |
//.do(res => console.info(res)) |
216 |
.map(res => this.parseResultsCSV(res['results'])) |
|
217 | 216 |
.do(res => { |
218 |
this._cache.set(key, res); |
|
219 |
}); |
|
217 |
this._cache.set(key, res) |
|
218 |
}) |
|
219 |
.map(res => this.parseResultsCSV(res['results'])); |
|
220 | 220 |
} |
221 | 221 |
|
222 | 222 |
searchCompatibleDataprovidersCSV (params: string,refineParams:string, page: number, size: number):any { |
... | ... | |
231 | 231 |
url += "&page="+(page - 1)+"&size="+size+"&format=json"; |
232 | 232 |
let key = url; |
233 | 233 |
if (this._cache.has(key)) { |
234 |
return Observable.of(this._cache.get(key)); |
|
234 |
return Observable.of(this._cache.get(key)).map(res => this.parseResultsCSV(res['results']));
|
|
235 | 235 |
} |
236 | 236 |
return this.http.get(url) |
237 | 237 |
.map(res => <any> res.json()) |
238 | 238 |
//.do(res => console.info(res)) |
239 |
.map(res => this.parseResultsCSV(res['results'])) |
|
240 | 239 |
.do(res => { |
241 | 240 |
this._cache.set(key, res); |
242 |
}); |
|
241 |
}) |
|
242 |
.map(res => this.parseResultsCSV(res['results'])); |
|
243 | 243 |
} |
244 | 244 |
|
245 | 245 |
parseResults(data: any): SearchResult[] { |
Also available in: Unified diff
in services use function console.log instead of console.error | re-enable cache for project & organization service | in services add result in cache before custom parsing