hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

dspace-api: use static variable RESOURCE_TYPE_FIELD

Browse Source
This commit is contained in:
Alan Orth
2025-04-13 17:34:14 +03:00
parent 1c473dc1ba
commit b75f8ec8c4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
View File

@@ -9,6 +9,7 @@ package org.dspace.authorize;
import static org.dspace.app.util.AuthorizeUtil.canCollectionAdminManageAccounts; import static org.dspace.app.util.AuthorizeUtil.canCollectionAdminManageAccounts;
import static org.dspace.app.util.AuthorizeUtil.canCommunityAdminManageAccounts; import static org.dspace.app.util.AuthorizeUtil.canCommunityAdminManageAccounts;
import static org.dspace.discovery.SearchUtils.RESOURCE_TYPE_FIELD;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -736,7 +737,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
*/ */
@Override @Override
public boolean isCommunityAdmin(Context context) throws SQLException { public boolean isCommunityAdmin(Context context) throws SQLException {
return performCheck(context, "search.resourcetype:" + IndexableCommunity.TYPE); return performCheck(context, RESOURCE_TYPE_FIELD + ":" + IndexableCommunity.TYPE);
} }
/** /**
@@ -749,7 +750,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
*/ */
@Override @Override
public boolean isCollectionAdmin(Context context) throws SQLException { public boolean isCollectionAdmin(Context context) throws SQLException {
return performCheck(context, "search.resourcetype:" + IndexableCollection.TYPE); return performCheck(context, RESOURCE_TYPE_FIELD + ":" + IndexableCollection.TYPE);
} }
/** /**
@@ -762,7 +763,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
*/ */
@Override @Override
public boolean isItemAdmin(Context context) throws SQLException { public boolean isItemAdmin(Context context) throws SQLException {
return performCheck(context, "search.resourcetype:" + IndexableItem.TYPE); return performCheck(context, RESOURCE_TYPE_FIELD + ":" + IndexableItem.TYPE);
} }
/** /**
@@ -776,8 +777,8 @@ public class AuthorizeServiceImpl implements AuthorizeService {
@Override @Override
public boolean isComColAdmin(Context context) throws SQLException { public boolean isComColAdmin(Context context) throws SQLException {
return performCheck(context, return performCheck(context,
"(search.resourcetype:" + IndexableCommunity.TYPE + " OR search.resourcetype:" + "(" + RESOURCE_TYPE_FIELD + ":" + IndexableCommunity.TYPE + " OR " +
IndexableCollection.TYPE + ")"); RESOURCE_TYPE_FIELD + ":" + IndexableCollection.TYPE + ")");
} }
/** /**
@@ -795,7 +796,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
throws SearchServiceException, SQLException { throws SearchServiceException, SQLException {
List<Community> communities = new ArrayList<>(); List<Community> communities = new ArrayList<>();
query = formatCustomQuery(query); query = formatCustomQuery(query);
DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" + DiscoverResult discoverResult = getDiscoverResult(context, query + RESOURCE_TYPE_FIELD + ":" +
IndexableCommunity.TYPE, IndexableCommunity.TYPE,
offset, limit, null, null); offset, limit, null, null);
for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) { for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) {
@@ -817,7 +818,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
public long countAdminAuthorizedCommunity(Context context, String query) public long countAdminAuthorizedCommunity(Context context, String query)
throws SearchServiceException, SQLException { throws SearchServiceException, SQLException {
query = formatCustomQuery(query); query = formatCustomQuery(query);
DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" + DiscoverResult discoverResult = getDiscoverResult(context, query + RESOURCE_TYPE_FIELD + ":" +
IndexableCommunity.TYPE, IndexableCommunity.TYPE,
null, null, null, null); null, null, null, null);
return discoverResult.getTotalSearchResults(); return discoverResult.getTotalSearchResults();
@@ -842,7 +843,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
} }
query = formatCustomQuery(query); query = formatCustomQuery(query);
DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" + DiscoverResult discoverResult = getDiscoverResult(context, query + RESOURCE_TYPE_FIELD + ":" +
IndexableCollection.TYPE, IndexableCollection.TYPE,
offset, limit, CollectionService.SOLR_SORT_FIELD, SORT_ORDER.asc); offset, limit, CollectionService.SOLR_SORT_FIELD, SORT_ORDER.asc);
for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) { for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) {
@@ -864,7 +865,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
public long countAdminAuthorizedCollection(Context context, String query) public long countAdminAuthorizedCollection(Context context, String query)
throws SearchServiceException, SQLException { throws SearchServiceException, SQLException {
query = formatCustomQuery(query); query = formatCustomQuery(query);
DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" + DiscoverResult discoverResult = getDiscoverResult(context, query + RESOURCE_TYPE_FIELD + ":" +
IndexableCollection.TYPE, IndexableCollection.TYPE,
null, null, null, null); null, null, null, null);
return discoverResult.getTotalSearchResults(); return discoverResult.getTotalSearchResults();