# HG changeset patch
# User Calvin Yeh <cyeh@mpiwg-berlin.mpg.de>
# Date 1493833996 -7200
# Node ID 141fa833d126b9da23c8c21d1274e5b9a1f55be5
# Parent  997601ee0c6e67a00c0c0e860257ab90f01b68ac
Bug fixed : Display columns named "source"

diff -r 997601ee0c6e -r 141fa833d126 src/main/java/de/mpiwg/gazetteer/db/DBBook.java
--- a/src/main/java/de/mpiwg/gazetteer/db/DBBook.java	Wed May 03 19:51:43 2017 +0200
+++ b/src/main/java/de/mpiwg/gazetteer/db/DBBook.java	Wed May 03 19:53:16 2017 +0200
@@ -27,7 +27,7 @@
 	private String toc_correction = "";
 
 	private Integer year = 0;
-	private Integer source = "";
+	private String source = "";
 
 
 	private DBSectionVersion currentSectionVersion;
diff -r 997601ee0c6e -r 141fa833d126 src/main/java/de/mpiwg/web/jsp/BooksPage.java
--- a/src/main/java/de/mpiwg/web/jsp/BooksPage.java	Wed May 03 19:51:43 2017 +0200
+++ b/src/main/java/de/mpiwg/web/jsp/BooksPage.java	Wed May 03 19:53:16 2017 +0200
@@ -28,6 +28,8 @@
 import de.mpiwg.web.books.SortBooksByPeriod;
 import de.mpiwg.web.books.SortBooksByStartYear;
 import de.mpiwg.web.books.SortBooksByTocCorrection;
+import de.mpiwg.web.books.SortBooksByYear;
+import de.mpiwg.web.books.SortBooksBySource;
 
 public class BooksPage extends AbstractJSPPage{
 
@@ -101,7 +103,7 @@
 					(StringUtils.isEmpty(bookNameFilter) || StringUtils.contains(book.getName(), bookNameFilter)) &&
 					(StringUtils.isEmpty(dynastyFilter) || StringUtils.contains(book.getDynasty(), dynastyFilter)) &&
 					(StringUtils.isEmpty(adminTypeFilter) || StringUtils.contains(book.getAdmin_type(), adminTypeFilter)) &&
-          (StringUtils.isEmpty(yearFilter) || StringUtils.contains(book.getYear(), yearFilter)) &&
+          (StringUtils.isEmpty(yearFilter) || book.getYear() == Integer.parseInt(yearFilter)) &&
 					(StringUtils.isEmpty(sourceFilter) || StringUtils.contains(book.getSource(), sourceFilter))
 					){
 						String lastEditor = new String();
@@ -211,7 +213,7 @@
 	}
 
 	public String getSourceFilter() {
-		return yearFilter;
+		return sourceFilter;
 	}
 
 
diff -r 997601ee0c6e -r 141fa833d126 src/main/webapp/pages/books.jsp
--- a/src/main/webapp/pages/books.jsp	Wed May 03 19:51:43 2017 +0200
+++ b/src/main/webapp/pages/books.jsp	Wed May 03 19:53:16 2017 +0200
@@ -480,6 +480,7 @@
 						<td><%=book.getDynasty() %></td>
 						<td><%=book.getAdmin_type() %></td>
 						<td><%=book.getYear() %></td>
+						<td><%=book.getSource() %></td>
 						<td><a href="<%=sessionBean.getApplicationBean().getTocInterfaceUrl()%>/check_sections_details.php?book_id=<%=book.getId() %>&amp;count=10000&amp;sessionId=<%= session.getId()%>" target="blank">
 						Edit TOC</a></td>