LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verbesserung an der Sortierung der Persönlichen Publikationslisten 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1976 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-11-28 12:30:57 +00:00
parent bd603f024f
commit 3fe85a207c
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java
View File

@ -13,6 +13,8 @@ import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -46,7 +48,7 @@ public class PersonalPublications implements ContentGenerator {
final GenericPerson person, final GenericPerson person,
final PageState state, final PageState state,
final String language) { final String language) {
final long start = System.currentTimeMillis(); //final long start = System.currentTimeMillis();
final List<PublicationBundle> publications = collectPublications(person, language); final List<PublicationBundle> publications = collectPublications(person, language);
@ -115,14 +117,14 @@ public class PersonalPublications implements ContentGenerator {
} }
} }
if (logger.isDebugEnabled()) { /*if (logger.isDebugEnabled()) {
logger.warn(String.format("Generated publications of %d publications " logger.warn(String.format("Generated publications of %d publications "
+ "for '%s' (%s) in %d ms.", + "for '%s' (%s) in %d ms.",
overallSize, overallSize,
person.getFullName(), person.getFullName(),
person.getID().toString(), person.getID().toString(),
System.currentTimeMillis() - start)); System.currentTimeMillis() - start));
} }*/
} }
private List<PublicationBundle> collectPublications(final GenericPerson author, final String language) { private List<PublicationBundle> collectPublications(final GenericPerson author, final String language) {
@ -206,6 +208,45 @@ public class PersonalPublications implements ContentGenerator {
final PageState state) { final PageState state) {
List<PublicationBundle> publicationList = publications; List<PublicationBundle> publicationList = publications;
Collections.sort(publicationList, new Comparator<PublicationBundle>() {
public int compare(final PublicationBundle bundle1, final PublicationBundle bundle2) {
final Publication publication1 = bundle1.getPublication(GlobalizationHelper.getNegotiatedLocale().
getLanguage());
final Publication publication2 = bundle2.getPublication(GlobalizationHelper.getNegotiatedLocale().
getLanguage());
final int year1;
final int year2;
if (publication1.getYearOfPublication() == null) {
year1 = 0;
} else {
year1 = publication1.getYearOfPublication();
}
if (publication2.getYearOfPublication() == null) {
year2 = 0;
} else {
year2 = publication2.getYearOfPublication();
}
if (year1 < year2) {
return 1;
} else if (year1 > year2) {
return -1;
}
final String authorsStr1 = (String) publication1.get("authorsStr");
final String authorsStr2 = (String) publication2.get("authorsStr");
if ((authorsStr1 != null) && (authorsStr2 != null) && (authorsStr1.compareTo(authorsStr2) != 0)) {
return authorsStr1.compareTo(authorsStr2);
}
return publication1.getTitle().compareTo(publication2.getTitle());
}
});
if ((publications == null) || publications.isEmpty()) { if ((publications == null) || publications.isEmpty()) {
return; return;
} }