From a4af569e384baf0dcff0198016a309ed66b9910a Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 1 Oct 2014 21:21:43 +0200 Subject: Predefined steps normally only interact with the last version of a Collection. New steps will be added to create fixed versions as needed. --- src/main/java/com/c2kernel/entity/proxy/ItemProxy.java | 2 +- src/main/java/com/c2kernel/entity/transfer/TransferItem.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/entity') diff --git a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java index 987873f..c59049e 100644 --- a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java +++ b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java @@ -202,7 +202,7 @@ public class ItemProxy } public Collection getCollection(String collName) throws ObjectNotFoundException { - return (Collection)getObject(ClusterStorage.COLLECTION+"/"+collName); + return (Collection)getObject(ClusterStorage.COLLECTION+"/"+collName+"/last"); } public Workflow getWorkflow() throws ObjectNotFoundException { diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java index d1379cf..d63ce23 100644 --- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java +++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java @@ -132,10 +132,9 @@ public class TransferItem { newItem.initialise(importAgentId.getSystemKey(), Gateway.getMarshaller().marshall(props), Gateway.getMarshaller().marshall(wf.search("workflow/domain")), - null); + Gateway.getMarshaller().marshall(colls)); // store objects - importByType(ClusterStorage.COLLECTION, objects); //TODO: move this to initialise importByType(ClusterStorage.HISTORY, objects); importByType(ClusterStorage.OUTCOME, objects); importByType(ClusterStorage.VIEWPOINT, objects); -- cgit v1.2.3