Revision 6542
Added by ben leinfelder over 12 years ago
| CNResourceHandler.java | ||
|---|---|---|
| 330 | 330 |
Identifier guidid = new Identifier(); |
| 331 | 331 |
guidid.setValue(guid); |
| 332 | 332 |
logMetacat.debug("getting checksum for object " + guid);
|
| 333 |
Checksum c = CNodeService.getInstance().getChecksum(session, guidid); |
|
| 333 |
Checksum c = CNodeService.getInstance(request).getChecksum(session, guidid);
|
|
| 334 | 334 |
logMetacat.debug("got checksum " + c.getValue());
|
| 335 | 335 |
response.setStatus(200); |
| 336 | 336 |
logMetacat.debug("serializing response");
|
| ... | ... | |
| 395 | 395 |
} |
| 396 | 396 |
|
| 397 | 397 |
logMetacat.debug("calling getLogRecords");
|
| 398 |
Log log = CNodeService.getInstance().getLogRecords(session, fromDate, toDate, event, start, count); |
|
| 398 |
Log log = CNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, event, start, count);
|
|
| 399 | 399 |
|
| 400 | 400 |
OutputStream out = response.getOutputStream(); |
| 401 | 401 |
response.setStatus(200); |
| ... | ... | |
| 421 | 421 |
Identifier id = new Identifier(); |
| 422 | 422 |
id.setValue(guid); |
| 423 | 423 |
|
| 424 |
SystemMetadata sm = CNodeService.getInstance().getSystemMetadata(session, id); |
|
| 424 |
SystemMetadata sm = CNodeService.getInstance(request).getSystemMetadata(session, id);
|
|
| 425 | 425 |
|
| 426 | 426 |
//set the content type |
| 427 | 427 |
if(sm.getFmtid().getValue().trim().equals( |
| ... | ... | |
| 447 | 447 |
response.setHeader("Content-Disposition", "inline; filename=" + id.getValue() + ".xml");
|
| 448 | 448 |
} |
| 449 | 449 |
|
| 450 |
InputStream data = CNodeService.getInstance().get(session, id); |
|
| 450 |
InputStream data = CNodeService.getInstance(request).get(session, id);
|
|
| 451 | 451 |
|
| 452 | 452 |
OutputStream out = response.getOutputStream(); |
| 453 | 453 |
response.setStatus(200); |
| ... | ... | |
| 472 | 472 |
|
| 473 | 473 |
Identifier id = new Identifier(); |
| 474 | 474 |
id.setValue(guid); |
| 475 |
SystemMetadata sysmeta = CNodeService.getInstance().getSystemMetadata(session, id); |
|
| 475 |
SystemMetadata sysmeta = CNodeService.getInstance(request).getSystemMetadata(session, id);
|
|
| 476 | 476 |
|
| 477 | 477 |
response.setContentType("text/xml");
|
| 478 | 478 |
response.setStatus(200); |
| ... | ... | |
| 522 | 522 |
Identifier id = new Identifier(); |
| 523 | 523 |
id.setValue(pid); |
| 524 | 524 |
logMetacat.debug("creating object with pid " + id.getValue());
|
| 525 |
Identifier rId = CNodeService.getInstance().create(session, id, object, smd); |
|
| 525 |
Identifier rId = CNodeService.getInstance(request).create(session, id, object, smd);
|
|
| 526 | 526 |
|
| 527 | 527 |
OutputStream out = response.getOutputStream(); |
| 528 | 528 |
response.setStatus(200); |
| ... | ... | |
| 548 | 548 |
private void listFormats() throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources, NotImplemented, IOException, JiBXException {
|
| 549 | 549 |
logMetacat.debug("Entering listFormats()");
|
| 550 | 550 |
|
| 551 |
ObjectFormatList objectFormatList = CNodeService.getInstance().listFormats(); |
|
| 551 |
ObjectFormatList objectFormatList = CNodeService.getInstance(request).listFormats();
|
|
| 552 | 552 |
// get the response output stream |
| 553 | 553 |
OutputStream out = response.getOutputStream(); |
| 554 | 554 |
response.setStatus(200); |
| ... | ... | |
| 577 | 577 |
fmtid.setValue(fmtidStr); |
| 578 | 578 |
|
| 579 | 579 |
// get the specified object format |
| 580 |
ObjectFormat objectFormat = CNodeService.getInstance().getFormat(fmtid); |
|
| 580 |
ObjectFormat objectFormat = CNodeService.getInstance(request).getFormat(fmtid);
|
|
| 581 | 581 |
|
| 582 | 582 |
OutputStream out = response.getOutputStream(); |
| 583 | 583 |
response.setStatus(200); |
| ... | ... | |
| 621 | 621 |
logMetacat.warn("pid not specified");
|
| 622 | 622 |
} |
| 623 | 623 |
// call the implementation |
| 624 |
boolean result = CNodeService.getInstance().reserveIdentifier(session, pid); |
|
| 624 |
boolean result = CNodeService.getInstance(request).reserveIdentifier(session, pid);
|
|
| 625 | 625 |
OutputStream out = response.getOutputStream(); |
| 626 | 626 |
response.setStatus(200); |
| 627 | 627 |
response.setContentType("text/xml");
|
| ... | ... | |
| 643 | 643 |
private void resolve(String id) throws InvalidRequest, InvalidToken, ServiceFailure, NotAuthorized, NotFound, NotImplemented, IOException, JiBXException {
|
| 644 | 644 |
Identifier pid = new Identifier(); |
| 645 | 645 |
pid.setValue(id); |
| 646 |
ObjectLocationList locationList = CNodeService.getInstance().resolve(session, pid); |
|
| 646 |
ObjectLocationList locationList = CNodeService.getInstance(request).resolve(session, pid);
|
|
| 647 | 647 |
OutputStream out = response.getOutputStream(); |
| 648 | 648 |
response.setStatus(200); |
| 649 | 649 |
response.setContentType("text/xml");
|
| ... | ... | |
| 678 | 678 |
} catch (Exception e) {
|
| 679 | 679 |
logMetacat.warn("pidOfObject not specified");
|
| 680 | 680 |
} |
| 681 |
boolean result = CNodeService.getInstance().assertRelation(session, pidOfSubject, relationship, pidOfObject); |
|
| 681 |
boolean result = CNodeService.getInstance(request).assertRelation(session, pidOfSubject, relationship, pidOfObject);
|
|
| 682 | 682 |
response.setStatus(200); |
| 683 | 683 |
response.setContentType("text/xml");
|
| 684 | 684 |
return result; |
| ... | ... | |
| 703 | 703 |
pid.setValue(id); |
| 704 | 704 |
String subjectStr = params.get("subject")[0];
|
| 705 | 705 |
Subject subject = TypeMarshaller.unmarshalTypeFromStream(Subject.class, new ByteArrayInputStream(subjectStr.getBytes("UTF-8")));
|
| 706 |
Identifier retPid = CNodeService.getInstance().setOwner(session, pid, subject); |
|
| 706 |
Identifier retPid = CNodeService.getInstance(request).setOwner(session, pid, subject);
|
|
| 707 | 707 |
OutputStream out = response.getOutputStream(); |
| 708 | 708 |
response.setStatus(200); |
| 709 | 709 |
response.setContentType("text/xml");
|
| ... | ... | |
| 725 | 725 |
Identifier pid = new Identifier(); |
| 726 | 726 |
pid.setValue(id); |
| 727 | 727 |
String permission = params.get("action")[0];
|
| 728 |
boolean result = CNodeService.getInstance().isAuthorized(session, pid, Permission.convert(permission)); |
|
| 728 |
boolean result = CNodeService.getInstance(request).isAuthorized(session, pid, Permission.convert(permission));
|
|
| 729 | 729 |
response.setStatus(200); |
| 730 | 730 |
response.setContentType("text/xml");
|
| 731 | 731 |
return result; |
| ... | ... | |
| 754 | 754 |
Identifier guid = new Identifier(); |
| 755 | 755 |
guid.setValue(pid); |
| 756 | 756 |
logMetacat.debug("registering system metadata with pid " + guid.getValue());
|
| 757 |
Identifier retGuid = CNodeService.getInstance().registerSystemMetadata(session, guid, systemMetadata); |
|
| 757 |
Identifier retGuid = CNodeService.getInstance(request).registerSystemMetadata(session, guid, systemMetadata);
|
|
| 758 | 758 |
|
| 759 | 759 |
response.setStatus(200); |
| 760 | 760 |
response.setContentType("text/xml");
|
| ... | ... | |
| 783 | 783 |
id.setValue(pid); |
| 784 | 784 |
|
| 785 | 785 |
AccessPolicy accessPolicy = collectAccessPolicy(); |
| 786 |
CNodeService.getInstance().setAccessPolicy(session, id, accessPolicy); |
|
| 786 |
CNodeService.getInstance(request).setAccessPolicy(session, id, accessPolicy);
|
|
| 787 | 787 |
|
| 788 | 788 |
} |
| 789 | 789 |
|
| ... | ... | |
| 814 | 814 |
} |
| 815 | 815 |
|
| 816 | 816 |
// expecting to throw NotImplemented |
| 817 |
CNodeService.getInstance().search(session, queryType, query); |
|
| 817 |
CNodeService.getInstance(request).search(session, queryType, query);
|
|
| 818 | 818 |
} |
| 819 | 819 |
|
| 820 | 820 |
} |
Also available in: Unified diff
add User-Agent logging to support D1 requirements