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

ALF-9156 Start on the calendar entry canned query, with date filtering, based on the Blog one

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-07-13 17:12:04 +00:00
parent 86f9dfea17
commit 0cb9a6b9f7
6 changed files with 701 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
View File

@@ -32,6 +32,8 @@ import org.alfresco.query.CannedQueryFactory;
import org.alfresco.query.CannedQueryResults;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.calendar.cannedqueries.GetCalendarEntriesCannedQuery;
import org.alfresco.repo.calendar.cannedqueries.GetCalendarEntriesCannedQueryFactory;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -67,6 +69,7 @@ public class CalendarServiceImpl implements CalendarService
private static final int MAX_QUERY_ENTRY_COUNT = 10000;
private static final String CANNED_QUERY_GET_CHILDREN = "calendarGetChildrenCannedQueryFactory";
private static final String CANNED_QUERY_GET_ENTRIES = "calendarGetCalendarEntriesCannedQueryFactory";
/**
* The logger
@@ -75,11 +78,10 @@ public class CalendarServiceImpl implements CalendarService
private NodeService nodeService;
private SiteService siteService;
private SearchService searchService; // TODO Temp only
private TaggingService taggingService;
private PermissionService permissionService;
private TransactionService transactionService;
private NamedObjectRegistry<CannedQueryFactory<NodeRef>> cannedQueryRegistry;
private NamedObjectRegistry<CannedQueryFactory<? extends Object>> cannedQueryRegistry;
public void setNodeService(NodeService nodeService)
{
@@ -91,14 +93,6 @@ public class CalendarServiceImpl implements CalendarService
this.siteService = siteService;
}
/**
* TODO Temp only
*/
public void setSearchService(SearchService searchService)
{
this.searchService = searchService;
}
public void setTaggingService(TaggingService taggingService)
{
this.taggingService = taggingService;
@@ -117,7 +111,7 @@ public class CalendarServiceImpl implements CalendarService
/**
* Set the registry of {@link CannedQueryFactory canned queries}
*/
public void setCannedQueryRegistry(NamedObjectRegistry<CannedQueryFactory<NodeRef>> cannedQueryRegistry)
public void setCannedQueryRegistry(NamedObjectRegistry<CannedQueryFactory<? extends Object>> cannedQueryRegistry)
{
this.cannedQueryRegistry = cannedQueryRegistry;
}
@@ -360,9 +354,6 @@ public class CalendarServiceImpl implements CalendarService
nodeService.deleteNode(entry.getNodeRef());
}
/**
* TODO Switch to delegating
*/
@Override
public PagingResults<CalendarEntry> listCalendarEntries(
String siteShortName, PagingRequest paging)
@@ -402,17 +393,35 @@ public class CalendarServiceImpl implements CalendarService
{
return listCalendarEntries(siteShortNames[0], paging);
}
// TODO Use search for now
return null;
// Use the date one with no dates
return listCalendarEntries(siteShortNames, null, null, paging);
}
@Override
public PagingResults<CalendarEntry> listCalendarEntries(
String[] siteShortNames, Date from, Date to, PagingRequest paging)
{
// TODO Use search for now
return null;
// Get the containers
List<NodeRef> containersL = new ArrayList<NodeRef>();
for(String siteShortName : siteShortNames)
{
NodeRef container = getSiteCalendarContainer(siteShortName, false);
if(container != null)
{
containersL.add(container);
}
}
NodeRef[] containers = containersL.toArray(new NodeRef[containersL.size()]);
// Run the canned query
GetCalendarEntriesCannedQueryFactory cqFactory = (GetCalendarEntriesCannedQueryFactory)cannedQueryRegistry.getNamedObject(CANNED_QUERY_GET_ENTRIES);
GetCalendarEntriesCannedQuery cq = (GetCalendarEntriesCannedQuery)cqFactory.getCannedQuery(
containers, from, to, paging
);
// Execute the canned query
return cq.execute();
}
/**