D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

log message

This commit is contained in:
Michele Artini 2024-07-11 15:14:34 +02:00
parent 5cdba9172b
commit bbe52584f7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/researchfi/ResearchFiIterator.java
View File

@ -76,16 +76,17 @@ public class ResearchFiIterator implements Iterator<String> {
this.currPage += 1; this.currPage += 1;
final String url;
if (!this.baseUrl.contains("?")) {
url = String.format("%s?PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else if (!this.baseUrl.contains("PageSize=")) {
url = String.format("%s&PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else {
url = String.format("%s&PageNumber=%d", this.baseUrl, this.currPage);
}
log.info("Calling url: " + url);
try (final CloseableHttpClient client = HttpClients.createDefault()) { try (final CloseableHttpClient client = HttpClients.createDefault()) {
final String url;
if (!this.baseUrl.contains("?")) {
url = String.format("%s?PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else if (!this.baseUrl.contains("PageSize=")) {
url = String.format("%s&PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else {
url = String.format("%s&PageNumber=%d", this.baseUrl, this.currPage);
}
log.info("Calling url: " + url);
final HttpGet req = new HttpGet(url); final HttpGet req = new HttpGet(url);
req.addHeader("Authorization", "Bearer " + this.authToken); req.addHeader("Authorization", "Bearer " + this.authToken);
@ -107,8 +108,8 @@ public class ResearchFiIterator implements Iterator<String> {
jsonArray.forEach(obj -> this.queue.add(JsonUtils.convertToXML(obj.toString()))); jsonArray.forEach(obj -> this.queue.add(JsonUtils.convertToXML(obj.toString())));
} }
} catch (final Throwable e) { } catch (final Throwable e) {
log.warn("Error obtaining access token", e); log.warn("Error calling url: " + url, e);
throw new CollectorException("Error obtaining access token", e); throw new CollectorException("Error calling url: " + url, e);
} }
} }