Mercurial > hg > LGServices
changeset 68:7e161f2e6660
topic nameEng to lowercase only when saving as tag
| author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
|---|---|
| date | Fri, 05 Aug 2016 13:36:37 +0200 |
| parents | 0a9937b06cc3 |
| children | dd2fcc5f5deb |
| files | src/main/java/de/mpiwg/gazetteer/utils/DBService.java src/main/java/de/mpiwg/gazetteer/utils/DataProvider.java src/main/java/de/mpiwg/web/jsp/FullTextSearchPage.java src/main/resources/hibernate.cfg.xml src/main/webapp/pages/topicList.jsp |
| diffstat | 5 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Thu Aug 04 14:50:58 2016 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/utils/DBService.java Fri Aug 05 13:36:37 2016 +0200 @@ -1159,6 +1159,7 @@ Query query = session.createQuery("from LGTopicSectionRelation"); list = query.list(); session.getTransaction().commit(); + return list; }
--- a/src/main/java/de/mpiwg/gazetteer/utils/DataProvider.java Thu Aug 04 14:50:58 2016 +0200 +++ b/src/main/java/de/mpiwg/gazetteer/utils/DataProvider.java Fri Aug 05 13:36:37 2016 +0200 @@ -410,7 +410,10 @@ LGTaglist taglist = new LGTaglist(); taglist.setName(nameCh); - taglist.setTag(tag); + + // tag to lowercase only!! bcuz it will be used as topic tag in Extraction-interface, and it'll be a tag in HTML which is case-insensitive + taglist.setTag(tag.toLowerCase()); + taglist.setColor("rgb(255, 0, 174)"); DBService.saveDBEntry0(session, taglist, date);
--- a/src/main/java/de/mpiwg/web/jsp/FullTextSearchPage.java Thu Aug 04 14:50:58 2016 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/FullTextSearchPage.java Fri Aug 05 13:36:37 2016 +0200 @@ -521,6 +521,7 @@ } } } + if(completeList.size() > 0){ this.searchMessage = completeList.size() + " section(s) found for the term(s): " + this.searchTerm; @@ -579,6 +580,8 @@ break; } } + + int currentPage = this.getPaginator().getCurrentPage();
--- a/src/main/resources/hibernate.cfg.xml Thu Aug 04 14:50:58 2016 +0200 +++ b/src/main/resources/hibernate.cfg.xml Fri Aug 05 13:36:37 2016 +0200 @@ -22,7 +22,7 @@ <property name="hibernate.connection.charSet">UTF-8</property> <!-- JDBC connection pool (use the built-in) --> - <property name="hibernate.connection.pool_size">1</property> + <property name="hibernate.connection.pool_size">5</property> <!-- Enable Hibernate's automatic session context management --> <property name="hibernate.current_session_context_class">thread</property>
--- a/src/main/webapp/pages/topicList.jsp Thu Aug 04 14:50:58 2016 +0200 +++ b/src/main/webapp/pages/topicList.jsp Fri Aug 05 13:36:37 2016 +0200 @@ -34,9 +34,10 @@ // esc: 27 // shift, ctr, alt: 16, 17, 18, 20 // cmd: 91 + // underscore : 189 - if (event.keyCode == 8 || event.keyCode == 9 || (event.keyCode >= 16 && event.keyCode <= 20) || event.keyCode == 27 || event.keyCode == 37 || event.keyCode == 39 || event.keyCode == 91 || englishAlphabetAndWhiteSpace.test(key)) { + if (event.keyCode == 189 || event.keyCode == 8 || event.keyCode == 9 || (event.keyCode >= 16 && event.keyCode <= 20) || event.keyCode == 27 || event.keyCode == 37 || event.keyCode == 39 || event.keyCode == 91 || englishAlphabetAndWhiteSpace.test(key)) { return true; } @@ -85,7 +86,7 @@ <span>name(Eng)*</span> </td> <td> - <input id="nameEn" name="nameEn" type="text" placeholder="e.g. Local Product"/> + <input id="nameEn" name="nameEn" type="text" placeholder="e.g.Local Product"/> </td> </tr> <tr>