Revision 6773
Added by ben leinfelder over 12 years ago
| src/edu/ucsb/nceas/metacat/restservice/MNResourceHandler.java | ||
|---|---|---|
| 732 | 732 |
response.addHeader("Content-Length", dr.getContent_Length() + "");
|
| 733 | 733 |
response.addHeader("Last-Modified", DateTimeMarshaller.serializeDateToUTC(dr.getLast_Modified()));
|
| 734 | 734 |
response.addHeader("DataONE-ObjectFormat", dr.getDataONE_ObjectFormatIdentifier().getValue());
|
| 735 |
response.addHeader("DataONE-SerialVersion", dr.getSerialVersion().toString());
|
|
| 736 |
|
|
| 735 | 737 |
|
| 736 | 738 |
} |
| 737 | 739 |
|
| src/edu/ucsb/nceas/metacat/dataone/MNodeService.java | ||
|---|---|---|
| 551 | 551 |
|
| 552 | 552 |
// get system metadata and construct the describe response |
| 553 | 553 |
SystemMetadata sysmeta = getSystemMetadata(session, pid); |
| 554 |
DescribeResponse describeResponse = new DescribeResponse(sysmeta.getFormatId(), sysmeta.getSize(), sysmeta.getDateSysMetadataModified(), |
|
| 555 |
sysmeta.getChecksum()); |
|
| 554 |
DescribeResponse describeResponse = |
|
| 555 |
new DescribeResponse(sysmeta.getFormatId(), sysmeta.getSize(), |
|
| 556 |
sysmeta.getDateSysMetadataModified(), |
|
| 557 |
sysmeta.getChecksum(), sysmeta.getSerialVersion()); |
|
| 556 | 558 |
|
| 557 | 559 |
return describeResponse; |
| 558 | 560 |
|
| ... | ... | |
| 1004 | 1006 |
|
| 1005 | 1007 |
// check for authorization to replicate, null session to act as this source MN |
| 1006 | 1008 |
try {
|
| 1007 |
allowed = D1Client.getCN().isNodeAuthorized(null, targetNodeSubject, pid, Permission.REPLICATE);
|
|
| 1009 |
allowed = D1Client.getCN().isNodeAuthorized(null, targetNodeSubject, pid, null);
|
|
| 1008 | 1010 |
} catch (InvalidToken e1) {
|
| 1009 | 1011 |
throw new ServiceFailure("2181", "Could not determine if node is authorized: "
|
| 1010 | 1012 |
+ e1.getMessage()); |
Also available in: Unified diff
include SerialVersion in describe response
https://redmine.dataone.org/issues/2135
NOTE: d1 jars should be replaced once all schema changes are finalized and the generate d1_common code is committed to svn