Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

search query start uses an overriden function from api-commons #75

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

search query start uses an overriden function from api-commons #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d3209c
search query start uses an overriden function from api-commons
SrdjanStevanetic May 8, 2024
6e808b4
Merge branch 'develop' into EA-3837-search-query-start
SrdjanStevanetic May 8, 2024
24195b0
method for start page in solr changed to reflect api-commons changes
SrdjanStevanetic May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions entity-solr/src/main/java/eu/europeana/entity/solr/service/impl/EntityQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class EntityQueryBuilder extends QueryBuilder {
public static final String DESC = "desc";
public static final String OR = " " + SimpleParams.OR_OPERATOR + " ";
public static final String AND = " " + SimpleParams.AND_OPERATOR + " ";
private static final int DEFAULT_START_PAGE = 1;

public SolrQuery toSolrQuery(Query searchQuery, String searchHandler, List<EntityTypes> entityTypes, String scope) {
SolrQuery solrQuery = super.toSolrQuery(searchQuery, searchHandler);
Expand All @@ -38,10 +39,10 @@ public SolrQuery toSolrQuery(Query searchQuery, String searchHandler, List<Entit
solrQuery.set(PARAM_QUERY_OPERATOR, SimpleParams.AND_OPERATOR);
return solrQuery;
}

@Override
protected int computeSolrQueryStart(Query searchQuery) {
return (searchQuery.getPageNr() - 1) * searchQuery.getPageSize();
public int getDefaultStarPage() {
return DEFAULT_START_PAGE;
}

private boolean hasScopeEuropeana(String scope) {
Expand Down Expand Up @@ -226,7 +227,7 @@ public Query buildParameterSearchQuery(MultiValueMap<String, String> parameters,

// process pageSize
if (StringUtils.isEmpty(page))
page = "" + Query.DEFAULT_PAGE;
page = "" + getDefaultStarPage();

// process pageSize
if (StringUtils.isEmpty(pageSize))
Expand Down Expand Up @@ -290,7 +291,7 @@ public Query buildSearchQueryForEnrichment(String text, String lang, List<Entity
searchQuery.setFilters(createFilterForEnrichment(entityTypes));
searchQuery.setSortCriteria(toArray(ConceptSolrFields.DERIVED_SCORE + " " +DESC));
searchQuery.setPageSize(Math.min(pageSize, WebEntityConstants.ENRICH_MAX_PAGE_SIZE));
searchQuery.setPageNr(1);
searchQuery.setPageNr(getDefaultStarPage());

return searchQuery;
}
Expand Down
7 changes: 1 addition & 6 deletions entity-stats/src/main/java/eu/europeana/entity/stats/service/UsageStatsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
package eu.europeana.entity.stats.service;

import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

import javax.annotation.Resource;

import org.apache.commons.math3.util.Precision;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Service;

import eu.europeana.api.commons.definitions.search.FacetFieldView;
import eu.europeana.api.commons.definitions.search.Query;
import eu.europeana.api.commons.definitions.statistics.entity.EntitiesPerLanguage;
Expand Down Expand Up @@ -94,7 +89,7 @@ private EntitiesPerLanguage getEntityPerLangValues(String lang, EntityStats enti

private static Query buildSearchQuery(String queryString, String facet) {
EntityQueryBuilder queryBuilder = new EntityQueryBuilder();
return queryBuilder.buildSearchQuery(queryString, null, queryBuilder.toArray(facet), null, 0, 0,
return queryBuilder.buildSearchQuery(queryString, null, queryBuilder.toArray(facet), null, queryBuilder.getDefaultStarPage(), 0,
SearchProfiles.facets, null);
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

<sonar.organization>europeana</sonar.organization>
<version.junit>5.7.0</version.junit>
<version.commonsApi>0.4.1</version.commonsApi>
<version.commonsApi>0.4.2-SNAPSHOT</version.commonsApi>

<version.corelib>2.15.4</version.corelib>
<version.annotationLd>1.1.9</version.annotationLd>
Expand Down