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

Merge pull request #904 from ctu-developers/DS-2508-4x

Browse Source 
DS-2508: Retrieve of collections by findAll() crash with SQL error
This commit is contained in:
helix84
2015-04-20 11:05:59 +02:00
parent a8645ad477 cc152347a2
commit cd0eb9ee91
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dspace-api/src/main/java/org/dspace/content/Collection.java
View File

@@ -28,6 +28,7 @@ import org.dspace.workflow.WorkflowItem;
import org.dspace.xmlworkflow.storedcomponents.CollectionRole; import org.dspace.xmlworkflow.storedcomponents.CollectionRole;
import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem; import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
import java.io.Serializable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -350,8 +351,14 @@ public class Collection extends DSpaceObject
*/ */
public static Collection[] findAll(Context context, Integer limit, Integer offset) throws SQLException public static Collection[] findAll(Context context, Integer limit, Integer offset) throws SQLException
{ {
TableRowIterator tri = DatabaseManager.queryTable(context, "collection", StringBuffer query = new StringBuffer("SELECT * FROM collection ORDER BY name");
"SELECT * FROM collection ORDER BY name limit ? offset ?", limit, offset); List<Serializable> params = new ArrayList<Serializable>();
DatabaseManager.applyOffsetAndLimit(query, params, offset, limit);
TableRowIterator tri = DatabaseManager.query(
context, query.toString(), params.toArray()
);
List<Collection> collections = new ArrayList<Collection>(); List<Collection> collections = new ArrayList<Collection>();