hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 20:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-edismax-parser-support_contribute-7.6'

Browse Source 
# Conflicts:
#	dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
This commit is contained in:
Alexandre Vryghem
2025-03-17 23:42:01 +01:00
parent 7ef694f03a c16442a119
commit 51733dfab4
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
View File

@@ -1231,8 +1231,8 @@ public class LogAnalyser {
} }
accessionedQuery.append("]"); accessionedQuery.append("]");
discoverQuery.addFilterQueries(accessionedQuery.toString()); discoverQuery.addFilterQueries(accessionedQuery.toString());
discoverQuery.addFilterQueries("withdrawn: false"); discoverQuery.addFilterQueries("withdrawn:false");
discoverQuery.addFilterQueries("archived: true"); discoverQuery.addFilterQueries("archived:true");
return (int) SearchUtils.getSearchService().search(context, discoverQuery).getTotalSearchResults(); return (int) SearchUtils.getSearchService().search(context, discoverQuery).getTotalSearchResults();
} }

4
dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
View File

@@ -362,9 +362,9 @@ public class SolrBrowseDAO implements BrowseDAO {
} }
if (isAscending) { if (isAscending) {
query.setQuery("bi_" + column + "_sort" + ": [* TO \"" + value + "\"}"); query.setQuery("bi_" + column + "_sort" + ":[* TO \"" + value + "\"}");
} else { } else {
query.setQuery("bi_" + column + "_sort" + ": {\"" + value + "\" TO *]"); query.setQuery("bi_" + column + "_sort" + ":{\"" + value + "\" TO *]");
query.addFilterQueries("-(bi_" + column + "_sort" + ":" + value + "*)"); query.addFilterQueries("-(bi_" + column + "_sort" + ":" + value + "*)");
} }
DiscoverResult resp = null; DiscoverResult resp = null;

2
dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
View File

@@ -1266,7 +1266,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
try { try {
SolrQuery solrQuery = new SolrQuery(); SolrQuery solrQuery = new SolrQuery();
//Set the query to handle since this is unique //Set the query to handle since this is unique
solrQuery.setQuery(SearchUtils.RESOURCE_UNIQUE_ID + ": " + new IndexableItem(item).getUniqueIndexID()); solrQuery.setQuery(SearchUtils.RESOURCE_UNIQUE_ID + ":" + new IndexableItem(item).getUniqueIndexID());
//Only return obj identifier fields in result doc //Only return obj identifier fields in result doc
solrQuery.setFields(SearchUtils.RESOURCE_TYPE_FIELD, SearchUtils.RESOURCE_ID_FIELD); solrQuery.setFields(SearchUtils.RESOURCE_TYPE_FIELD, SearchUtils.RESOURCE_ID_FIELD);
//Add the more like this parameters ! //Add the more like this parameters !

4
dspace-api/src/main/java/org/dspace/search/Harvest.java
View File

@@ -117,9 +117,9 @@ public class Harvest {
} }
if (!withdrawn) { if (!withdrawn) {
discoverQuery.addFilterQueries("archived: true OR withdrawn: false"); discoverQuery.addFilterQueries("archived:true OR withdrawn:false");
} else { } else {
discoverQuery.addFilterQueries("archived: true OR withdrawn: true"); discoverQuery.addFilterQueries("archived:true OR withdrawn:true");
} }
// Order by item ID, so that for a given harvest the order will be // Order by item ID, so that for a given harvest the order will be

4
dspace-api/src/main/java/org/dspace/statistics/StatisticsLoggingConsumer.java
View File

@@ -93,7 +93,7 @@ public class StatisticsLoggingConsumer implements Consumer {
// We are mapping a new item make sure that the owning collection is // We are mapping a new item make sure that the owning collection is
// updated // updated
Item newItem = (Item) event.getObject(ctx); Item newItem = (Item) event.getObject(ctx);
String updateQuery = "id: " + newItem.getID() + " AND type:" String updateQuery = "id:" + newItem.getID() + " AND type:"
+ newItem.getType(); + newItem.getType();
List<String> fieldNames = new ArrayList<String>(); List<String> fieldNames = new ArrayList<String>();
@@ -116,7 +116,7 @@ public class StatisticsLoggingConsumer implements Consumer {
&& event.getObject(ctx) instanceof Item) { && event.getObject(ctx) instanceof Item) {
// Unmapping items // Unmapping items
Item newItem = (Item) event.getObject(ctx); Item newItem = (Item) event.getObject(ctx);
String updateQuery = "id: " + newItem.getID() + " AND type:" String updateQuery = "id:" + newItem.getID() + " AND type:"
+ newItem.getType(); + newItem.getType();
List<String> fieldNames = new ArrayList<String>(); List<String> fieldNames = new ArrayList<String>();

4
dspace-api/src/main/java/org/dspace/statistics/content/StatisticsBSAdapter.java
View File

@@ -68,10 +68,10 @@ public class StatisticsBSAdapter {
switch (visitType) { switch (visitType) {
case ITEM_VISITS: case ITEM_VISITS:
return solrLoggerService return solrLoggerService
.queryTotal("type: " + Constants.ITEM + " AND id: " + item.getID(), resolveFilterQueries(), 0) .queryTotal("type:" + Constants.ITEM + " AND id:" + item.getID(), resolveFilterQueries(), 0)
.getCount(); .getCount();
case BITSTREAM_VISITS: case BITSTREAM_VISITS:
return solrLoggerService.queryTotal("type: " + Constants.BITSTREAM + " AND owningItem: " + item.getID(), return solrLoggerService.queryTotal("type:" + Constants.BITSTREAM + " AND owningItem:" + item.getID(),
resolveFilterQueries(), 0).getCount(); resolveFilterQueries(), 0).getCount();
case TOTAL_VISITS: case TOTAL_VISITS:
return getNumberOfVisits(ITEM_VISITS, item) + getNumberOfVisits(BITSTREAM_VISITS, item); return getNumberOfVisits(ITEM_VISITS, item) + getNumberOfVisits(BITSTREAM_VISITS, item);

2
dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataSearches.java
View File

@@ -209,7 +209,7 @@ public class StatisticsDataSearches extends StatisticsData {
protected String getQuery() { protected String getQuery() {
String query; String query;
if (currentDso != null) { if (currentDso != null) {
query = "scopeType: " + currentDso.getType() + " AND "; query = "scopeType:" + currentDso.getType() + " AND ";
if (currentDso instanceof DSpaceObjectLegacySupport) { if (currentDso instanceof DSpaceObjectLegacySupport) {
query += " (scopeId:" + currentDso.getID() + " OR scopeId:" + ((DSpaceObjectLegacySupport) currentDso) query += " (scopeId:" + currentDso.getID() + " OR scopeId:" + ((DSpaceObjectLegacySupport) currentDso)
.getLegacyId() + ")"; .getLegacyId() + ")";

4
dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
View File

@@ -237,7 +237,7 @@ public class StatisticsDataVisits extends StatisticsData {
false, null, facetMinCount); false, null, facetMinCount);
for (int j = 0; j < maxObjectCounts.length; j++) { for (int j = 0; j < maxObjectCounts.length; j++) {
ObjectCount firstCount = maxObjectCounts[j]; ObjectCount firstCount = maxObjectCounts[j];
String newQuery = dataSetQuery.getFacetField() + ": " + ClientUtils String newQuery = dataSetQuery.getFacetField() + ":" + ClientUtils
.escapeQueryChars(firstCount.getValue()) + " AND " + query; .escapeQueryChars(firstCount.getValue()) + " AND " + query;
ObjectCount[] maxDateFacetCounts = solrLoggerService ObjectCount[] maxDateFacetCounts = solrLoggerService
.queryFacetDate(newQuery, filterQuery, dataSetQuery.getMax(), dateFacet.getDateType(), .queryFacetDate(newQuery, filterQuery, dataSetQuery.getMax(), dateFacet.getDateType(),
@@ -813,7 +813,7 @@ public class StatisticsDataVisits extends StatisticsData {
String query = ""; String query = "";
//Check (& add if needed) the dsoType //Check (& add if needed) the dsoType
if (dsoType != -1) { if (dsoType != -1) {
query += "type: " + dsoType; query += "type:" + dsoType;
} }
//Check (& add if needed) the dsoId //Check (& add if needed) the dsoId

2
dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataWorkflow.java
View File

@@ -146,7 +146,7 @@ public class StatisticsDataWorkflow extends StatisticsData {
*/ */
protected String getQuery() { protected String getQuery() {
String query = "statistics_type:" + SolrLoggerServiceImpl.StatisticsType.WORKFLOW.text(); String query = "statistics_type:" + SolrLoggerServiceImpl.StatisticsType.WORKFLOW.text();
query += " AND NOT(previousWorkflowStep: SUBMIT)"; query += " AND NOT(previousWorkflowStep:SUBMIT)";
if (currentDso != null) { if (currentDso != null) {
if (currentDso.getType() == Constants.COMMUNITY) { if (currentDso.getType() == Constants.COMMUNITY) {
query += " AND owningComm:"; query += " AND owningComm:";

2
dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java
View File

@@ -131,7 +131,7 @@ public class MetadataExportSearchIT extends AbstractIntegrationTestWithDatabase
checkItemsPresentInFile(filename, itemsSubject1); checkItemsPresentInFile(filename, itemsSubject1);
result = runDSpaceScript("metadata-export-search", "-q", "subject: " + subject2, "-n", filename); result = runDSpaceScript("metadata-export-search", "-q", "subject:" + subject2, "-n", filename);
assertEquals(0, result); assertEquals(0, result);
checkItemsPresentInFile(filename, itemsSubject2); checkItemsPresentInFile(filename, itemsSubject2);