Revision 8810
Added by ben leinfelder over 9 years ago
GenerateORE.java | ||
---|---|---|
39 | 39 |
import org.apache.commons.io.IOUtils; |
40 | 40 |
import org.apache.commons.logging.Log; |
41 | 41 |
import org.apache.commons.logging.LogFactory; |
42 |
import org.dataone.client.D1Client; |
|
43 |
import org.dataone.client.MNode; |
|
44 |
import org.dataone.client.ObjectFormatCache; |
|
42 |
import org.dataone.client.v2.itk.D1Client;
|
|
43 |
import org.dataone.client.v2.MNode;
|
|
44 |
import org.dataone.client.v2.formats.ObjectFormatCache;
|
|
45 | 45 |
import org.dataone.ore.ResourceMapFactory; |
46 | 46 |
import org.dataone.service.types.v1.Checksum; |
47 | 47 |
import org.dataone.service.types.v1.Identifier; |
48 | 48 |
import org.dataone.service.types.v1.ObjectFormatIdentifier; |
49 | 49 |
import org.dataone.service.types.v1.ObjectInfo; |
50 | 50 |
import org.dataone.service.types.v1.ObjectList; |
51 |
import org.dataone.service.types.v1.SystemMetadata;
|
|
51 |
import org.dataone.service.types.v2.SystemMetadata;
|
|
52 | 52 |
import org.dataone.service.types.v1.util.ChecksumUtil; |
53 | 53 |
import org.dspace.foresite.ResourceMap; |
54 | 54 |
|
... | ... | |
169 | 169 |
formatId = ObjectFormatCache.getInstance().getFormat("http://www.openarchives.org/ore/terms").getFormatId(); |
170 | 170 |
|
171 | 171 |
// get the objects that match |
172 |
ObjectList objectList = mn.listObjects(null, null, null, formatId , null, 0, Integer.MAX_VALUE);
|
|
172 |
ObjectList objectList = mn.listObjects(null, null, null, formatId, null, null, 0, Integer.MAX_VALUE);
|
|
173 | 173 |
pids = new ArrayList<Identifier>(); |
174 | 174 |
for (ObjectInfo o: objectList.getObjectInfoList()) { |
175 | 175 |
pids.add(o.getIdentifier()); |
... | ... | |
214 | 214 |
log.debug("processing ORE pid: " + orePid.getValue()); |
215 | 215 |
|
216 | 216 |
// get original SystemMetadata |
217 |
SystemMetadata originalOreSysMeta = mn.getSystemMetadata(orePid); |
|
217 |
SystemMetadata originalOreSysMeta = mn.getSystemMetadata(null, orePid);
|
|
218 | 218 |
|
219 | 219 |
// only update the CURRENT revision of the ORE |
220 | 220 |
if (originalOreSysMeta.getObsoletedBy() != null || (originalOreSysMeta.getArchived() != null && originalOreSysMeta.getArchived())) { |
... | ... | |
223 | 223 |
} |
224 | 224 |
|
225 | 225 |
// get the original ORE map |
226 |
InputStream originalOreStream = mn.get(orePid); |
|
226 |
InputStream originalOreStream = mn.get(null, orePid);
|
|
227 | 227 |
Map<Identifier, Map<Identifier, List<Identifier>>> originalOre = ResourceMapFactory.getInstance().parseResourceMap(originalOreStream); |
228 | 228 |
|
229 | 229 |
// generate the updated ORE map, in this case we aren't changing any values, just altering the serialization using a newer foresite library |
Also available in: Unified diff
add support for v2 DataONE API.