From 762af8d0b1831c513e3d92b58652d2ca764f8b43 Mon Sep 17 00:00:00 2001 From: Sandro La Bruzzo Date: Tue, 3 May 2022 15:34:17 +0200 Subject: [PATCH] removed parameter harvestedAfter --- .../dnetlib/scholix/api/controller/ScholixControllerV1.java | 6 +++--- .../dnetlib/scholix/api/controller/ScholixControllerV2.java | 6 +++--- .../eu/dnetlib/scholix/api/index/ScholixIndexManager.java | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV1.java b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV1.java index 85c76531..661f963e 100644 --- a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV1.java +++ b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV1.java @@ -50,7 +50,7 @@ public class ScholixControllerV1 extends AbstractDnetController { final int currentPage = page != null ? page : 0; Pair> scholixResult =manager.linksFromPid(null,null,null,publisher, - null,null,null,null,null,null, currentPage + null,null,null,null,null, currentPage ); List scholixData = scholixResult.getValue(); if (scholixData== null) @@ -75,7 +75,7 @@ public class ScholixControllerV1 extends AbstractDnetController { final int currentPage = page != null ? page : 0; Pair> scholixResult =manager.linksFromPid(datasource,null,null,null, - null,null,null,null,null,null, currentPage + null,null,null,null,null, currentPage ); List scholixData = scholixResult.getValue(); if (scholixData== null) @@ -101,7 +101,7 @@ public class ScholixControllerV1 extends AbstractDnetController { final int currentPage = page != null ? page : 0; Pair> scholixResult =manager.linksFromPid(datasourceTarget,null,null,null, - typologyTarget,pid,pidType,null,null,null, currentPage + typologyTarget,pid,pidType,null,null, currentPage ); List scholixData = scholixResult.getValue(); if (scholixData== null) diff --git a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV2.java b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV2.java index a0d5d3b2..f205c45a 100644 --- a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV2.java +++ b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV2.java @@ -54,8 +54,8 @@ public class ScholixControllerV2 extends AbstractDnetController { description = "Filter Scholix relationships having a source published in a Publisher named sourcePublisher") String sourcePublisher, @Parameter(in = ParameterIn.QUERY, description = "Filter Scholix relationships having a source type (literature, dataset, unknown)") String sourceType, - @Parameter(in = ParameterIn.QUERY, - description = "Filter scholix Links having collected after this date") String harvestedAfter, +// @Parameter(in = ParameterIn.QUERY, +// description = "Filter scholix Links having collected after this date") String harvestedAfter, @Parameter(in = ParameterIn.QUERY, description = "select page of result") Integer page) throws Exception { @@ -64,7 +64,7 @@ public class ScholixControllerV2 extends AbstractDnetController { try { final int currentPage = page != null ? page : 0; - Pair> scholixResult = manager.linksFromPid( linkProvider, targetPid, targetPidType, targetPublisher, targetType, sourcePid, sourcePidType, sourcePublisher, sourceType, harvestedAfter, currentPage); + Pair> scholixResult = manager.linksFromPid( linkProvider, targetPid, targetPidType, targetPublisher, targetType, sourcePid, sourcePidType, sourcePublisher, sourceType, currentPage); final PageResultType pageResult = new PageResultType(); pageResult.setTotalPages(scholixResult.getLeft().intValue() / 10); pageResult.setTotalLinks(scholixResult.getLeft().intValue()); diff --git a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/index/ScholixIndexManager.java b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/index/ScholixIndexManager.java index 23aa2d47..8cdabec4 100644 --- a/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/index/ScholixIndexManager.java +++ b/apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/index/ScholixIndexManager.java @@ -229,7 +229,6 @@ public class ScholixIndexManager { * @param sourcePidType the source pid type * @param sourcePublisher the source publisher * @param sourceType the source type - * @param harvestedAfter the harvested after * @param page the page * @return the pair * @throws ScholixException the scholix exception @@ -238,7 +237,7 @@ public class ScholixIndexManager { public Pair> linksFromPid ( final String linkProvider, final String targetPid, final String targetPidType, final String targetPublisher, final String targetType, final String sourcePid, final String sourcePidType, - final String sourcePublisher, final String sourceType, final String harvestedAfter, + final String sourcePublisher, final String sourceType, final Integer page) throws ScholixException {