true, the item inherits all collection's template item metadata
+ * @param item item to populate with template item specified metadata
+ * @throws SQLException if database error
+ */
+ public void populateWithTemplateItemMetadata (Context context, Collection collection, boolean template, Item item)
+ throws SQLException;
+
/**
* Get all the items in the archive. Only items with the "in archive" flag
* set are included. The order of the list is indeterminate.
@@ -971,4 +983,14 @@ public Listtrue, the workspace item starts as a copy
* of the collection's template item
+ * @param isNewVersion whether we are creating a new workspace item version of an existing item
* @return the newly created workspace item
* @throws SQLException if database error
* @throws AuthorizeException if authorization error
*/
- public WorkspaceItem create(Context context, Collection collection, UUID uuid, boolean template)
+ public WorkspaceItem create(Context context, Collection collection, UUID uuid, boolean template,
+ boolean isNewVersion)
throws AuthorizeException, SQLException;
public WorkspaceItem create(Context c, WorkflowItem wfi) throws SQLException, AuthorizeException;
diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index 02a3fee09f8a..dab6ab7fbd66 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -883,7 +883,19 @@ public Objects removed from cache are not saved in any way. Therefore, if you - * have modified an object, you should be sure to {@link commit()} changes + *
Entities removed from cache are not saved in any way. Therefore, if you
+ * have modified any entities, you should be sure to {@link #commit()} changes
* before calling this method.
*
- * @param Entities removed from cache are not saved in any way. Therefore, if you
+ * have modified the entity, you should be sure to {@link #commit()} changes
+ * before calling this method.
+ *
+ * @param
diff --git a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
index 0fc48b908b82..76f6a196fc87 100644
--- a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
+++ b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
@@ -96,14 +96,14 @@ private static Locale makeLocale(String localeSpec) {
*/
public static Locale getEPersonLocale(EPerson ep) {
if (ep == null) {
- log.error("No EPerson specified, returning default locale");
+ log.info("No EPerson specified, returning default locale");
return I18nUtil.getDefaultLocale();
}
String lang = ep.getLanguage();
if (StringUtils.isBlank(lang)) {
- log.error("No language specified for EPerson " + ep.getID());
+ log.info("No language specified for EPerson " + ep.getID() + ", returning default locale");
return I18nUtil.getDefaultLocale();
}
@@ -257,7 +257,7 @@ public static String getMessage(String key, Locale locale) {
String message = messages.getString(key.trim());
return message;
} catch (MissingResourceException e) {
- log.error("'" + key + "' translation undefined in locale '"
+ log.warn("'" + key + "' translation undefined in locale '"
+ locale.toString() + "'");
return key;
}
diff --git a/dspace-api/src/main/java/org/dspace/core/UUIDIterator.java b/dspace-api/src/main/java/org/dspace/core/UUIDIterator.java
new file mode 100644
index 000000000000..28c8d7354169
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/core/UUIDIterator.java
@@ -0,0 +1,63 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.core;
+
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import com.google.common.collect.AbstractIterator;
+import org.dspace.content.DSpaceObject;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Iterator implementation which allows to iterate over items and commit while
+ * iterating. Using an iterator over previous retrieved UUIDs the iterator doesn't
+ * get invalidated after a commit that would instead close the database ResultSet
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.com)
+ * @param Curation requests may be run immediately or queued for batch processing.
+ * See {@link TaskQueue} and its relatives, {@link Curation} and its relatives
+ * for more on queued curation.
*
* Tasks may also be attached to a workflow step, so that a set of tasks is
* applied to each uninstalled Item which passes through that step. See
@@ -27,5 +29,15 @@
*
* A task may return to the Curator a status code, a final status message,
* and an optional report character stream.
+ *
+ * The {@link Reporter} classes absorb strings of text and preserve it in
+ * various ways. A Reporter is a simple {@link Appendable} and makes no
+ * assumptions about e.g. whether a string represents a complete line. If you
+ * want your report formatted, insert appropriate newlines and other whitespace
+ * as needed. Your tasks can emit marked-up text if you wish, but the stock
+ * Reporter implementations make no attempt to render it.
+ *
+ * Tasks may be annotated to inform the Curator of special properties. See
+ * {@link Distributive}, {@link Mutative}, {@link Suspendable} etc.
*/
package org.dspace.curate;
diff --git a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
index 00236d2bfe32..a56804e3e7ea 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
@@ -32,6 +32,9 @@ public class DiscoverResult {
private Listjson.facet parameter with the following value:
+ *
+ *
+ *
+ * This value is returned in the
+ * {
+ * "entries_count": {
+ * "type": "terms",
+ * "field": "facetNameField_filter",
+ * "limit": 0,
+ * "prefix": "prefix_value",
+ * "numBuckets": true
+ * }
+ * }
+ * facets field of the Solr response.
+ *
+ * @param result DiscoverResult object where the total entries count will be stored
+ * @param solrQueryResponse QueryResponse object containing the solr response
+ */
+ private void resolveEntriesCount(DiscoverResult result, QueryResponse solrQueryResponse) {
+ NestableJsonFacet response = solrQueryResponse.getJsonFacetingResponse();
+ if (response != null) {
+ BucketBasedJsonFacet facet = response.getBucketBasedFacets("entries_count");
+ if (facet != null) {
+ result.setTotalEntries(facet.getNumBucketsCount());
+ }
+ }
+ }
private void resolveFacetFields(Context context, DiscoverQuery query, DiscoverResult result,
boolean skipLoadingResponse, QueryResponse solrQueryResponse) throws SQLException {
@@ -1443,8 +1477,6 @@ protected String transformFacetField(DiscoverFacetField facetFieldConfig, String
} else {
return field + "_acid";
}
- } else if (facetFieldConfig.getType().equals(DiscoveryConfigurationParameters.TYPE_STANDARD)) {
- return field;
} else {
return field;
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
index 55c99b168e7a..c9a865ec85b2 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
@@ -64,7 +64,14 @@ public SolrInputDocument buildDocument(Context context, T indexableObject) throw
//Do any additional indexing, depends on the plugins
for (SolrServiceIndexPlugin solrServiceIndexPlugin : ListUtils.emptyIfNull(solrServiceIndexPlugins)) {
- solrServiceIndexPlugin.additionalIndex(context, indexableObject, doc);
+ try {
+ solrServiceIndexPlugin.additionalIndex(context, indexableObject, doc);
+ } catch (Exception e) {
+ log.error("An error occurred while indexing additional fields. " +
+ "Could not fully index item with UUID: {}. Plugin: {}",
+ indexableObject.getUniqueIndexID(), solrServiceIndexPlugin.getClass().getSimpleName());
+
+ }
}
return doc;
@@ -82,7 +89,7 @@ public void writeDocument(Context context, T indexableObject, SolrInputDocument
writeDocument(solrInputDocument, null);
} catch (Exception e) {
log.error("Error occurred while writing SOLR document for {} object {}",
- indexableObject.getType(), indexableObject.getID(), e);
+ indexableObject.getType(), indexableObject.getID(), e);
}
}
@@ -101,8 +108,8 @@ protected void writeDocument(SolrInputDocument doc, FullTextContentStreams strea
if (streams != null && !streams.isEmpty()) {
// limit full text indexing to first 100,000 characters unless configured otherwise
final int charLimit = DSpaceServicesFactory.getInstance().getConfigurationService()
- .getIntProperty("discovery.solr.fulltext.charLimit",
- 100000);
+ .getIntProperty("discovery.solr.fulltext.charLimit",
+ 100000);
// Use Tika's Text parser as the streams are always from the TEXT bundle (i.e. already extracted text)
TextAndCSVParser tikaParser = new TextAndCSVParser();
@@ -111,8 +118,10 @@ protected void writeDocument(SolrInputDocument doc, FullTextContentStreams strea
ParseContext tikaContext = new ParseContext();
// Use Apache Tika to parse the full text stream(s)
+ boolean extractionSucceeded = false;
try (InputStream fullTextStreams = streams.getStream()) {
tikaParser.parse(fullTextStreams, tikaHandler, tikaMetadata, tikaContext);
+ extractionSucceeded = true;
} catch (SAXException saxe) {
// Check if this SAXException is just a notice that this file was longer than the character limit.
// Unfortunately there is not a unique, public exception type to catch here. This error is thrown
@@ -121,30 +130,32 @@ protected void writeDocument(SolrInputDocument doc, FullTextContentStreams strea
if (saxe.getMessage().contains("limit has been reached")) {
// log that we only indexed up to that configured limit
log.info("Full text is larger than the configured limit (discovery.solr.fulltext.charLimit)."
- + " Only the first {} characters were indexed.", charLimit);
+ + " Only the first {} characters were indexed.", charLimit);
+ extractionSucceeded = true;
} else {
log.error("Tika parsing error. Could not index full text.", saxe);
throw new IOException("Tika parsing error. Could not index full text.", saxe);
}
- } catch (TikaException ex) {
+ } catch (TikaException | IOException ex) {
log.error("Tika parsing error. Could not index full text.", ex);
throw new IOException("Tika parsing error. Could not index full text.", ex);
}
-
- // Write Tika metadata to "tika_meta_*" fields.
- // This metadata is not very useful right now, but we'll keep it just in case it becomes more useful.
- for (String name : tikaMetadata.names()) {
- for (String value : tikaMetadata.getValues(name)) {
- doc.addField("tika_meta_" + name, value);
+ if (extractionSucceeded) {
+ // Write Tika metadata to "tika_meta_*" fields.
+ // This metadata is not very useful right now,
+ // but we'll keep it just in case it becomes more useful.
+ for (String name : tikaMetadata.names()) {
+ for (String value : tikaMetadata.getValues(name)) {
+ doc.addField("tika_meta_" + name, value);
+ }
}
+ // Save (parsed) full text to "fulltext" field
+ doc.addField("fulltext", tikaHandler.toString());
}
-
- // Save (parsed) full text to "fulltext" field
- doc.addField("fulltext", tikaHandler.toString());
}
-
// Add document to index
solr.add(doc);
+
}
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
index 7cdb8b93d80e..a7a755749604 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
@@ -67,8 +67,6 @@
import org.dspace.services.factory.DSpaceServicesFactory;
import org.dspace.util.MultiFormatDateParser;
import org.dspace.util.SolrUtils;
-import org.dspace.versioning.Version;
-import org.dspace.versioning.VersionHistory;
import org.dspace.versioning.service.VersionHistoryService;
import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
@@ -151,12 +149,14 @@ public SolrInputDocument buildDocument(Context context, IndexableItem indexableI
doc.addField("withdrawn", item.isWithdrawn());
doc.addField("discoverable", item.isDiscoverable());
doc.addField("lastModified", SolrUtils.getDateFormatter().format(item.getLastModified()));
- doc.addField("latestVersion", isLatestVersion(context, item));
+ doc.addField("latestVersion", itemService.isLatestVersion(context, item));
EPerson submitter = item.getSubmitter();
- if (submitter != null) {
- addFacetIndex(doc, "submitter", submitter.getID().toString(),
- submitter.getFullName());
+ if (submitter != null && !(DSpaceServicesFactory.getInstance().getConfigurationService().getBooleanProperty(
+ "discovery.index.item.submitter.enabled", false))) {
+ doc.addField("submitter_authority", submitter.getID().toString());
+ } else if (submitter != null) {
+ addFacetIndex(doc, "submitter", submitter.getID().toString(), submitter.getFullName());
}
// Add the item metadata
@@ -175,43 +175,6 @@ public SolrInputDocument buildDocument(Context context, IndexableItem indexableI
return doc;
}
- /**
- * Check whether the given item is the latest version.
- * If the latest item cannot be determined, because either the version history or the latest version is not present,
- * assume the item is latest.
- * @param context the DSpace context.
- * @param item the item that should be checked.
- * @return true if the item is the latest version, false otherwise.
- */
- protected boolean isLatestVersion(Context context, Item item) throws SQLException {
- VersionHistory history = versionHistoryService.findByItem(context, item);
- if (history == null) {
- // not all items have a version history
- // if an item does not have a version history, it is by definition the latest version
- return true;
- }
-
- // start with the very latest version of the given item (may still be in workspace)
- Version latestVersion = versionHistoryService.getLatestVersion(context, history);
-
- // find the latest version of the given item that is archived
- while (latestVersion != null && !latestVersion.getItem().isArchived()) {
- latestVersion = versionHistoryService.getPrevious(context, history, latestVersion);
- }
-
- // could not find an archived version of the given item
- if (latestVersion == null) {
- // this scenario should never happen, but let's err on the side of showing too many items vs. to little
- // (see discovery.xml, a lot of discovery configs filter out all items that are not the latest version)
- return true;
- }
-
- // sanity check
- assert latestVersion.getItem().isArchived();
-
- return item.equals(latestVersion.getItem());
- }
-
@Override
public SolrInputDocument buildNewDocument(Context context, IndexableItem indexableItem)
throws SQLException, IOException {
@@ -704,7 +667,7 @@ public List getIndexableObjects(Context context, Item item) throws SQLException
return List.copyOf(workflowItemIndexFactory.getIndexableObjects(context, xmlWorkflowItem));
}
- if (!isLatestVersion(context, item)) {
+ if (!itemService.isLatestVersion(context, item)) {
// the given item is an older version of another item
return List.of(new IndexableItem(item));
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
index 92a973dff883..b816e222539a 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
@@ -302,7 +302,7 @@ private void configureSorting(String sortProperty, String sortDirection, Discove
if (StringUtils.isNotBlank(sortBy) && !isConfigured(sortBy, searchSortConfiguration)) {
throw new SearchServiceException(
- "The field: " + sortBy + "is not configured for the configuration!");
+ "The field: " + sortBy + " is not configured for the configuration!");
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
index 66fe6562ea25..453d5d0726be 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
@@ -142,10 +142,15 @@ public EPerson getSystemEPerson(Context c)
@Override
public EPerson findByIdOrLegacyId(Context context, String id) throws SQLException {
- if (StringUtils.isNumeric(id)) {
- return findByLegacyId(context, Integer.parseInt(id));
- } else {
- return find(context, UUID.fromString(id));
+ try {
+ if (StringUtils.isNumeric(id)) {
+ return findByLegacyId(context, Integer.parseInt(id));
+ } else {
+ return find(context, UUID.fromString(id));
+ }
+ } catch (IllegalArgumentException e) {
+ // Not a valid legacy ID or valid UUID
+ return null;
}
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java b/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
index 09bdf34d4cad..58781cd402fa 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
@@ -14,6 +14,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
import org.hibernate.proxy.HibernateProxyHelper;
@@ -23,7 +24,7 @@
* @author kevinvandevelde at atmire.com
*/
@Entity
-@Table(name = "group2groupcache")
+@Table(name = "group2groupcache", uniqueConstraints = { @UniqueConstraint(columnNames = {"parent_id", "child_id"}) })
public class Group2GroupCache implements Serializable {
@Id
diff --git a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
index b8d8c75d0f2e..4cec4c9c0d93 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
@@ -20,6 +20,7 @@
import java.util.UUID;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.SetUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
@@ -147,7 +148,7 @@ public void addMember(Context context, Group group, EPerson e) {
public void addMember(Context context, Group groupParent, Group groupChild) throws SQLException {
// don't add if it's already a member
// and don't add itself
- if (groupParent.contains(groupChild) || groupParent.getID() == groupChild.getID()) {
+ if (groupParent.contains(groupChild) || groupParent.getID().equals(groupChild.getID())) {
return;
}
@@ -178,7 +179,7 @@ public void removeMember(Context context, Group group, EPerson ePerson) throws S
Role role = stepByName.getRole();
for (CollectionRole collectionRole : collectionRoles) {
if (StringUtils.equals(collectionRole.getRoleId(), role.getId())
- && claimedTask.getWorkflowItem().getCollection() == collectionRole.getCollection()) {
+ && claimedTask.getWorkflowItem().getCollection().equals(collectionRole.getCollection())) {
// Count number of EPersons who are *direct* members of this group
int totalDirectEPersons = ePersonService.countByGroups(context, Set.of(group));
// Count number of Groups which have this groupParent as a direct parent
@@ -673,15 +674,14 @@ protected boolean isEPersonInGroup(Context context, Group group, EPerson ePerson
/**
- * Regenerate the group cache AKA the group2groupcache table in the database -
- * meant to be called when a group is added or removed from another group
+ * Returns a set with pairs of parent and child group UUIDs, representing the new cache table rows.
*
- * @param context The relevant DSpace Context.
- * @param flushQueries flushQueries Flush all pending queries
+ * @param context The relevant DSpace Context.
+ * @param flushQueries flushQueries Flush all pending queries
+ * @return Pairs of parent and child group UUID of the new cache.
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- protected void rethinkGroupCache(Context context, boolean flushQueries) throws SQLException {
-
+ private Set