hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

REST collections resource to use dspace-api to do limit/offset

Browse Source
This commit is contained in:
Peter Dietz
2014-10-19 00:55:32 -04:00
parent 5f2460f86a
commit 50a2b54ded
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
View File

@@ -165,34 +165,27 @@ public class CollectionsResource extends Resource
try
{
context = createContext(getUser(headers));
org.dspace.content.Collection[] dspaceCollections;
if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0)))
{
log.warn("Pagging was badly set.");
log.warn("Paging was badly set.");
limit = 100;
offset = 0;
}
// TODO Repair it in DSpace api
// dspaceCollections = org.dspace.content.Collection.findAll(context, limit, offset);
// Message:java.sql.SQLSyntaxErrorException: ORA-00933: SQL command not properly ended
dspaceCollections = org.dspace.content.Collection.findAll(context);
for (int i = offset; i < limit + offset; i++)
org.dspace.content.Collection[] dspaceCollections = org.dspace.content.Collection.findAll(context, limit, offset);
for(org.dspace.content.Collection dspaceCollection : dspaceCollections)
{
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCollections[i], org.dspace.core.Constants.READ))
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCollection, org.dspace.core.Constants.READ))
{
Collection collection = new org.dspace.rest.common.Collection(dspaceCollections[i], null, context, limit,
Collection collection = new org.dspace.rest.common.Collection(dspaceCollection, null, context, limit,
offset);
collections.add(collection);
writeStats(dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request);
}
}
context.complete();
}
catch (SQLException e)
{