annotate src/main/java/de/mpiwg/web/jsp/BooksPage.java @ 43:9dbbbfd474f4

new: 1.existing topic in search result. 2.difference-set of book for topic
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Wed, 23 Dec 2015 16:03:32 +0100
parents 07f7594ba56e
children a00efd5d9e77
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
1 package de.mpiwg.web.jsp;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
2
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
3
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
4 import java.util.ArrayList;
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
5 import java.util.Collections;
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
6 import java.util.HashMap;
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
7 import java.util.List;
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
8 import java.util.Map;
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
9
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
10 import javax.servlet.http.HttpServletRequest;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
11 import javax.servlet.http.HttpServletResponse;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
12
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
13 import org.apache.commons.lang.StringUtils;
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
14 import org.apache.log4j.Logger;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
15
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
16 import de.mpiwg.gazetteer.db.DBBook;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
17 import de.mpiwg.gazetteer.db.DBSectionVersion;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
18 import de.mpiwg.gazetteer.utils.DBService;
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
19 import de.mpiwg.web.books.SortBooksByAdminType;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
20 import de.mpiwg.web.books.SortBooksByBookId;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
21 import de.mpiwg.web.books.SortBooksByDate;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
22 import de.mpiwg.web.books.SortBooksByDynasty;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
23 import de.mpiwg.web.books.SortBooksByEdition;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
24 import de.mpiwg.web.books.SortBooksByEditor;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
25 import de.mpiwg.web.books.SortBooksByLevel1;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
26 import de.mpiwg.web.books.SortBooksByLevel2;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
27 import de.mpiwg.web.books.SortBooksByName;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
28 import de.mpiwg.web.books.SortBooksByPeriod;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
29 import de.mpiwg.web.books.SortBooksByStartYear;
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
30 import de.mpiwg.web.books.SortBooksByTocCorrection;
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
31
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
32 public class BooksPage extends AbstractJSPPage{
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
33
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
34 private static Logger logger = Logger.getLogger(BooksPage.class);
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
35
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
36 public static String bean = "booksBean";
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
37 public static String page = "pages/books.jsp";
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
38 private List<DBBook> completeBookList;
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
39
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
40 private List<DBBook> filteredBookList;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
41 private List<DBBook> displayBookList;
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
42
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
43 private Map<String, DBSectionVersion> sectionVersionMap = null;
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
44 private int bookNumber;
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
45
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
46 private DataPaginator paginator = new DataPaginator();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
47
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
48
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
49 private String tocBookId = new String();
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
50
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
51 private String bookNameFilter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
52 private String dynastyFilter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
53 private String adminTypeFilter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
54 private String level1Filter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
55 private String level2Filter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
56 private String periodFilter = new String();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
57 private String editionFilter = new String();
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
58 private String lastEditorFilter = new String();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
59 private String editTimeFilter = new String();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
60
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
61
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
62
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
63
20
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
64 private String filteringMessage;
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
65
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
66
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
67 public void loadParameters(HttpServletRequest request, HttpServletResponse response){
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
68 this.request = request;
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
69 this.response = response;
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
70
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
71 this.tocBookId = getParameter("tocBookId");
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
72 this.bookNameFilter = getParameter("bookNameFilter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
73 this.dynastyFilter = getParameter("dynastyFilter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
74 this.adminTypeFilter = getParameter("adminTypeFilter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
75 this.level1Filter = getParameter("level1Filter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
76 this.level2Filter = getParameter("level2Filter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
77 this.periodFilter = getParameter("periodFilter");
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
78 this.editionFilter = getParameter("editionFilter");
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
79 this.lastEditorFilter = getParameter("lastEditorFilter");
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
80 this.editTimeFilter = getParameter("editTimeFilter");
22
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
81
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
82 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
83
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
84
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
85
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
86 public void filter(){
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
87
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
88 this.filteredBookList = new ArrayList<DBBook>();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
89 for(DBBook book : this.completeBookList){
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
90 if(!this.filteredBookList.contains(book)){
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
91
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
92 if( (StringUtils.isEmpty(dynastyFilter) || StringUtils.startsWith(book.getDynasty(), dynastyFilter)) &&
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
93 (StringUtils.isEmpty(level1Filter) || StringUtils.startsWith(book.getLevel1(), level1Filter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
94 (StringUtils.isEmpty(level2Filter) || StringUtils.startsWith(book.getLevel2(), level2Filter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
95 (StringUtils.isEmpty(periodFilter) || StringUtils.startsWith(book.getPeriod(), periodFilter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
96 (StringUtils.isEmpty(editionFilter) || StringUtils.startsWith(book.getEdition(), editionFilter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
97 (StringUtils.isEmpty(bookNameFilter) || StringUtils.startsWith(book.getName(), bookNameFilter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
98 (StringUtils.isEmpty(adminTypeFilter) || StringUtils.startsWith(book.getAdmin_type(), adminTypeFilter))
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
99 ){
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
100 String lastEditor = new String();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
101 String editTime = new String();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
102 if ( book.getCurrentSectionVersion() != null) {
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
103 lastEditor = book.getCurrentSectionVersion().getEditor();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
104 editTime = book.getCurrentSectionVersion().getDate();
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
105 }
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
106
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
107 if( (StringUtils.isEmpty(lastEditorFilter) || StringUtils.startsWith(lastEditor, lastEditorFilter)) &&
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
108 (StringUtils.isEmpty(editTimeFilter) || StringUtils.startsWith(editTime, editTimeFilter))
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
109
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
110 ){
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
111 this.filteredBookList.add(book);
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
112
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
113 }
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
114
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
115 //this.filteredBookList.add(book);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
116
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
117 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
118 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
119 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
120
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
121 if(completeBookList.size() > 0){
20
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
122 this.filteringMessage = this.filteredBookList.size() + " book(s) listed after filtering";
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
123 this.paginator.setCurrentPage(0);
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
124 this.paginator.resetNumberOfPages(filteredBookList.size());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
125 this.updateCurrentBooks();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
126 }else{
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
127 this.filteredBookList = null;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
128 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
129
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
130 }
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
131
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
132
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
133 private void updateCurrentBooks() {
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
134 // update displayBookList using paginator
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
135
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
136 this.paginator.initCount();
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
137 int startRecord = this.paginator.getCurrentPage()
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
138 * this.paginator.getItemsPerPage();
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
139
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
140 if(this.paginator.getNumberOfPages() == 0){
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
141 this.displayBookList = new ArrayList<DBBook>();
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
142 }else if((this.paginator.getCurrentPage() + 1) == this.paginator.getNumberOfPages()){
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
143 int mod = this.filteredBookList.size() % paginator.getItemsPerPage();
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
144 if(mod == 0){
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
145 this.displayBookList = filteredBookList.subList(startRecord, startRecord + this.paginator.getItemsPerPage());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
146 }else{
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
147 this.displayBookList = filteredBookList.subList(startRecord, startRecord + mod);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
148 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
149
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
150 }else{
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
151 this.displayBookList = filteredBookList.subList(startRecord, startRecord + this.paginator.getItemsPerPage());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
152 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
153
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
154 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
155
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
156
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
157 public List<DBBook> getDisplayBookList() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
158 return displayBookList;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
159 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
160
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
161
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
162
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
163 public void setDisplayBookList(List<DBBook> displayBookList) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
164 this.displayBookList = displayBookList;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
165 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
166
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
167
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
168 public String getDynastyFilter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
169 return dynastyFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
170 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
171
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
172
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
173 public void setDynastyFilter(String dynastyFilter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
174 this.dynastyFilter = dynastyFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
175 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
176
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
177
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
178 public String getAdminTypeFilter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
179 return adminTypeFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
180 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
181
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
182
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
183 public void setAdminTypeFilter(String adminTypeFilter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
184 this.adminTypeFilter = adminTypeFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
185 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
186
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
187
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
188 public String getLevel1Filter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
189 return level1Filter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
190 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
191
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
192
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
193 public void setLevel1Filter(String level1Filter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
194 this.level1Filter = level1Filter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
195 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
196
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
197
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
198 public String getTocBookId() {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
199 return tocBookId;
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
200 }
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
201
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
202 public void setTocBookId(String tocBookId) {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
203 this.tocBookId = tocBookId;
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
204 }
13
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
205
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
206 public int getBookNumber() {
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
207 return bookNumber;
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
208 }
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
209
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
210 public void setBookNumber(int bookNumber) {
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
211 this.bookNumber = bookNumber;
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
212 }
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
213
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
214
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
215 public List<DBBook> getCompleteBookList() {
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
216 return completeBookList;
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
217 }
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
218
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
219 public void loadBooks(){
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
220 if(this.completeBookList == null){
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
221 this.forceLoadBooks();
20
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
222 this.filteringMessage = null;
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
223 }
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
224 }
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
225
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
226 public void forceLoadBooks(){
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
227 logger.debug("force loadBooks");
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
228
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
229 this.loadSectionsVersion();
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
230
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
231 this.completeBookList = new ArrayList<DBBook>();
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
232 if(getSessionBean().getUser() != null){
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
233 logger.debug("loading book list");
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
234 // === load book table from db ==
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
235
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
236 for(DBBook book : DBService.getInstance().getBooks()){
13
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
237 // set editor and date (current version)
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
238 book.setCurrentSectionVersion(sectionVersionMap.get(book.getId()));
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
239
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
240 this.completeBookList.add(book);
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
241 }
13
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
242
9c6e74761f60 new: link to Edit Toc page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 12
diff changeset
243 this.setBookNumber(this.completeBookList.size());
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
244
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
245 }
12
d57fe2179f61 Improvement of book page
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 11
diff changeset
246
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
247 sortByBookIdUp(); //bookId ascend as default sorting
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
248 // Note that every sortXYZ() function has filter() in it, so it will also force reload filteredList and displayList
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
249
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
250
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
251
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
252
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
253 }
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
254
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
255 private void loadSectionsVersion(){
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
256 this.sectionVersionMap = new HashMap<String, DBSectionVersion>();
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
257
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
258 try {
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
259 for(DBSectionVersion sv : DBService.getInstance().getSectionVersionList()){
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
260 this.sectionVersionMap.put(sv.getBooks_id(), sv);
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
261 }
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
262 } catch (Exception e) {
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
263 addMsg("There is an internal error: " + e.getLocalizedMessage());
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
264 e.printStackTrace();
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
265 }
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
266
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
267
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
268 }
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
269
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
270 public void setTocCorrection() {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
271 String tocBookId = this.getTocBookId();
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
272 logger.debug("tocFinishedBookId=" + tocBookId);
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
273 try {
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
274 // update toc correction status to DB
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
275 DBService.getInstance().updateTocCorrection(tocBookId, "1");
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
276
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
277 // update toc correction status
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
278 DBService.getInstance().getBook(tocBookId).setTocCorrection("1");
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
279
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
280 }catch (Exception e) {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
281 addMsg("There is an internal error: " + e.getLocalizedMessage());
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
282 e.printStackTrace();
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
283 }
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
284
22
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
285 //logger.debug("toc_correction:"+DBService.getInstance().getBook(tocBookId).getTocCorrection());
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
286
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
287 }
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
288
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
289
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
290 public void unSetTocCorrection() {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
291 String tocBookId = this.getTocBookId();
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
292 logger.debug("tocFinishedBookId=" + tocBookId);
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
293 try {
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
294 DBService.getInstance().updateTocCorrection(tocBookId, "0");
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
295 DBService.getInstance().getBook(tocBookId).setTocCorrection("0");
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
296
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
297 }catch (Exception e) {
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
298 addMsg("There is an internal error: " + e.getLocalizedMessage());
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
299 e.printStackTrace();
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
300 }
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
301
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
302 }
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
303
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
304 public void saveComment() {
22
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
305
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
306 String bookComment = getParameter("bookComment");
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
307 String currentBookId = getParameter("currentBookId");
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
308
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
309 logger.debug("saveComment. currentBookId=" + currentBookId + ", bookComment: "+ bookComment);
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
310
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
311 try {
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
312 DBService.getInstance().updateComment(currentBookId, bookComment);
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
313 //DBService.getInstance().getBook(currentBookId).setComments(bookComment);
22
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
314
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
315 } catch (Exception e) {
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
316 addMsg("There is an internal error: " + e.getLocalizedMessage());
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
317 e.printStackTrace();
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
318 }
2c6f44ef34ab new: add comment textarea
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 21
diff changeset
319
14
3387d855a194 new: toc status in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 13
diff changeset
320 }
11
f15b0214cc1c Adding query for table SectionVersion
"jurzua <jurzua@mpiwg-berlin.mpg.de>"
parents: 10
diff changeset
321
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
322
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
323
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
324 public void sortByBookIdUp() {
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
325 Collections.sort(this.completeBookList, new SortBooksByBookId());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
326 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
327 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
328
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
329 public void sortByBookIdDown() {
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
330 Collections.sort(this.completeBookList, new SortBooksByBookId());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
331 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
332 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
333 }
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
334
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
335 public void sortByBookNameUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
336 Collections.sort(this.completeBookList, new SortBooksByName());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
337 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
338 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
339
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
340 public void sortByBookNameDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
341 Collections.sort(this.completeBookList, new SortBooksByName());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
342 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
343 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
344 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
345
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
346 public void sortByLevel1Up(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
347 Collections.sort(this.completeBookList, new SortBooksByLevel1());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
348 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
349 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
350
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
351 public void sortByLevel1Down(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
352 Collections.sort(this.completeBookList, new SortBooksByLevel1());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
353 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
354 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
355 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
356 public void sortByLevel2Up(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
357 Collections.sort(this.completeBookList, new SortBooksByLevel2());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
358 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
359 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
360
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
361 public void sortByLevel2Down(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
362 Collections.sort(this.completeBookList, new SortBooksByLevel2());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
363 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
364 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
365 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
366
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
367 public void sortByPeriodUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
368 Collections.sort(this.completeBookList, new SortBooksByPeriod());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
369 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
370 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
371
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
372 public void sortByPeriodDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
373 Collections.sort(this.completeBookList, new SortBooksByPeriod());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
374 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
375 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
376 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
377
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
378 public void sortByAdminTypeUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
379 Collections.sort(this.completeBookList, new SortBooksByAdminType());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
380 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
381 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
382
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
383 public void sortByAdminTypeDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
384 Collections.sort(this.completeBookList, new SortBooksByAdminType());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
385 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
386 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
387 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
388
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
389 public void sortByStartYearUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
390 Collections.sort(this.completeBookList, new SortBooksByStartYear());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
391 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
392 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
393
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
394 public void sortByStartYearDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
395 Collections.sort(this.completeBookList, new SortBooksByStartYear());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
396 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
397 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
398 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
399
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
400 public void sortByDynastyUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
401 Collections.sort(this.completeBookList, new SortBooksByDynasty());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
402 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
403 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
404
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
405 public void sortByDynastyDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
406 Collections.sort(this.completeBookList, new SortBooksByDynasty());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
407 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
408 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
409 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
410 public void sortByEditionUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
411 Collections.sort(this.completeBookList, new SortBooksByEdition());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
412 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
413 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
414
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
415 public void sortByEditionDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
416 Collections.sort(this.completeBookList, new SortBooksByEdition());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
417 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
418 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
419 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
420
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
421
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
422
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
423 public void sortByEditorUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
424 Collections.sort(this.completeBookList, new SortBooksByEditor());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
425 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
426 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
427
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
428 public void sortByEditorDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
429 Collections.sort(this.completeBookList, new SortBooksByEditor());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
430 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
431 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
432 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
433
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
434 public void sortByDateUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
435 Collections.sort(this.completeBookList, new SortBooksByDate());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
436 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
437 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
438
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
439 public void sortByDateDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
440 Collections.sort(this.completeBookList, new SortBooksByDate());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
441 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
442 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
443 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
444
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
445 public void sortByTocCorrectionUp(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
446 Collections.sort(this.completeBookList, new SortBooksByTocCorrection());
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
447 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
448 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
449
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
450 public void sortByTocCorrectionDown(){
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
451 Collections.sort(this.completeBookList, new SortBooksByTocCorrection());
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
452 Collections.reverse(completeBookList);
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
453 filter();
15
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
454 }
d81a5401b9af new: sorting in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 14
diff changeset
455
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
456 public String getBookNameFilter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
457 return bookNameFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
458 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
459
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
460
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
461
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
462 public void setBookNameFilter(String bookNameFilter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
463 this.bookNameFilter = bookNameFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
464 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
465
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
466
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
467
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
468 public String getLevel2Filter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
469 return level2Filter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
470 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
471
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
472
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
473
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
474 public void setLevel2Filter(String level2Filter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
475 this.level2Filter = level2Filter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
476 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
477
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
478
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
479
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
480 public String getPeriodFilter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
481 return periodFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
482 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
483
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
484
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
485
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
486 public void setPeriodFilter(String periodFilter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
487 this.periodFilter = periodFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
488 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
489
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
490
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
491
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
492 public String getEditionFilter() {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
493 return editionFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
494 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
495
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
496
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
497
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
498 public void setEditionFilter(String editionFilter) {
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
499 this.editionFilter = editionFilter;
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
500 }
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
501
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
502
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
503 public void firstPage() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
504 this.paginator.first();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
505 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
506 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
507
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
508 public void lastPage() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
509 this.paginator.last();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
510 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
511 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
512
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
513 public void fastForward() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
514 this.paginator.fastForward();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
515 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
516 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
517
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
518 public void fastRewind() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
519 this.paginator.fastRewind();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
520 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
521 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
522
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
523 public void previousPage() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
524 this.paginator.previous();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
525 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
526 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
527
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
528 public void nextPage() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
529 this.paginator.next();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
530 this.updateCurrentBooks();
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
531 }
17
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
532
372dab740f15 new: filters in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 15
diff changeset
533
18
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
534 public DataPaginator getPaginator() {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
535 return paginator;
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
536 }
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
537
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
538 public void setPaginator(DataPaginator paginator) {
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
539 this.paginator = paginator;
881e7591f3e4 new: adding paginator in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 17
diff changeset
540 }
20
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
541
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
542
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
543
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
544 public String getFilteringMessage() {
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
545 return filteringMessage;
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
546 }
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
547
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
548
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
549
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
550 public void setFilteringMessage(String filteringMessage) {
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
551 this.filteringMessage = filteringMessage;
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
552 }
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
553
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
554 public String getLastEditorFilter() {
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
555 return lastEditorFilter;
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
556 }
20
996f8f1b69db little modification on books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 18
diff changeset
557
24
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
558 public void setLastEditorFilter(String lastEditorFilter) {
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
559 this.lastEditorFilter = lastEditorFilter;
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
560 }
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
561 public String getEditTimeFilter() {
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
562 return editTimeFilter;
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
563 }
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
564 public void setEditTimeFilter(String editTimeFilter) {
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
565 this.editTimeFilter = editTimeFilter;
07f7594ba56e add filters to lastEditor and editTime in books page
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 22
diff changeset
566 }
21
5b1856cd6b4f bug fixed: 1.TOC Done display issue 2.issue in firefox
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents: 20
diff changeset
567
10
efe0e7174139 add BooksPage
Zoe Hong <zhong@mpiwg-berlin.mpg.de>
parents:
diff changeset
568 }