Compare commits
4 Commits
master
...
scholexplo
Author | SHA1 | Date |
---|---|---|
Sandro La Bruzzo | 5e2527e147 | |
Sandro La Bruzzo | a9a8559b53 | |
Michele Artini | 98b8c67f52 | |
Michele Artini | ff97a8c955 |
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>apps</artifactId>
|
<artifactId>apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>apps</artifactId>
|
<artifactId>apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>apps</artifactId>
|
<artifactId>apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>apps</artifactId>
|
<artifactId>apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>dnet-applications</artifactId>
|
<artifactId>dnet-applications</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>apps</artifactId>
|
<artifactId>apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -54,8 +54,6 @@ 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,
|
|
||||||
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 +62,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());
|
||||||
|
|
|
@ -8,6 +8,8 @@ import io.micrometer.core.annotation.Timed;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
import org.apache.lucene.queryparser.flexible.standard.builders.TermRangeQueryNodeBuilder;
|
||||||
|
import org.apache.lucene.search.TermRangeQuery;
|
||||||
import org.apache.lucene.search.join.ScoreMode;
|
import org.apache.lucene.search.join.ScoreMode;
|
||||||
import org.elasticsearch.action.search.SearchType;
|
import org.elasticsearch.action.search.SearchType;
|
||||||
import org.elasticsearch.client.RestHighLevelClient;
|
import org.elasticsearch.client.RestHighLevelClient;
|
||||||
|
@ -101,6 +103,11 @@ public class ScholixIndexManager {
|
||||||
return new NestedQueryBuilder(String.format("%s.publisher", prefix), new TermQueryBuilder(String.format("%s.publisher.name",prefix), publisher), ScoreMode.None);
|
return new NestedQueryBuilder(String.format("%s.publisher", prefix), new TermQueryBuilder(String.format("%s.publisher.name",prefix), publisher), ScoreMode.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private QueryBuilder createHarvestedAfterQuery(final String aDate) throws ScholixException {
|
||||||
|
return new RangeQueryBuilder("HarvestDate").gt(aDate);
|
||||||
|
}
|
||||||
|
|
||||||
private QueryBuilder createPidValueQuery(final RelationPrefix prefix, final String pidValue ) throws ScholixException{
|
private QueryBuilder createPidValueQuery(final RelationPrefix prefix, final String pidValue ) throws ScholixException{
|
||||||
if (prefix == null){
|
if (prefix == null){
|
||||||
throw new ScholixException("prefix cannot be null");
|
throw new ScholixException("prefix cannot be null");
|
||||||
|
@ -238,7 +245,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 {
|
||||||
|
|
||||||
|
|
||||||
|
@ -294,6 +301,12 @@ public class ScholixIndexManager {
|
||||||
|
|
||||||
QueryBuilder result = createFinalQuery(queries);
|
QueryBuilder result = createFinalQuery(queries);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
NativeSearchQuery finalQuery = new NativeSearchQueryBuilder()
|
NativeSearchQuery finalQuery = new NativeSearchQueryBuilder()
|
||||||
.withQuery(result)
|
.withQuery(result)
|
||||||
.withPageable(PageRequest.of(page,10))
|
.withPageable(PageRequest.of(page,10))
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>cmd-line-apps</artifactId>
|
<artifactId>cmd-line-apps</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>dnet-applications</artifactId>
|
<artifactId>dnet-applications</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>libs</artifactId>
|
<artifactId>libs</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>libs</artifactId>
|
<artifactId>libs</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>libs</artifactId>
|
<artifactId>libs</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>dnet-applications</artifactId>
|
<artifactId>dnet-applications</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<relativePath>../</relativePath>
|
<relativePath>../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>dnet-applications</artifactId>
|
<artifactId>dnet-applications</artifactId>
|
||||||
<version>3.2.3-SNAPSHOT</version>
|
<version>3.2.4-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
|
@ -398,7 +398,7 @@
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
|
<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<dhp-schemas-version>2.10.30-SCHOLEXPLORER-SNAPSHOT</dhp-schemas-version>
|
<dhp-schemas-version>2.11.33</dhp-schemas-version>
|
||||||
<apache.solr.version>7.1.0</apache.solr.version>
|
<apache.solr.version>7.1.0</apache.solr.version>
|
||||||
<mongodb.driver.version>3.4.2</mongodb.driver.version>
|
<mongodb.driver.version>3.4.2</mongodb.driver.version>
|
||||||
<springfox-version>2.8.0</springfox-version>
|
<springfox-version>2.8.0</springfox-version>
|
||||||
|
|
Loading…
Reference in New Issue