Project

General

Profile

« Previous | Next » 

Revision 6366

Added by ben leinfelder over 12 years ago

use new "v1" types from DataONE

View differences:

MetacatPopulator.java
46 46 
import org.dataone.client.ObjectFormatCache;
47 47 
import org.dataone.client.auth.CertificateManager;
48 48 
import org.dataone.service.exceptions.NotFound;
49 
import org.dataone.service.types.AccessPolicy;
50 
import org.dataone.service.types.AccessRule;
51 
import org.dataone.service.types.Checksum;
52 
import org.dataone.service.types.ChecksumAlgorithm;
53 
import org.dataone.service.types.Identifier;
54 
import org.dataone.service.types.NodeReference;
55 
import org.dataone.service.types.ObjectFormat;
56 
import org.dataone.service.types.Permission;
57 
import org.dataone.service.types.Session;
58 
import org.dataone.service.types.Subject;
59 
import org.dataone.service.types.SystemMetadata;
49 
import org.dataone.service.types.v1.AccessPolicy;
50 
import org.dataone.service.types.v1.AccessRule;
51 
import org.dataone.service.types.v1.Checksum;
52 
import org.dataone.service.types.v1.ChecksumAlgorithm;
53 
import org.dataone.service.types.v1.Identifier;
54 
import org.dataone.service.types.v1.NodeReference;
55 
import org.dataone.service.types.v1.ObjectFormat;
56 
import org.dataone.service.types.v1.Permission;
57 
import org.dataone.service.types.v1.Session;
58 
import org.dataone.service.types.v1.Subject;
59 
import org.dataone.service.types.v1.SystemMetadata;
60 60 
import org.ecoinformatics.datamanager.DataManager;
61 61 
import org.ecoinformatics.datamanager.database.DatabaseConnectionPoolInterface;
62 62 
import org.ecoinformatics.datamanager.parser.DataPackage;
......
191 191 
	                    did.setValue(dataDocLocalId);
192 192
193 193 
	                    //add the desribeby to the eml's sysmeta
194 
	                    System.out.println("adding describe for doc " +
195 
	                            sysmeta.getIdentifier().getValue() + " :" + did.getValue());
196 
	                    sysmeta.addDescribe(did);
194 
	                    // TODO Use ORE
195 
//	                    System.out.println("adding describe for doc " +
196 
//	                            sysmeta.getIdentifier().getValue() + " :" + did.getValue());
197 
//	                    sysmeta.addDescribe(did);
197 198
198 199 
	                    //create sysmeta for the data doc
199 200 
	                    SystemMetadata dataDocSysMeta = generateSystemMetadata(doc);
......
213 214 
	                    checksum.setValue(checksum(dataDocIs));
214 215 
	                    dataDocSysMeta.setChecksum(checksum);
215 216 
	                    dataDocSysMeta.setSize(dataDocText.getBytes(MetaCatServlet.DEFAULT_ENCODING).length);
216 
	                    dataDocSysMeta.addDescribedBy(sysmeta.getIdentifier());
217 
	                    // TODO use ORE map
218 
	                    //dataDocSysMeta.addDescribedBy(sysmeta.getIdentifier());
217 219 
	                    boolean error = false;
218 220
219 221 
	                    // create access policy

Also available in: Unified diff