Revision 8810
Added by ben leinfelder almost 10 years ago
IdentifierManager.java | ||
---|---|---|
36 | 36 |
import java.util.Vector; |
37 | 37 |
|
38 | 38 |
import org.apache.log4j.Logger; |
39 |
import org.dataone.client.ObjectFormatCache; |
|
39 |
import org.dataone.client.v2.formats.ObjectFormatCache;
|
|
40 | 40 |
import org.dataone.service.exceptions.BaseException; |
41 | 41 |
import org.dataone.service.exceptions.InvalidSystemMetadata; |
42 | 42 |
import org.dataone.service.types.v1.AccessPolicy; |
... | ... | |
52 | 52 |
import org.dataone.service.types.v1.ReplicationPolicy; |
53 | 53 |
import org.dataone.service.types.v1.ReplicationStatus; |
54 | 54 |
import org.dataone.service.types.v1.Subject; |
55 |
import org.dataone.service.types.v1.SystemMetadata;
|
|
55 |
import org.dataone.service.types.v2.SystemMetadata;
|
|
56 | 56 |
|
57 | 57 |
import edu.ucsb.nceas.metacat.accesscontrol.XMLAccessAccess; |
58 | 58 |
import edu.ucsb.nceas.metacat.database.DBConnection; |
... | ... | |
1054 | 1054 |
String authoritativeMemberNode, long modifiedDate, String submitter, |
1055 | 1055 |
String guid, String objectFormat, BigInteger size, boolean archived, |
1056 | 1056 |
boolean replicationAllowed, int numberReplicas, String obsoletes, |
1057 |
String obsoletedBy, BigInteger serialVersion, DBConnection dbConn) throws SQLException { |
|
1057 |
String obsoletedBy, BigInteger serialVersion, String seriesId, DBConnection dbConn) throws SQLException {
|
|
1058 | 1058 |
|
1059 | 1059 |
// Execute the insert statement |
1060 | 1060 |
String query = "update " + TYPE_SYSTEM_METADATA + |
1061 | 1061 |
" set (date_uploaded, rights_holder, checksum, checksum_algorithm, " + |
1062 | 1062 |
"origin_member_node, authoritive_member_node, date_modified, " + |
1063 | 1063 |
"submitter, object_format, size, archived, replication_allowed, number_replicas, " + |
1064 |
"obsoletes, obsoleted_by, serial_version) " + |
|
1065 |
"= (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) where guid = ?"; |
|
1064 |
"obsoletes, obsoleted_by, serial_version, series_id) " +
|
|
1065 |
"= (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) where guid = ?";
|
|
1066 | 1066 |
PreparedStatement stmt = dbConn.prepareStatement(query); |
1067 | 1067 |
|
1068 | 1068 |
//data values |
... | ... | |
1082 | 1082 |
stmt.setString(14, obsoletes); |
1083 | 1083 |
stmt.setString(15, obsoletedBy); |
1084 | 1084 |
stmt.setString(16, serialVersion.toString()); |
1085 |
stmt.setString(17, seriesId); |
|
1085 | 1086 |
|
1087 |
|
|
1086 | 1088 |
//where clause |
1087 |
stmt.setString(17, guid);
|
|
1089 |
stmt.setString(18, guid);
|
|
1088 | 1090 |
logMetacat.debug("stmt: " + stmt.toString()); |
1089 | 1091 |
//execute |
1090 | 1092 |
int rows = stmt.executeUpdate(); |
... | ... | |
1207 | 1209 |
sm.getObsoletes() == null ? null:sm.getObsoletes().getValue(), |
1208 | 1210 |
sm.getObsoletedBy() == null ? null: sm.getObsoletedBy().getValue(), |
1209 | 1211 |
sm.getSerialVersion(), |
1212 |
sm.getSeriesId() == null ? null: sm.getSeriesId().getValue(), |
|
1210 | 1213 |
dbConn |
1211 | 1214 |
); |
1212 | 1215 |
|
Also available in: Unified diff
add support for v2 DataONE API.