From 89278323fdc0c79b26d7284a7e7b8ed1e61d18dd Mon Sep 17 00:00:00 2001 From: Peter Breton Date: Thu, 20 Jun 2002 19:51:14 +0000 Subject: [PATCH] In sortResults method, use date.issued instead of date.accessioned git-svn-id: http://scm.dspace.org/svn/repo/trunk@202 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- dspace/src/org/dspace/browse/Browse.java | 4 ++-- dspace/src/org/dspace/content/ItemComparator.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dspace/src/org/dspace/browse/Browse.java b/dspace/src/org/dspace/browse/Browse.java index 235f2797be..d9a28a4c14 100644 --- a/dspace/src/org/dspace/browse/Browse.java +++ b/dspace/src/org/dspace/browse/Browse.java @@ -702,8 +702,8 @@ public class Browse return; ItemComparator ic = params.getSortByTitle().booleanValue() ? - new ItemComparator("title", null, Item.ANY, true) : - new ItemComparator("date", "accessioned", Item.ANY, true); + new ItemComparator("title", null, Item.ANY, true) : + new ItemComparator("date", "issued", Item.ANY, true); Collections.sort(results, ic); } diff --git a/dspace/src/org/dspace/content/ItemComparator.java b/dspace/src/org/dspace/content/ItemComparator.java index df881df10c..97e39dd36e 100644 --- a/dspace/src/org/dspace/content/ItemComparator.java +++ b/dspace/src/org/dspace/content/ItemComparator.java @@ -46,6 +46,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.dspace.browse.Browse; import org.dspace.content.DCValue; import org.dspace.content.Item; @@ -109,6 +110,13 @@ public class ItemComparator implements Comparator String firstValue = getValue(firstItem.getDC(element, qualifier, language)); String secondValue = getValue(secondItem.getDC(element, qualifier, language)); + // Normalize titles for comparison purposes + if ("title".equals(element)) + { + firstValue = Browse.getNormalizedTitle(firstValue, language); + secondValue = Browse.getNormalizedTitle(secondValue, language); + } + if ((firstValue == null) && (secondValue == null)) return 0; if ((firstValue != null) && (secondValue == null))