Revision 5337
Added by berkley about 14 years ago
| ResourceHandler.java | ||
|---|---|---|
| 285 | 285 |
initParams(); |
| 286 | 286 |
|
| 287 | 287 |
Timer timer = new Timer(); |
| 288 |
handler = new MetacatHandler(servletContext, timer);
|
|
| 288 |
handler = new MetacatHandler(timer); |
|
| 289 | 289 |
|
| 290 | 290 |
if (resource.equals(RESOURCE_SESSION) && httpVerb == POST |
| 291 | 291 |
&& params.get(FUNCTION_KEYWORD) != null) {
|
| ... | ... | |
| 484 | 484 |
*/ |
| 485 | 485 |
private void getObject(String guid) {
|
| 486 | 486 |
//hack...fix this |
| 487 |
CrudService cs = new CrudService(servletContext, request, response); |
|
| 487 |
//CrudService cs = new CrudService(servletContext, request, response); |
|
| 488 |
CrudService cs = CrudService.getInstance(); |
|
| 489 |
cs.setParamsFromRequest(request); |
|
| 488 | 490 |
AuthToken token = null; |
| 489 | 491 |
OutputStream out = null; |
| 490 | 492 |
try {
|
| ... | ... | |
| 506 | 508 |
* @param guid ID of data object to be read |
| 507 | 509 |
*/ |
| 508 | 510 |
private void getSystemMetadataObject(String guid) {
|
| 509 |
CrudService cs = new CrudService(servletContext, request, response); |
|
| 511 |
//CrudService cs = new CrudService(servletContext, request, response); |
|
| 512 |
CrudService cs = CrudService.getInstance(); |
|
| 513 |
cs.setParamsFromRequest(request); |
|
| 510 | 514 |
AuthToken token = null; |
| 511 | 515 |
OutputStream out = null; |
| 512 | 516 |
try {
|
| ... | ... | |
| 669 | 673 |
IUnmarshallingContext uctx = bfact.createUnmarshallingContext(); |
| 670 | 674 |
SystemMetadata m = (SystemMetadata) uctx.unmarshalDocument(sysmeta, null); |
| 671 | 675 |
|
| 672 |
CrudService cs = new CrudService(servletContext, request, response); |
|
| 676 |
//CrudService cs = new CrudService(servletContext, request, response); |
|
| 677 |
CrudService cs = CrudService.getInstance(); |
|
| 678 |
cs.setParamsFromRequest(request); |
|
| 673 | 679 |
Identifier id = new Identifier(); |
| 674 | 680 |
id.setValue(guid); |
| 675 | 681 |
cs.create(token, id, object, m); |
Also available in: Unified diff
removed CrudService dependency on servlet params. CrudService is now a singleton. I'm getting an error from metacat saying it can't find teh systemmetadata schema, even though it is, in fact, registered with metacat. need to identify why this is happening.