hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-11 20:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

XMLUI My Archived Submissions to sort using DB rather than array loop

Browse Source
This commit is contained in:
Peter Dietz
2014-07-09 14:30:59 -04:00
parent 9594c2b31a
commit 0862d27fee
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dspace-api/src/main/java/org/dspace/content/Item.java
View File

@@ -244,6 +244,52 @@ public class Item extends DSpaceObject
return new ItemIterator(context, rows);
}
/**
* Retrieve the list of Items submitted by eperson, ordered by recently submitted, optionally limitable
* @param context
* @param eperson
* @param limit a positive integer to limit, -1 or null for unlimited
* @return
* @throws SQLException
*/
public static ItemIterator findBySubmitterDateSorted(Context context, EPerson eperson, Integer limit) throws SQLException
{
String querySorted = "SELECT \n" +
" item.item_id, \n" +
" item.submitter_id, \n" +
" item.in_archive, \n" +
" item.withdrawn, \n" +
" item.owning_collection, \n" +
" item.last_modified, \n" +
" metadatavalue.text_value\n" +
"FROM \n" +
" public.item, \n" +
" public.metadatafieldregistry, \n" +
" public.metadatavalue\n" +
"WHERE \n" +
" metadatafieldregistry.metadata_field_id = metadatavalue.metadata_field_id AND\n" +
" metadatavalue.item_id = item.item_id AND\n" +
" metadatafieldregistry.element = 'date' AND \n" +
" metadatafieldregistry.qualifier = 'accessioned' AND \n" +
" item.submitter_id = ? AND \n" +
" item.in_archive = true\n" +
"ORDER BY\n" +
" metadatavalue.text_value desc";
TableRowIterator rows;
if(limit != null && limit > 0) {
querySorted += " limit ? ;";
rows = DatabaseManager.query(context, querySorted, eperson.getID(), limit);
} else {
querySorted += ";";
rows = DatabaseManager.query(context, querySorted, eperson.getID());
}
return new ItemIterator(context, rows);
}
/**
* Get the internal ID of this item. In general, this shouldn't be exposed
* to users

16
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/Submissions.java
View File

@@ -334,7 +334,16 @@ public class Submissions extends AbstractDSpaceTransformer
{
// Turn the iterator into a list (to get size info, in order to put in a table)
List subList = new LinkedList();
ItemIterator subs = Item.findBySubmitter(context, context.getCurrentUser());
Integer limit;
if(displayAll) {
limit = -1;
} else {
//Set a default limit of 50
limit = 50;
}
ItemIterator subs = Item.findBySubmitterDateSorted(context, context.getCurrentUser(), limit);
//NOTE: notice we are adding each item to this list in *reverse* order...
// this is a very basic attempt at making more recent submissions float
@@ -344,7 +353,7 @@ public class Submissions extends AbstractDSpaceTransformer
{
while (subs.hasNext())
{
subList.add(0, subs.next());
subList.add(subs.next());
}
}
finally
@@ -371,7 +380,6 @@ public class Submissions extends AbstractDSpaceTransformer
//Limit to showing just 50 archived submissions, unless overridden
//(This is a saftey measure for Admins who may have submitted
// thousands of items under their account via bulk ingest tools, etc.)
int limit = 50;
int count = 0;
// Populate table
@@ -420,7 +428,7 @@ public class Submissions extends AbstractDSpaceTransformer
}//end while
//Display limit text & link to allow user to override this default limit
if(!displayAll && count>limit)
if(!displayAll && count == limit)
{
Para limitedList = completedSubmissions.addPara();
limitedList.addContent(T_c_limit);