Revision 7184
Added by ben leinfelder over 12 years ago
| src/edu/ucsb/nceas/metacat/dataone/D1NodeService.java | ||
|---|---|---|
| 456 | 456 |
|
| 457 | 457 |
} |
| 458 | 458 |
|
| 459 |
String[] filterDocid = null; |
|
| 460 |
if (pidFilter != null) {
|
|
| 461 |
try {
|
|
| 462 |
String localId = im.getLocalId(pidFilter); |
|
| 463 |
filterDocid = new String[] {localId};
|
|
| 464 |
} catch (Exception ex) {
|
|
| 465 |
String msg = "Could not find localId for given pidFilter '" + pidFilter + "'"; |
|
| 466 |
logMetacat.warn(msg, ex); |
|
| 467 |
//throw new InvalidRequest("1480", msg);
|
|
| 468 |
} |
|
| 469 |
} |
|
| 470 |
|
|
| 459 | 471 |
logMetacat.debug("fromDate: " + fromDate);
|
| 460 | 472 |
logMetacat.debug("toDate: " + toDate);
|
| 461 | 473 |
|
| 462 |
String report = el.getReport(null, null, null, null,
|
|
| 474 |
String report = el.getReport(null, null, filterDocid, null,
|
|
| 463 | 475 |
new java.sql.Timestamp(fromDate.getTime()), |
| 464 | 476 |
new java.sql.Timestamp(toDate.getTime()), false); |
| 465 | 477 |
|
Also available in: Unified diff
include pidFilter handling - only matches the complete pid. Issues a warning in the Metacat logs when pidFilter cannot be applied but allows the call to getLogs() to return as though there was no pidFilter given.
https://redmine.dataone.org/issues/2798