Project

General

Profile

« Previous | Next » 

Revision 6397

Added by ben leinfelder over 12 years ago

changes for schema update (d1_common)

View differences:

IdentifierManager.java
41 41 
import org.dataone.service.types.v1.AccessPolicy;
42 42 
import org.dataone.service.types.v1.AccessRule;
43 43 
import org.dataone.service.types.v1.Checksum;
44 
import org.dataone.service.types.v1.ChecksumAlgorithm;
45 44 
import org.dataone.service.types.v1.Identifier;
46 45 
import org.dataone.service.types.v1.NodeReference;
47 46 
import org.dataone.service.types.v1.ObjectFormat;
......
121 120 
        sysMeta.setRightsHolder(rightsHolderSubject);
122 121 
        Checksum checksumObject = new Checksum();
123 122 
        checksumObject.setValue(checksum);
124 
        checksumObject.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));
123 
        checksumObject.setAlgorithm(checksumAlgorithm);
125 124 
        sysMeta.setChecksum(checksumObject);
126 125 
        NodeReference omn = new NodeReference();
127 126 
        omn.setValue(originMemberNode);
......
284 283 
                sysMeta.setRightsHolder(rightsHolderSubject);
285 284 
                Checksum checksumObject = new Checksum();
286 285 
                checksumObject.setValue(checksum);
287 
                checksumObject.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));
286 
                checksumObject.setAlgorithm(checksumAlgorithm);
288 287 
                sysMeta.setChecksum(checksumObject);
289 288 
                NodeReference omn = new NodeReference();
290 289 
                omn.setValue(originMemberNode);
......
1140 1139 
				sm.getDateUploaded() == null ? null: sm.getDateUploaded().getTime(),
1141 1140 
				sm.getRightsHolder() == null ? null: sm.getRightsHolder().getValue(),
1142 1141 
				sm.getChecksum() == null ? null: sm.getChecksum().getValue(),
1143 
				sm.getChecksum() == null ? null: sm.getChecksum().getAlgorithm().xmlValue(),
1142 
				sm.getChecksum() == null ? null: sm.getChecksum().getAlgorithm(),
1144 1143 
				sm.getOriginMemberNode() == null ? null: sm.getOriginMemberNode().getValue(),
1145 1144 
				sm.getAuthoritativeMemberNode() == null ? null: sm.getAuthoritativeMemberNode().getValue(),
1146 1145 
				sm.getDateSysMetadataModified() == null ? null: sm.getDateSysMetadataModified().getTime(),
......
1468 1467 
                cs.setValue(checksum);
1469 1468 
                try {
1470 1469 
                	//cs.setAlgorithm(ChecksumAlgorithm.valueOf(checksumAlgorithm));
1471 
                    cs.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));
1470 
                    cs.setAlgorithm(checksumAlgorithm);
1472 1471 
                } catch (Exception e) {
1473 1472 
					logMetacat.warn("could not parse checksum algorithm", e);
1474 1473 
				}

Also available in: Unified diff