Mercurial > hg > LGServices
changeset 8:8702aa85d0fb
add bookBean
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Tue, 26 May 2015 14:29:33 +0200 |
parents | 0378dbd683b8 |
children | 58f574700474 |
files | src/main/java/de/mpiwg/gazetteer/db/DBBook.java src/main/java/de/mpiwg/gazetteer/rest/UtilsServlet.java src/main/java/de/mpiwg/gazetteer/utils/DBService.java src/main/java/de/mpiwg/web/jsp/HomePage.java src/main/java/de/mpiwg/web/jsp/JSPProxy.java src/main/java/de/mpiwg/web/jsp/SessionBean.java src/main/resources/config.properties src/main/resources/hibernate.cfg.xml src/main/webapp/componentes/template.jsp |
diffstat | 9 files changed, 88 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/gazetteer/db/DBBook.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/db/DBBook.java Tue May 26 14:29:33 2015 +0200 @@ -22,6 +22,8 @@ private Integer start_year; private Integer end_year; + private String comments; + private Integer toc_correction; public DBBook(ResultSet rs) throws SQLException{ this.name = rs.getString("name"); @@ -41,6 +43,8 @@ this.start_year = rs.getInt("start_year"); this.end_year = rs.getInt("end_year"); + this.comments = rs.getString("comments"); + this.toc_correction = rs.getInt("toc_correction"); } @@ -69,12 +73,25 @@ return line; } - public void setLine(Integer line) { this.line = line; } + public String getComments() { + return comments; + } + public void setComments(String comments){ + this.comments = comments; + } + public Integer getTocCorrection() { + return toc_correction; + } + public void setTocCorrection(Integer toc_correction) { + this.toc_correction = toc_correction; + } + + public String getPeriod() { return period; }
--- a/src/main/java/de/mpiwg/gazetteer/rest/UtilsServlet.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/rest/UtilsServlet.java Tue May 26 14:29:33 2015 +0200 @@ -20,7 +20,6 @@ import de.mpiwg.web.jsp.SessionBean; import de.mpiwg.web.jsp.utils.SessionCollectorListener; -import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; @WebServlet("/rest/utils/*") public class UtilsServlet extends HttpServlet {
--- a/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Tue May 26 14:29:33 2015 +0200 @@ -7,6 +7,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -23,6 +24,7 @@ import de.mpiwg.gazetteer.bo.Sequence; import de.mpiwg.gazetteer.db.DBBook; import de.mpiwg.gazetteer.db.DBSection; +import de.mpiwg.gazetteer.db.DBSectionVersion; public class DBService { @@ -79,6 +81,11 @@ logger.debug("Time execution loading Book Map [ms]: " + (end - start)); } + public List<DBBook> getBooks(){ + // getBookMap().values() returns a Collection. In this way, we can use List. + return new ArrayList<DBBook>(getBookMap().values()); + } + public DBBook getBook(String id){ return getBookMap().get(id); } @@ -101,14 +108,16 @@ this.bookMap = new HashMap<String, DBBook>(); try { - String query = "SELECT * FROM books"; + String query = "SELECT * FROM books"; logger.debug(query); conn = getNewConnection(); stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(query); while(rs.next()){ - DBBook book = new DBBook(rs); + DBBook book = new DBBook(rs); + + this.bookMap.put(book.getId(), book); } } catch (Exception e) { @@ -591,5 +600,31 @@ PropertiesUtils.getPropValue("db_gazetter_username"), PropertiesUtils.getPropValue("db_gazetter_password")); } + + public static List<DBSectionVersion> getSectionsVersionsByBooksId(String id) throws SQLException { + + List<DBSectionVersion> section_version = new ArrayList<DBSectionVersion>(); + // select editor, date from sections_versions where books_id = book.getId() order by version desc?? + Connection con = null; + try{ + con = getNewConnection(); + Statement stmt = con.createStatement(); + String query = "SELECT editor, date from sections_versions WHERE books_id='"+id+"' ORDER BY version DESC"; + ResultSet rs = stmt.executeQuery(query); + if(rs.next()){ + logger.debug("book id= "+id); + logger.debug(rs.getString("editor") + ", date: " + rs.getString("date")); + + } + + } catch (Exception e) { + e.printStackTrace(); + } finally { + con.close(); + } + // ---- + + return section_version; + } }
--- a/src/main/java/de/mpiwg/web/jsp/HomePage.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/HomePage.java Tue May 26 14:29:33 2015 +0200 @@ -6,8 +6,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; + + import de.mpiwg.gazetteer.bo.LGBranch; import de.mpiwg.gazetteer.utils.DataProvider;
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Tue May 26 14:29:33 2015 +0200 @@ -144,13 +144,23 @@ } else if(StringUtils.equals(action, "sortByStartPageDown")){ getSessionBean().getSearchPage().sortByStartPageDown(); } - - - - + return SearchPage.page; - } + } else if(StringUtils.equals(bean, BooksPage.bean)){ + + getSessionBean().getBooksPage().loadParameters(request, response); + + if(StringUtils.equals(action, "editToc")) { + logger.info("toc page here..."); + // TODO: more information here needed: book_id, user info... + + // TODO: TOCPage + // return TOCPage.page; + } + + return HomePage.page; + } //Default Page return "pages/search.jsp";
--- a/src/main/java/de/mpiwg/web/jsp/SessionBean.java Thu May 21 11:11:46 2015 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/SessionBean.java Tue May 26 14:29:33 2015 +0200 @@ -32,6 +32,9 @@ private CreateFilePage createFilePage = new CreateFilePage(); private BranchPage branchPage = new BranchPage(); + private BooksPage booksPage = new BooksPage(); + + public SessionBean(){ logger.info("\n\n### SessionBean #####\n\n"); } @@ -124,6 +127,10 @@ return searchPage; } + public BooksPage getBooksPage(){ + return booksPage; + } + public void setSearchPage(SearchPage searchPage) { this.searchPage = searchPage; } @@ -133,7 +140,7 @@ return homePage; } - + public void setHomePage(HomePage homePage) { this.homePage = homePage; }
--- a/src/main/resources/config.properties Thu May 21 11:11:46 2015 +0200 +++ b/src/main/resources/config.properties Tue May 26 14:29:33 2015 +0200 @@ -1,13 +1,14 @@ db_gazetter_username=root -db_gazetter_password=admin +db_gazetter_password=root db_gazetter_name=Gazetteer files_root=/gazetteer-server/data #Local -dvn_server=http://localhost/dvn +#dvn_server=http://localhost/dvn root_server=http://localhost:8080/LGServices -#localgazetteers-dev +# currently stable one +#localgazetteers-dev #dvn_server=http://localgazetteers-dev/dvn #root_server=http://localgazetteers-dev/LGServices #toc_interface=http://localgazetteers-dev/LGToc @@ -15,7 +16,7 @@ #localgazetteers -#dvn_server=http://localgazetteers/dvn +dvn_server=http://localgazetteers/dvn #root_server=http://localgazetteers/LGServices toc_interface=http://localgazetteers/LGToc extraction_interface=http://localgazetteers/extraction-interface \ No newline at end of file
--- a/src/main/resources/hibernate.cfg.xml Thu May 21 11:11:46 2015 +0200 +++ b/src/main/resources/hibernate.cfg.xml Tue May 26 14:29:33 2015 +0200 @@ -17,7 +17,7 @@ <property name="hibernate.connection.url">jdbc:mysql://localhost/LGServices?characterEncoding=UTF-8</property> <property name="hibernate.connection.username">root</property> - <property name="hibernate.connection.password">admin</property> + <property name="hibernate.connection.password">root</property> <property name="hibernate.connection.charSet">UTF-8</property> <!-- JDBC connection pool (use the built-in) -->
--- a/src/main/webapp/componentes/template.jsp Thu May 21 11:11:46 2015 +0200 +++ b/src/main/webapp/componentes/template.jsp Tue May 26 14:29:33 2015 +0200 @@ -65,4 +65,5 @@ <a href="<%=sessionBean.getApplicationBean().getRootServer()%>/pages/home.jsp">Home</a> <a href="<%=sessionBean.getApplicationBean().getRootServer()%>/pages/createFile.jsp" class="current">Create File</a> <a href="<%=sessionBean.getApplicationBean().getRootServer()%>/pages/search.jsp">Search</a> + <a href="<%=sessionBean.getApplicationBean().getRootServer()%>/pages/books.jsp">Books</a> </div> \ No newline at end of file