Revision 6561
Added by ben leinfelder over 12 years ago
| IdentifierManager.java | ||
|---|---|---|
| 108 | 108 |
public SystemMetadata asSystemMetadata(Date dateUploaded, String rightsHolder, |
| 109 | 109 |
String checksum, String checksumAlgorithm, String originMemberNode, |
| 110 | 110 |
String authoritativeMemberNode, Date dateModified, String submitter, |
| 111 |
String guid, String fmtidStr, BigInteger size) {
|
|
| 111 |
String guid, String fmtidStr, BigInteger size, BigInteger serialVersion) {
|
|
| 112 | 112 |
SystemMetadata sysMeta = new SystemMetadata(); |
| 113 | 113 |
|
| 114 | 114 |
Identifier sysMetaId = new Identifier(); |
| ... | ... | |
| 134 | 134 |
sysMeta.setSubmitter(submitterSubject); |
| 135 | 135 |
try {
|
| 136 | 136 |
ObjectFormatIdentifier fmtid = |
| 137 |
ObjectFormatCache.getInstance().getFormat(fmtidStr).getFmtid();
|
|
| 138 |
sysMeta.setFmtid(fmtid);
|
|
| 137 |
ObjectFormatCache.getInstance().getFormat(fmtidStr).getFormatId();
|
|
| 138 |
sysMeta.setFormatId(fmtid);
|
|
| 139 | 139 |
} catch (NotFound nfe) {
|
| 140 | 140 |
logMetacat.error("The objectFormat " + fmtidStr +
|
| 141 | 141 |
" is not registered. Setting the default format id."); |
| 142 | 142 |
ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier(); |
| 143 | 143 |
fmtid.setValue("application/octet-stream");
|
| 144 |
sysMeta.setFmtid(fmtid);
|
|
| 144 |
sysMeta.setFormatId(fmtid);
|
|
| 145 | 145 |
} |
| 146 | 146 |
sysMeta.setSize(size); |
| 147 |
sysMeta.setSerialVersion(serialVersion); |
|
| 147 | 148 |
|
| 148 | 149 |
return sysMeta; |
| 149 | 150 |
} |
| ... | ... | |
| 244 | 245 |
SystemMetadata sysMeta = new SystemMetadata(); |
| 245 | 246 |
String sql = "select guid, date_uploaded, rights_holder, checksum, checksum_algorithm, " + |
| 246 | 247 |
"origin_member_node, authoritive_member_node, date_modified, submitter, object_format, size, " + |
| 247 |
"replication_allowed, number_replicas, obsoletes, obsoleted_by " + |
|
| 248 |
"replication_allowed, number_replicas, obsoletes, obsoleted_by, serial_version " +
|
|
| 248 | 249 |
"from systemmetadata where guid = ?"; |
| 249 | 250 |
DBConnection dbConn = null; |
| 250 | 251 |
int serialNumber = -1; |
| 251 | 252 |
Boolean replicationAllowed = new Boolean(false); |
| 252 | 253 |
BigInteger numberOfReplicas = new BigInteger("-1");
|
| 253 |
|
|
| 254 |
BigInteger serialVersion = new BigInteger("-1");
|
|
| 255 |
|
|
| 254 | 256 |
try |
| 255 | 257 |
{
|
| 256 | 258 |
// Get a database connection from the pool |
| ... | ... | |
| 277 | 279 |
numberOfReplicas = new BigInteger(rs.getString(13)); |
| 278 | 280 |
String obsoletes = rs.getString(14); |
| 279 | 281 |
String obsoletedBy = rs.getString(15); |
| 282 |
serialVersion = new BigInteger(rs.getString(16)); |
|
| 280 | 283 |
|
| 284 |
|
|
| 281 | 285 |
Identifier sysMetaId = new Identifier(); |
| 282 | 286 |
sysMetaId.setValue(guid); |
| 283 | 287 |
sysMeta.setIdentifier(sysMetaId); |
| 288 |
sysMeta.setSerialVersion(serialVersion); |
|
| 284 | 289 |
sysMeta.setDateUploaded(dateUploaded); |
| 285 | 290 |
Subject rightsHolderSubject = new Subject(); |
| 286 | 291 |
rightsHolderSubject.setValue(rightsHolder); |
| ... | ... | |
| 305 | 310 |
sysMeta.setSubmitter(submitterSubject); |
| 306 | 311 |
try {
|
| 307 | 312 |
ObjectFormatIdentifier fmtid = |
| 308 |
ObjectFormatCache.getInstance().getFormat(fmtidStr).getFmtid();
|
|
| 309 |
sysMeta.setFmtid(fmtid);
|
|
| 313 |
ObjectFormatCache.getInstance().getFormat(fmtidStr).getFormatId();
|
|
| 314 |
sysMeta.setFormatId(fmtid);
|
|
| 310 | 315 |
} catch (NotFound nfe) {
|
| 311 | 316 |
logMetacat.error("The objectFormat " + fmtidStr +
|
| 312 | 317 |
" is not registered. Setting the default format id."); |
| 313 | 318 |
ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier(); |
| 314 | 319 |
fmtid.setValue("application/octet-stream");
|
| 315 |
sysMeta.setFmtid(fmtid);
|
|
| 320 |
sysMeta.setFormatId(fmtid);
|
|
| 316 | 321 |
} |
| 317 | 322 |
sysMeta.setSize(size); |
| 318 | 323 |
if (obsoletes != null) {
|
| ... | ... | |
| 1067 | 1072 |
String checksum, String checksumAlgorithm, String originMemberNode, |
| 1068 | 1073 |
String authoritativeMemberNode, long modifiedDate, String submitter, |
| 1069 | 1074 |
String guid, String objectFormat, BigInteger size, boolean replicationAllowed, |
| 1070 |
int numberReplicas, String obsoletes, String obsoletedBy) |
|
| 1075 |
int numberReplicas, String obsoletes, String obsoletedBy, BigInteger serialVersion)
|
|
| 1071 | 1076 |
{
|
| 1072 | 1077 |
DBConnection dbConn = null; |
| 1073 | 1078 |
int serialNumber = -1; |
| ... | ... | |
| 1082 | 1087 |
String query = "update " + TYPE_SYSTEM_METADATA + |
| 1083 | 1088 |
" set (date_uploaded, rights_holder, checksum, checksum_algorithm, " + |
| 1084 | 1089 |
"origin_member_node, authoritive_member_node, date_modified, " + |
| 1085 |
"submitter, object_format, size, replication_allowed, number_replicas, obsoletes, obsoleted_by) " + |
|
| 1086 |
"= (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) where guid = ?"; |
|
| 1090 |
"submitter, object_format, size, replication_allowed, number_replicas, " + |
|
| 1091 |
"obsoletes, obsoleted_by, serial_version) " + |
|
| 1092 |
"= (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) where guid = ?"; |
|
| 1087 | 1093 |
PreparedStatement stmt = dbConn.prepareStatement(query); |
| 1088 | 1094 |
|
| 1089 | 1095 |
//data values |
| ... | ... | |
| 1101 | 1107 |
stmt.setInt(12, numberReplicas); |
| 1102 | 1108 |
stmt.setString(13, obsoletes); |
| 1103 | 1109 |
stmt.setString(14, obsoletedBy); |
| 1110 |
stmt.setString(15, serialVersion.toString()); |
|
| 1104 | 1111 |
|
| 1105 | 1112 |
//where clause |
| 1106 |
stmt.setString(15, guid);
|
|
| 1113 |
stmt.setString(16, guid);
|
|
| 1107 | 1114 |
logMetacat.debug("stmt: " + stmt.toString());
|
| 1108 | 1115 |
//execute |
| 1109 | 1116 |
int rows = stmt.executeUpdate(); |
| ... | ... | |
| 1245 | 1252 |
sm.getDateSysMetadataModified() == null ? null: sm.getDateSysMetadataModified().getTime(), |
| 1246 | 1253 |
sm.getSubmitter() == null ? null: sm.getSubmitter().getValue(), |
| 1247 | 1254 |
sm.getIdentifier().getValue(), |
| 1248 |
sm.getFmtid() == null ? null: sm.getFmtid().getValue(),
|
|
| 1255 |
sm.getFormatId() == null ? null: sm.getFormatId().getValue(),
|
|
| 1249 | 1256 |
sm.getSize(), |
| 1250 | 1257 |
replicationAllowed, |
| 1251 | 1258 |
numberReplicas, |
| 1252 | 1259 |
sm.getObsoletes() == null ? null:sm.getObsoletes().getValue(), |
| 1253 |
sm.getObsoletedBy() == null ? null: sm.getObsoletedBy().getValue()); |
|
| 1260 |
sm.getObsoletedBy() == null ? null: sm.getObsoletedBy().getValue(), |
|
| 1261 |
sm.getSerialVersion() |
|
| 1262 |
); |
|
| 1254 | 1263 |
|
| 1255 | 1264 |
String guid = sm.getIdentifier().getValue(); |
| 1256 | 1265 |
|
| ... | ... | |
| 1583 | 1592 |
// set the format type |
| 1584 | 1593 |
ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier(); |
| 1585 | 1594 |
fmtid.setValue(fmtidStr); |
| 1586 |
oi.setFmtid(fmtid);
|
|
| 1595 |
oi.setFormatId(fmtid);
|
|
| 1587 | 1596 |
|
| 1588 | 1597 |
// try {
|
| 1589 | 1598 |
// oi.setFmtid(ObjectFormatCache.getInstance().getFormat(fmtidStr).getFmtid()); |
Also available in: Unified diff
move the DataONE 1.0.0-SNAPSHOT