Revision 7101
Added by ben leinfelder over 12 years ago
| test/edu/ucsb/nceas/metacat/dataone/MNodeServiceTest.java | ||
|---|---|---|
| 816 | 816 |
int count = 1; |
| 817 | 817 |
|
| 818 | 818 |
log = MNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, |
| 819 |
event, start, count, null);
|
|
| 819 |
event, null, start, count);
|
|
| 820 | 820 |
|
| 821 | 821 |
assertNotNull(log); |
| 822 | 822 |
assertTrue(log.getCount() == count); |
| test/edu/ucsb/nceas/metacat/dataone/CNodeServiceTest.java | ||
|---|---|---|
| 166 | 166 |
int count = 1; |
| 167 | 167 |
|
| 168 | 168 |
Log log = CNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, |
| 169 |
event, start, count, null);
|
|
| 169 |
event, null, start, count);
|
|
| 170 | 170 |
assertNotNull(log); |
| 171 | 171 |
assertTrue(log.getCount() == count); |
| 172 | 172 |
assertTrue(log.getStart() == start); |
| src/edu/ucsb/nceas/metacat/restservice/MNResourceHandler.java | ||
|---|---|---|
| 839 | 839 |
} |
| 840 | 840 |
|
| 841 | 841 |
logMetacat.debug("calling getLogRecords");
|
| 842 |
Log log = MNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, event, start, count, pidFilter);
|
|
| 842 |
Log log = MNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, event, pidFilter, start, count);
|
|
| 843 | 843 |
|
| 844 | 844 |
OutputStream out = response.getOutputStream(); |
| 845 | 845 |
response.setStatus(200); |
| src/edu/ucsb/nceas/metacat/restservice/CNResourceHandler.java | ||
|---|---|---|
| 496 | 496 |
|
| 497 | 497 |
logMetacat.debug("calling getLogRecords");
|
| 498 | 498 |
Log log = CNodeService.getInstance(request).getLogRecords(session, |
| 499 |
fromDate, toDate, event, start, count, pidFilter);
|
|
| 499 |
fromDate, toDate, event, pidFilter, start, count);
|
|
| 500 | 500 |
|
| 501 | 501 |
OutputStream out = response.getOutputStream(); |
| 502 | 502 |
response.setStatus(200); |
| src/edu/ucsb/nceas/metacat/dataone/MNodeService.java | ||
|---|---|---|
| 870 | 870 |
try {
|
| 871 | 871 |
|
| 872 | 872 |
// get log records first |
| 873 |
Log logs = getLogRecords(session, startTime, endTime, event, 0, null, null);
|
|
| 873 |
Log logs = getLogRecords(session, startTime, endTime, event, null, 0, null);
|
|
| 874 | 874 |
|
| 875 | 875 |
// TODO: aggregate by day or hour -- needs clarification |
| 876 | 876 |
int count = 1; |
| src/edu/ucsb/nceas/metacat/dataone/D1NodeService.java | ||
|---|---|---|
| 448 | 448 |
* @throws NotImplemented |
| 449 | 449 |
*/ |
| 450 | 450 |
public Log getLogRecords(Session session, Date fromDate, Date toDate, |
| 451 |
Event event, Integer start, Integer count, String pidFilter) throws InvalidToken, ServiceFailure,
|
|
| 451 |
Event event, String pidFilter, Integer start, Integer count) throws InvalidToken, ServiceFailure,
|
|
| 452 | 452 |
NotAuthorized, InvalidRequest, NotImplemented {
|
| 453 | 453 |
|
| 454 | 454 |
|
Also available in: Unified diff
change ordering of getLogRecords() parameter -- pidFilter is in the middle now