Mercurial > hg > LGServices
changeset 16:a7e9c1f8edb4
new: sorting in books page, adding books package
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Mon, 01 Jun 2015 14:40:48 +0200 |
parents | d81a5401b9af |
children | 372dab740f15 |
files | src/main/java/de/mpiwg/web/books/SortBooksByAdminType.java src/main/java/de/mpiwg/web/books/SortBooksByBookId.java src/main/java/de/mpiwg/web/books/SortBooksByDate.java src/main/java/de/mpiwg/web/books/SortBooksByDynasty.java src/main/java/de/mpiwg/web/books/SortBooksByEdition.java src/main/java/de/mpiwg/web/books/SortBooksByEditor.java src/main/java/de/mpiwg/web/books/SortBooksByLevel1.java src/main/java/de/mpiwg/web/books/SortBooksByLevel2.java src/main/java/de/mpiwg/web/books/SortBooksByName.java src/main/java/de/mpiwg/web/books/SortBooksByPeriod.java src/main/java/de/mpiwg/web/books/SortBooksByStartYear.java src/main/java/de/mpiwg/web/books/SortBooksByTocCorrection.java |
diffstat | 12 files changed, 220 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByAdminType.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,16 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + +public class SortBooksByAdminType implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getAdmin_type().compareTo(o2.getAdmin_type()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByBookId.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByBookId implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getId().compareTo(o2.getId()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByDate.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,25 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByDate implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + + if(o1.getCurrentSectionVersion() == null && o2.getCurrentSectionVersion() == null) { + return o1.getId().compareTo(o2.getId()); + } else if (o1.getCurrentSectionVersion() == null) { + return -1; + } else if (o2.getCurrentSectionVersion() == null){ + return 1; + } else { + return o1.getCurrentSectionVersion().getDate().compareTo(o2.getCurrentSectionVersion().getDate()); + } + + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByDynasty.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByDynasty implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getDynasty().compareTo(o2.getDynasty()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByEdition.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByEdition implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getEdition().compareTo(o2.getEdition()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByEditor.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,25 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import org.apache.log4j.Logger; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByEditor implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + + if(o1.getCurrentSectionVersion() == null && o2.getCurrentSectionVersion() == null) { + return o1.getId().compareTo(o2.getId()); + } else if (o1.getCurrentSectionVersion() == null) { + return -1; + } else if (o2.getCurrentSectionVersion() == null){ + return 1; + } else { + return o1.getCurrentSectionVersion().getEditor().compareTo(o2.getCurrentSectionVersion().getEditor()); + } + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByLevel1.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByLevel1 implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getLevel1().compareTo(o2.getLevel1()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByLevel2.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByLevel2 implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getLevel2().compareTo(o2.getLevel2()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByName.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByName implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getName().compareTo(o2.getName()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByPeriod.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByPeriod implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getPeriod().compareTo(o2.getPeriod()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByStartYear.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,17 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByStartYear implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + return o1.getStart_year().compareTo(o2.getStart_year()); + } + +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/books/SortBooksByTocCorrection.java Mon Jun 01 14:40:48 2015 +0200 @@ -0,0 +1,18 @@ +package de.mpiwg.web.books; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBooksByTocCorrection implements Comparator<DBBook>{ + + public int compare(DBBook o1, DBBook o2) { + if(o1 == null || o2 == null){ + return o1.getName().compareTo(o2.getName()); + } + + return o1.getToc_correction().compareTo(o2.getToc_correction()); + } + +} \ No newline at end of file