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

DS-2350 Fix My Submissions to support oracle for "Archived Submissions"

Browse Source
This commit is contained in:
Peter Dietz
2014-12-10 22:22:22 -05:00
parent 8201f6058c
commit 2cb060f7bd
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,18 +293,22 @@ public class Item extends DSpaceObject
" metadatavalue.resource_type_id = ? AND " + " metadatavalue.resource_type_id = ? AND " +
" metadatafieldregistry.element = 'date' AND " + " metadatafieldregistry.element = 'date' AND " +
" metadatafieldregistry.qualifier = 'accessioned' AND " + " metadatafieldregistry.qualifier = 'accessioned' AND " +
" item.submitter_id = ? AND \n" + " item.submitter_id = ? AND ";
" item.in_archive = true\n" + if(DatabaseManager.isOracle()) {
"ORDER BY\n" + querySorted += " item.in_archive = 1 " +
" metadatavalue.text_value desc"; "ORDER BY cast(substr(metadatavalue.text_value,1,100) as varchar2(100)) desc";
} else {
querySorted += " item.in_archive = true " +
"ORDER BY metadatavalue.text_value desc";
}
TableRowIterator rows; TableRowIterator rows;
if(limit != null && limit > 0) { //TODO Oracle doesn't have concept of limit
querySorted += " limit ? ;"; if(limit != null && limit > 0 && !DatabaseManager.isOracle()) {
querySorted += " limit ?";
rows = DatabaseManager.query(context, querySorted, Constants.ITEM, eperson.getID(), limit); rows = DatabaseManager.query(context, querySorted, Constants.ITEM, eperson.getID(), limit);
} else { } else {
querySorted += ";";
rows = DatabaseManager.query(context, querySorted, Constants.ITEM, eperson.getID()); rows = DatabaseManager.query(context, querySorted, Constants.ITEM, eperson.getID());
} }