inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MOB-1656: Audit Log: Log ordering is incorrect for "Last N" results

Browse Source 
- Added option to have results in either ascending or descending order
 - RM uses descending listings where the query results are limited


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-09-30 15:56:05 +00:00
parent 77457e3670
commit 7bc361268d
12 changed files with 169 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
View File

@@ -383,7 +383,10 @@ public abstract class AbstractAuditDAOImpl implements AuditDAO
if (auditValuesPair == null)
{
// Ignore
logger.warn("Audit entry not joined to audit properties: " + row);
more = callback.handleAuditEntryError(
row.getAuditEntryId(),
"Audit entry not joined to audit properties: " + row,
null);
return;
}
auditValues = (Map<String, Serializable>) auditValuesPair.getSecond();
@@ -397,17 +400,26 @@ public abstract class AbstractAuditDAOImpl implements AuditDAO
}
catch (ClassCastException e)
{
logger.warn("Audit entry not linked to a Map<String, Serializable> value: " + row);
more = callback.handleAuditEntryError(
row.getAuditEntryId(),
"Audit entry not linked to a Map<String, Serializable> value: " + row,
e);
return;
}
catch (Throwable e)
{
logger.warn("Audit entry unable to extract audited values: " + row, e);
more = callback.handleAuditEntryError(
row.getAuditEntryId(),
"Audit entry unable to extract audited values: " + row,
e);
return;
}
if (auditValues == null)
{
logger.warn("Audit entry incompletely joined to audit properties: " + row);
more = callback.handleAuditEntryError(
row.getAuditEntryId(),
"Audit entry incompletely joined to audit properties: " + row,
null);
return;
}
}
@@ -430,25 +442,28 @@ public abstract class AbstractAuditDAOImpl implements AuditDAO
public void findAuditEntries(
AuditQueryCallback callback,
boolean forward,
String applicationName, String user, Long from, Long to,
int maxResults)
{
AuditQueryRowHandler rowHandler = new AuditQueryRowHandler(callback);
findAuditEntries(rowHandler, applicationName, user, from, to, maxResults, null, null);
findAuditEntries(rowHandler, forward, applicationName, user, from, to, maxResults, null, null);
}
public void findAuditEntries(
AuditQueryCallback callback,
boolean forward,
String applicationName, String user, Long from, Long to,
String searchKey, Serializable searchValue,
int maxResults)
{
AuditQueryRowHandler rowHandler = new AuditQueryRowHandler(callback);
findAuditEntries(rowHandler, applicationName, user, from, to, maxResults, searchKey, searchValue);
findAuditEntries(rowHandler, forward, applicationName, user, from, to, maxResults, searchKey, searchValue);
}
protected abstract void findAuditEntries(
AuditQueryRowHandler rowHandler,
boolean forward,
String applicationName, String user, Long from, Long to, int maxResults,
String searchKey, Serializable searchValue);
}