D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed parameter harvestedAfter

This commit is contained in:
Sandro La Bruzzo 2022-05-03 15:34:17 +02:00
parent 3e405075c9
commit 762af8d0b1
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV1.java
View File

@ -50,7 +50,7 @@ public class ScholixControllerV1 extends AbstractDnetController {
final int currentPage = page != null ? page : 0; final int currentPage = page != null ? page : 0;
Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(null,null,null,publisher, Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(null,null,null,publisher,
null,null,null,null,null,null, currentPage null,null,null,null,null, currentPage
); );
List<Scholix> scholixData = scholixResult.getValue(); List<Scholix> scholixData = scholixResult.getValue();
if (scholixData== null) if (scholixData== null)
@ -75,7 +75,7 @@ public class ScholixControllerV1 extends AbstractDnetController {
final int currentPage = page != null ? page : 0; final int currentPage = page != null ? page : 0;
Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(datasource,null,null,null, Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(datasource,null,null,null,
null,null,null,null,null,null, currentPage null,null,null,null,null, currentPage
); );
List<Scholix> scholixData = scholixResult.getValue(); List<Scholix> scholixData = scholixResult.getValue();
if (scholixData== null) if (scholixData== null)
@ -101,7 +101,7 @@ public class ScholixControllerV1 extends AbstractDnetController {
final int currentPage = page != null ? page : 0; final int currentPage = page != null ? page : 0;
Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(datasourceTarget,null,null,null, Pair<Long, List<Scholix>> scholixResult =manager.linksFromPid(datasourceTarget,null,null,null,
typologyTarget,pid,pidType,null,null,null, currentPage typologyTarget,pid,pidType,null,null, currentPage
); );
List<Scholix> scholixData = scholixResult.getValue(); List<Scholix> scholixData = scholixResult.getValue();
if (scholixData== null) if (scholixData== null)

6
apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/controller/ScholixControllerV2.java
View File

@ -54,8 +54,8 @@ public class ScholixControllerV2 extends AbstractDnetController {
description = "Filter Scholix relationships having a source published in a Publisher named sourcePublisher") String sourcePublisher, description = "Filter Scholix relationships having a source published in a Publisher named sourcePublisher") String sourcePublisher,
@Parameter(in = ParameterIn.QUERY, @Parameter(in = ParameterIn.QUERY,
description = "Filter Scholix relationships having a source type (literature, dataset, unknown)") String sourceType, description = "Filter Scholix relationships having a source type (literature, dataset, unknown)") String sourceType,
@Parameter(in = ParameterIn.QUERY, // @Parameter(in = ParameterIn.QUERY,
description = "Filter scholix Links having collected after this date") String harvestedAfter, // description = "Filter scholix Links having collected after this date") String harvestedAfter,
@Parameter(in = ParameterIn.QUERY, @Parameter(in = ParameterIn.QUERY,
description = "select page of result") Integer page) throws Exception { description = "select page of result") Integer page) throws Exception {
@ -64,7 +64,7 @@ public class ScholixControllerV2 extends AbstractDnetController {
try { try {
final int currentPage = page != null ? page : 0; final int currentPage = page != null ? page : 0;
Pair<Long, List<Scholix>> scholixResult = manager.linksFromPid( linkProvider, targetPid, targetPidType, targetPublisher, targetType, sourcePid, sourcePidType, sourcePublisher, sourceType, harvestedAfter, currentPage); Pair<Long, List<Scholix>> scholixResult = manager.linksFromPid( linkProvider, targetPid, targetPidType, targetPublisher, targetType, sourcePid, sourcePidType, sourcePublisher, sourceType, currentPage);
final PageResultType pageResult = new PageResultType(); final PageResultType pageResult = new PageResultType();
pageResult.setTotalPages(scholixResult.getLeft().intValue() / 10); pageResult.setTotalPages(scholixResult.getLeft().intValue() / 10);
pageResult.setTotalLinks(scholixResult.getLeft().intValue()); pageResult.setTotalLinks(scholixResult.getLeft().intValue());

3
apps/scholexplorer-api/src/main/java/eu/dnetlib/scholix/api/index/ScholixIndexManager.java
View File

@ -229,7 +229,6 @@ public class ScholixIndexManager {
* @param sourcePidType the source pid type * @param sourcePidType the source pid type
* @param sourcePublisher the source publisher * @param sourcePublisher the source publisher
* @param sourceType the source type * @param sourceType the source type
* @param harvestedAfter the harvested after
* @param page the page * @param page the page
* @return the pair * @return the pair
* @throws ScholixException the scholix exception * @throws ScholixException the scholix exception
@ -238,7 +237,7 @@ public class ScholixIndexManager {
public Pair<Long,List<Scholix>> linksFromPid ( final String linkProvider, public Pair<Long,List<Scholix>> linksFromPid ( final String linkProvider,
final String targetPid, final String targetPidType, final String targetPublisher, final String targetPid, final String targetPidType, final String targetPublisher,
final String targetType, final String sourcePid, final String sourcePidType, 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 { final Integer page) throws ScholixException {