merging master

removed harvestedAfter since is not possible to use for the current index data-model
[maven-release-plugin] prepare for next development iteration
2022-05-03 14:09:30 +02:00 · 2022-05-03 14:05:52 +02:00 · 2022-02-02 11:49:24 +01:00 · 2022-02-02 11:49:21 +01:00
16 changed files with 32 additions and 21 deletions
--- a/apps/dhp-broker-application/pom.xml
+++ b/apps/dhp-broker-application/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>apps</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/apps/dhp-broker-public-application/pom.xml
+++ b/apps/dhp-broker-public-application/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>apps</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/apps/dhp-mdstore-manager/pom.xml
+++ b/apps/dhp-mdstore-manager/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>apps</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/apps/dnet-orgs-database-application/pom.xml
+++ b/apps/dnet-orgs-database-application/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>apps</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/apps/pom.xml
+++ b/apps/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dnet-applications</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/apps/scholexplorer-api/pom.xml
+++ b/apps/scholexplorer-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>eu.dnetlib.dhp</groupId>
        <artifactId>apps</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- 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<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();
        if (scholixData== null)
@ -75,7 +75,7 @@ public class ScholixControllerV1 extends AbstractDnetController {

        final int currentPage = page != null ? page : 0;
        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();
        if (scholixData== null)
@ -101,7 +101,7 @@ public class ScholixControllerV1 extends AbstractDnetController {

        final int currentPage = page != null ? page : 0;
        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();
        if (scholixData== null)
--- 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,6 @@ 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 = "select page of result")  Integer page) throws Exception {

@ -64,7 +62,7 @@ public class ScholixControllerV2 extends AbstractDnetController {

        try {
            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();
            pageResult.setTotalPages(scholixResult.getLeft().intValue() / 10);
            pageResult.setTotalLinks(scholixResult.getLeft().intValue());
--- 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
@ -8,6 +8,8 @@ import io.micrometer.core.annotation.Timed;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 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.elasticsearch.action.search.SearchType;
 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);
    }

+
+        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{
        if (prefix == null){
            throw new ScholixException("prefix cannot be null");
@ -238,7 +245,7 @@ public class ScholixIndexManager {
    public Pair<Long,List<Scholix>> 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 {


@ -294,6 +301,12 @@ public class ScholixIndexManager {

        QueryBuilder result = createFinalQuery(queries);

+
+
+
+
+
+
        NativeSearchQuery finalQuery = new NativeSearchQueryBuilder()
                .withQuery(result)
                .withPageable(PageRequest.of(page,10))
--- a/cmd-line-apps/dhp-broker-client/pom.xml
+++ b/cmd-line-apps/dhp-broker-client/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>cmd-line-apps</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/cmd-line-apps/pom.xml
+++ b/cmd-line-apps/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dnet-applications</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/libs/dnet-apps-common/pom.xml
+++ b/libs/dnet-apps-common/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>libs</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/libs/dnet-broker-apps-common/pom.xml
+++ b/libs/dnet-broker-apps-common/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>libs</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/libs/dnet-openaire-broker-common/pom.xml
+++ b/libs/dnet-openaire-broker-common/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>libs</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/libs/pom.xml
+++ b/libs/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dnet-applications</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
+		<version>3.2.4-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>

--- a/pom.xml
+++ b/pom.xml
@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.dnetlib.dhp</groupId>
 	<artifactId>dnet-applications</artifactId>
-	<version>3.2.3-SNAPSHOT</version>
+	<version>3.2.4-SNAPSHOT</version>
 	<packaging>pom</packaging>

 	<licenses>
@ -398,7 +398,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.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>
 		<mongodb.driver.version>3.4.2</mongodb.driver.version>
 		<springfox-version>2.8.0</springfox-version>
Author	SHA1	Message	Date
Sandro La Bruzzo	5e2527e147	merging master	2022-05-03 14:09:30 +02:00
Sandro La Bruzzo	a9a8559b53	removed harvestedAfter since is not possible to use for the current index data-model	2022-05-03 14:05:52 +02:00
Michele Artini	98b8c67f52	[maven-release-plugin] prepare for next development iteration	2022-02-02 11:49:24 +01:00
Michele Artini	ff97a8c955	[maven-release-plugin] prepare release dnet-applications-3.2.3	2022-02-02 11:49:21 +01:00