- Cantharella-commits - mailman.cloud.codelutin.com

r251 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com 24 Jun '13

24 Jun '13

Author: maven-release Date: 2013-06-24 09:46:22 +0200 (Mon, 24 Jun 2013) New Revision: 251 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/251 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-24 07:46:14 UTC (rev 250) +++ trunk/cantharella.data/pom.xml 2013-06-24 07:46:22 UTC (rev 251) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-24 07:46:14 UTC (rev 250) +++ trunk/cantharella.service/pom.xml 2013-06-24 07:46:22 UTC (rev 251) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-24 07:46:14 UTC (rev 250) +++ trunk/cantharella.utils/pom.xml 2013-06-24 07:46:22 UTC (rev 251) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-24 07:46:14 UTC (rev 250) +++ trunk/cantharella.web/pom.xml 2013-06-24 07:46:22 UTC (rev 251) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-24 07:46:14 UTC (rev 250) +++ trunk/pom.xml 2013-06-24 07:46:22 UTC (rev 251) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.1</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </developerConnection> </scm>

1 0

r250 - tags
by maven-release＠users.forge.codelutin.com 24 Jun '13

24 Jun '13

Author: maven-release Date: 2013-06-24 09:46:14 +0200 (Mon, 24 Jun 2013) New Revision: 250 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/250 Log: [maven-release-plugin] copy for tag cantharella-1.1.1 Added: tags/cantharella-1.1.1/

1 0

r249 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com 24 Jun '13

24 Jun '13

Author: maven-release Date: 2013-06-24 09:46:06 +0200 (Mon, 24 Jun 2013) New Revision: 249 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/249 Log: [maven-release-plugin] prepare release cantharella-1.1.1 Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-24 07:44:24 UTC (rev 248) +++ trunk/cantharella.data/pom.xml 2013-06-24 07:46:06 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-24 07:44:24 UTC (rev 248) +++ trunk/cantharella.service/pom.xml 2013-06-24 07:46:06 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-24 07:44:24 UTC (rev 248) +++ trunk/cantharella.utils/pom.xml 2013-06-24 07:46:06 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-24 07:44:24 UTC (rev 248) +++ trunk/cantharella.web/pom.xml 2013-06-24 07:46:06 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-24 07:44:24 UTC (rev 248) +++ trunk/pom.xml 2013-06-24 07:46:06 UTC (rev 249) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </developerConnection> </scm>

1 0

r248 - trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search
by echatellier＠users.forge.codelutin.com 24 Jun '13

24 Jun '13

Author: echatellier Date: 2013-06-24 09:44:24 +0200 (Mon, 24 Jun 2013) New Revision: 248 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/248 Log: Add license header Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java 2013-06-23 10:35:07 UTC (rev 247) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java 2013-06-24 07:44:24 UTC (rev 248) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Data + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package nc.ird.cantharella.data.model.search; import java.io.IOException;

1 0

r247 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com 23 Jun '13

23 Jun '13

Author: echatellier Date: 2013-06-23 12:35:07 +0200 (Sun, 23 Jun 2013) New Revision: 247 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/247 Log: Add PersonneRenderer to DropDownChoice Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-06-21 09:30:49 UTC (rev 246) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-06-23 10:35:07 UTC (rev 247) @@ -40,6 +40,7 @@ import nc.ird.cantharella.web.config.WebContext; import nc.ird.cantharella.web.pages.TemplatePage; import nc.ird.cantharella.web.pages.domain.personne.ManagePersonnePage; +import nc.ird.cantharella.web.pages.renderers.PersonneRenderer; import nc.ird.cantharella.web.utils.CallerPage; import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString; @@ -196,7 +197,7 @@ formView.add(new TextField<String>("Document.titre", new PropertyModel<String>(documentModel, "titre"))); final DropDownChoice<Personne> createurInput = new DropDownChoice<Personne>("Document.createur", - new PropertyModel<Personne>(documentModel, "createur"), personnes); + new PropertyModel<Personne>(documentModel, "createur"), personnes, new PersonneRenderer()); createurInput.setOutputMarkupId(true); createurInput.setNullValid(false); formView.add(createurInput);

1 0

r246 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 11:30:49 +0200 (Fri, 21 Jun 2013) New Revision: 246 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/246 Log: fixes #2741: La recherche de resultats de test bio ne doit afficher que les type de r?\195?\169sultat 'Produit' Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-21 09:08:32 UTC (rev 245) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-21 09:30:49 UTC (rev 246) @@ -22,6 +22,7 @@ */ package nc.ird.cantharella.web.pages.domain.search; +import java.util.Iterator; import java.util.List; import nc.ird.cantharella.data.model.Extraction; @@ -29,6 +30,7 @@ import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.data.model.Purification; import nc.ird.cantharella.data.model.ResultatTestBio; +import nc.ird.cantharella.data.model.ResultatTestBio.TypeResultat; import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; @@ -176,6 +178,14 @@ add(purificationsDataTable); // test bio table + // fix, resultat test bio page must only display produit type (excluding Temoin, Blanc...) + Iterator<ResultatTestBio> itResultatTestBios = searchResult.getResultatTestBios().iterator(); + while (itResultatTestBios.hasNext()) { + ResultatTestBio resultatTestBio = itResultatTestBios.next(); + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT) { + itResultatTestBios.remove(); + } + } DataTable<ResultatTestBio, String> testBiosDataTable = ListTestsBioPage.initTestsBioDataTable(this, "SearchPage.ResultatTestBios.Results", currentPage, searchResult.getResultatTestBios(), testBioService); add(testBiosDataTable);

1 0

r245 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 11:08:32 +0200 (Fri, 21 Jun 2013) New Revision: 245 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/245 Log: Fix dev banner text Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-21 08:24:20 UTC (rev 244) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-06-21 09:08:32 UTC (rev 245) @@ -43,7 +43,7 @@ <body onload="slideMenu.build('sm',360,10,10,1)"> <div class="banner" wicket:id="TemplatePage.Banner"> - <a>Under developement</a> + <a>En développement</a> </div> <div id="header"><div>

1 0

r244 - trunk/cantharella.data/src/main/resources
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 10:24:20 +0200 (Fri, 21 Jun 2013) New Revision: 244 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/244 Log: Remove unused configuration Modified: trunk/cantharella.data/src/main/resources/cantharella.conf Modified: trunk/cantharella.data/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.data/src/main/resources/cantharella.conf 2013-06-21 08:21:15 UTC (rev 243) +++ trunk/cantharella.data/src/main/resources/cantharella.conf 2013-06-21 08:24:20 UTC (rev 244) @@ -34,5 +34,3 @@ # Hibernate search lucene index location on filesystem. hibernate.search.indexBase=/tmp/cantharella -# Hibernate search analyzer -hibernate.search.analyzer=org.apache.lucene.analysis.fr.FrenchAnalyzer

1 0

r243 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config
by echatellier＠users.forge.codelutin.com 21 Jun '13

21 Jun '13

Author: echatellier Date: 2013-06-21 10:21:15 +0200 (Fri, 21 Jun 2013) New Revision: 243 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/243 Log: Remove unused configuration Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-06-16 20:22:01 UTC (rev 242) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-06-21 08:21:15 UTC (rev 243) @@ -186,12 +186,6 @@ @Value("${hibernate.search.indexBase}") protected String hibernateSearchIndexBase; - /** - * Hibernate search analyzer. - */ - @Value("${hibernate.search.analyzer}") - protected String hibernateSearchAnalyzer; - static { // The first Locale in the list is the default one List<Locale> locales = new ArrayList<Locale>();

1 0

r242 - in trunk/cantharella.data/src: main/java/nc/ird/cantharella/data/model/search test/java/nc/ird/cantharella/data/model test/java/nc/ird/cantharella/data/model/search
by echatellier＠users.forge.codelutin.com 16 Jun '13

16 Jun '13

Author: echatellier Date: 2013-06-16 22:22:01 +0200 (Sun, 16 Jun 2013) New Revision: 242 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/242 Log: fixes #2712: Keep duplicated caracters (even 2 last ones) Added: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java 2013-06-14 16:19:26 UTC (rev 241) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/CantharellaStemmer.java 2013-06-16 20:22:01 UTC (rev 242) @@ -252,8 +252,10 @@ len--; if (s[len - 1] == 'e') len--; + /* XXX chatellier 20130516 disabled for cantharella because + duplicated characters are usefull in some refs identifiers if (s[len - 1] == s[len - 2]) - len--; + len--;*/ } return len; } Added: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java (rev 0) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java 2013-06-16 20:22:01 UTC (rev 242) @@ -0,0 +1,39 @@ +package nc.ird.cantharella.data.model.search; + +import java.io.IOException; +import java.io.StringReader; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.util.Version; +import org.junit.Assert; +import org.junit.Test; + +public class CantharellaAnalyzerTest { + + /** + * Test que les caractères dupliqués ne sont pas perdu (supprimé) par l'analyzer. + * @throws IOException + */ + @Test + public void testDuplicated() throws IOException { + Analyzer analyzer = new CantharellaAnalyzer(Version.LUCENE_36); + + // without * + StringReader reader = new StringReader("R3044"); + TokenStream stream = analyzer.tokenStream("label", reader); + stream.incrementToken(); + String term = stream.getAttribute(CharTermAttribute.class).toString(); + Assert.assertEquals("r3044", term.toString()); + + // with * + reader = new StringReader("*3044"); + stream = analyzer.tokenStream("label", reader); + stream.incrementToken(); + term = stream.getAttribute(CharTermAttribute.class).toString(); + Assert.assertEquals("3044", term.toString()); + + analyzer.close(); + } +} Property changes on: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/search/CantharellaAnalyzerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0