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

Fix checksum findBitstreams with not recent checksum

Browse Source
This commit is contained in:
Peter Dietz
2015-11-11 19:07:32 -05:00
parent 905445c864
commit 28400c1437
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/checker/MostRecentChecksum.java
View File

@@ -87,9 +87,9 @@ public class MostRecentChecksum implements Serializable
setProcessStartDate(new Date());
setProcessEndDate(new Date());
if (bitstream.getChecksumAlgorithm() == null) {
bitstream.setChecksumAlgorithm("MD5");
setChecksumAlgorithm("MD5");
} else {
bitstream.setChecksumAlgorithm(bitstream.getChecksumAlgorithm());
setChecksumAlgorithm(bitstream.getChecksumAlgorithm());
}
setMatchedPrevChecksum(true);

17
dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
View File

@@ -7,20 +7,16 @@
*/
package org.dspace.content.dao.impl;
import org.dspace.checker.MostRecentChecksum;
import org.dspace.content.Bitstream;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
import org.dspace.content.dao.BitstreamDAO;
import org.dspace.core.Context;
import org.dspace.core.AbstractHibernateDSODAO;
import org.dspace.core.Context;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.Subqueries;
import java.sql.SQLException;
import java.util.Iterator;
@@ -67,15 +63,8 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
// + "where not exists( select 'x' from most_recent_checksum "
// + "where most_recent_checksum.bitstream_id = bitstream.bitstream_id )"
DetachedCriteria d = DetachedCriteria.forClass(MostRecentChecksum.class, "mrc");
d.setProjection(Projections.projectionList().add(Projections.property("mrc.bitstream")));
Criteria criteria = createCriteria(context, Bitstream.class, "b")
.add(Subqueries.propertyNotIn("b.id", d));
@SuppressWarnings("unchecked")
List<Bitstream> result = (List<Bitstream>) criteria.list();
return result;
Query query = createQuery(context, "select b from Bitstream b where b not in (select c.bitstream from MostRecentChecksum c)");
return query.list();
}
@Override