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

[DS-2728] Remove the BundleBitstream object & replace by JPA mapping

Browse Source
This commit is contained in:
KevinVdV
2015-08-27 12:51:28 +02:00
parent f1060aac7b
commit ae19c42a7b
78 changed files with 362 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dspace-api/src/main/java/org/dspace/statistics/ElasticSearchLoggerServiceImpl.java
View File

@@ -268,10 +268,10 @@ public class ElasticSearchLoggerServiceImpl implements ElasticSearchLoggerServic
if (dspaceObject instanceof Bitstream) {
Bitstream bit = (Bitstream) dspaceObject;
List<BundleBitstream> bundles = bit.getBundles();
List<Bundle> bundles = bit.getBundles();
docBuilder.field("bundleName").startArray();
for (BundleBitstream bundleBitstream : bundles) {
docBuilder.value(bundleBitstream.getBundle().getName());
for (Bundle bundle : bundles) {
docBuilder.value(bundle.getName());
}
docBuilder.endArray();
}
@@ -386,10 +386,10 @@ public class ElasticSearchLoggerServiceImpl implements ElasticSearchLoggerServic
if (dspaceObject instanceof Bitstream) {
Bitstream bit = (Bitstream) dspaceObject;
List<BundleBitstream> bundles = bit.getBundles();
List<Bundle> bundles = bit.getBundles();
docBuilder.field("bundleName").startArray();
for (BundleBitstream bundleBitstream : bundles) {
docBuilder.value(bundleBitstream.getBundle().getName());
for (Bundle bundle : bundles) {
docBuilder.value(bundle.getName());
}
docBuilder.endArray();
}
@@ -493,8 +493,8 @@ public class ElasticSearchLoggerServiceImpl implements ElasticSearchLoggerServic
} else if (dso instanceof Bitstream) {
Bitstream bitstream = (Bitstream) dso;
for (BundleBitstream bundleBitstream : bitstream.getBundles()) {
for (Item item : bundleBitstream.getBundle().getItems()) {
for (Bundle bundle : bitstream.getBundles()) {
for (Item item : bundle.getItems()) {
parents.get("owningItem").add(item.getID().toString());
buildParents(item, parents);