Mercurial > hg > LGServices
changeset 13:9c6e74761f60
new: link to Edit Toc page
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Wed, 27 May 2015 15:30:09 +0200 |
parents | d57fe2179f61 |
children | 3387d855a194 |
files | src/main/java/de/mpiwg/gazetteer/utils/DBService.java src/main/java/de/mpiwg/web/jsp/BooksPage.java src/main/java/de/mpiwg/web/jsp/JSPProxy.java src/main/resources/config.properties src/main/resources/hibernate.cfg.xml src/main/webapp/pages/books.jsp |
diffstat | 6 files changed, 34 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Tue May 26 18:02:03 2015 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Wed May 27 15:30:09 2015 +0200 @@ -604,12 +604,13 @@ public List<DBSectionVersion> getSectionVersionList() 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(); - + // query in sections_versions table. + // Each line is a current version (with largest version number) for a book. String query = "SELECT * FROM sections_versions s1 " + "JOIN ( " + "SELECT books_id, MAX(version) AS version " + @@ -619,13 +620,9 @@ ResultSet rs = stmt.executeQuery(query); while(rs.next()){ - DBSectionVersion sv = new DBSectionVersion(rs); section_version.add(sv); - //logger.debug("book id= "+id); - //logger.debug(rs.getString("editor") + ", date: " + rs.getString("date")); - } } catch (Exception e) { e.printStackTrace();
--- a/src/main/java/de/mpiwg/web/jsp/BooksPage.java Tue May 26 18:02:03 2015 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/BooksPage.java Wed May 27 15:30:09 2015 +0200 @@ -26,7 +26,17 @@ private List<DBBook> completeBookList; private Map<String, DBSectionVersion> sectionVersionMap = null; + private int bookNumber; + + public int getBookNumber() { + return bookNumber; + } + + public void setBookNumber(int bookNumber) { + this.bookNumber = bookNumber; + } + public void loadParameters(HttpServletRequest request, HttpServletResponse response){ this.request = request; this.response = response; @@ -53,12 +63,16 @@ if(getSessionBean().getUser() != null){ // === load book table from db == for(DBBook book : DBService.getInstance().getBooks()){ - // TODO: get editor and date by book id - + // set editor and date (current version) book.setCurrentSectionVersion(sectionVersionMap.get(book.getId())); this.completeBookList.add(book); } + + this.setBookNumber(this.completeBookList.size()); + logger.debug(this.getBookNumber()); + logger.debug(Integer.toString(this.getBookNumber())); + } }
--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Tue May 26 18:02:03 2015 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Wed May 27 15:30:09 2015 +0200 @@ -148,19 +148,6 @@ 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; } }catch(Exception e){
--- a/src/main/resources/config.properties Tue May 26 18:02:03 2015 +0200 +++ b/src/main/resources/config.properties Wed May 27 15:30:09 2015 +0200 @@ -5,7 +5,9 @@ #Local #dvn_server=http://localhost/dvn -root_server=http://localhost:8080/LGServices +#root_server=http://localhost:8080/LGServices +#toc_interface=http://localhost:1080/localgazetteers-dev/LGToc +#extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface # currently stable one #localgazetteers-dev @@ -17,6 +19,6 @@ #localgazetteers dvn_server=http://localgazetteers/dvn -#root_server=http://localgazetteers/LGServices +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 Tue May 26 18:02:03 2015 +0200 +++ b/src/main/resources/hibernate.cfg.xml Wed May 27 15:30:09 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/pages/books.jsp Tue May 26 18:02:03 2015 +0200 +++ b/src/main/webapp/pages/books.jsp Wed May 27 15:30:09 2015 +0200 @@ -170,17 +170,18 @@ <% } else { sessionBean.getBooksPage().loadParameters(request, response); sessionBean.getBooksPage().loadBooks(); - + // TODO: add a "update" to forceLoadBooks() %> - <label class="subTitel">List of Books</label> - + <div class="subTitel">List of Books + <p class="label">Total <%= sessionBean.getBooksPage().getBookNumber() %> books</p> + </div> <form name="booksForm" action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp" method="post" class="contentForm"> <input name="bean" type="hidden" value="booksBean" /> - + <table style="width: 90%; margin-left: auto;margin-right: auto;" class="pageTable"> <tr> <td><label class="tableTitle">Book ID</label></td> @@ -199,7 +200,7 @@ <td><label class="tableTitle">Edit Time</label></td> </tr> - + <% for(DBBook book : sessionBean.getBooksPage().getCompleteBookList() ) { %> <tr> @@ -215,7 +216,9 @@ <td><%=book.getStart_year() %></td> <!-- TODO --> - <td>TODO<input type="submit" value="edit" onclick="setAction('editToc', 'booksForm');"/></td> + <td><a href="<%=sessionBean.getApplicationBean().getTocInterfaceUrl()%>/check_sections_details.php?book_id=<%=book.getId() %>&count=100&sessionId=<%= session.getId()%>" target="blank"> + Edit TOC</a></td> + <td>TODO<input type="checkbox" name="finished" value="0" <%= (book.getTocCorrection() == 1) ? "checked" : "" %>/><label>Finished</label></td> <td><%= (book.getCurrentSectionVersion() == null) ? "" : book.getCurrentSectionVersion().getEditor() %></td> <td><%= (book.getCurrentSectionVersion() == null) ? "" : book.getCurrentSectionVersion().getDate() %></td> @@ -223,13 +226,7 @@ <% } %> </table> - <!-- - <table> - <tr> - <td><input type="submit" value="Reload" onclick="setAction('reloadBranches', 'homeForm');"/> </td> - </tr> - </table> - --> + </form> <% } %> </div>