# HG changeset patch # User "jurzua " # Date 1426086042 -3600 # Node ID 1f56cf4f80d4283c81a41aca1fc6869f9736b9f3 # Parent 43f4cbe04ea1c247924fe585e15e009b1ed740f6 Fix of bug in the creation of a new file. diff -r 43f4cbe04ea1 -r 1f56cf4f80d4 src/main/java/de/mpiwg/web/FileCreator.java --- a/src/main/java/de/mpiwg/web/FileCreator.java Wed Mar 11 15:37:16 2015 +0100 +++ b/src/main/java/de/mpiwg/web/FileCreator.java Wed Mar 11 16:00:42 2015 +0100 @@ -21,7 +21,6 @@ private static Logger logger = Logger.getLogger(FileCreator.class); private DBSection section; - private String label; private Long sectionId; private List sectionSuggestion; @@ -32,18 +31,19 @@ public void reset(){ this.section = null; - this.label = null; this.sectionId = null; this.sectionSuggestion = null; } public void listenerLoadSection(ActionEvent event){ - if(sectionId != null){ + if(sectionId != null & sectionId > 0){ try { this.section = DBService.getSectionWithContent(sectionId); } catch (SQLException e) { internalError(e); } + }else{ + this.reset(); } } @@ -65,6 +65,7 @@ } } + /* public void listenerSaveNewFile(ActionEvent event){ if( section != null && @@ -82,7 +83,7 @@ internalError(e); } } - } + } */ public DBSection getSection() { return section; @@ -92,14 +93,6 @@ this.section = section; } - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - public Long getSectionId() { return sectionId; } diff -r 43f4cbe04ea1 -r 1f56cf4f80d4 src/main/resources/config.properties --- a/src/main/resources/config.properties Wed Mar 11 15:37:16 2015 +0100 +++ b/src/main/resources/config.properties Wed Mar 11 16:00:42 2015 +0100 @@ -6,5 +6,5 @@ extraction_interface=http://localgazetteers-dev/extraction-interface dvn_server=http://localgazetteers-dev/dvn #root_server=http://localgazetteers.mpiwg-berlin.mpg.de:8080/gazetteer-server -root_server=http://localhost:8080/LGServer -#root_server=http://localgazetteers-dev/LGServer +#root_server=http://localhost:8080/LGServer +root_server=http://localgazetteers-dev/LGServer diff -r 43f4cbe04ea1 -r 1f56cf4f80d4 src/main/webapp/home/createNewFile.xhtml --- a/src/main/webapp/home/createNewFile.xhtml Wed Mar 11 15:37:16 2015 +0100 +++ b/src/main/webapp/home/createNewFile.xhtml Wed Mar 11 16:00:42 2015 +0100 @@ -17,10 +17,6 @@ - - - - - + diff -r 43f4cbe04ea1 -r 1f56cf4f80d4 src/main/webapp/templates/publicTemplate.xhtml --- a/src/main/webapp/templates/publicTemplate.xhtml Wed Mar 11 15:37:16 2015 +0100 +++ b/src/main/webapp/templates/publicTemplate.xhtml Wed Mar 11 16:00:42 2015 +0100 @@ -82,7 +82,9 @@ + url="#{appBean.rootServer}/home/searchPage.xhtml" /> +