February 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r709 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: bpoussin Date: 2011-02-16 15:57:46 +0100 (Wed, 16 Feb 2011) New Revision: 709 Url: http://nuiton.org/repositories/revision/wikitty/709 Log: Anomalie #1331: Bug in entity generation when inherite wikittyLabel (import missing) Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-02-15 16:52:10 UTC (rev 708) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-02-16 14:57:46 UTC (rev 709) @@ -274,6 +274,8 @@ String requires = null; for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { // using "for" but there will be 0 or 1 iteration + addImport(abstractClass, superClass); + addImport(abstractClass, superClass.getQualifiedName() + "Abstract"); requires = WikittyTransformerUtil.classToExtensionVariableName(superClass, true); }

1 0

r708 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 15 Feb '11

15 Feb '11

Author: bpoussin Date: 2011-02-15 17:52:10 +0100 (Tue, 15 Feb 2011) New Revision: 708 Url: http://nuiton.org/repositories/revision/wikitty/708 Log: add licence header Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java 2011-02-15 16:40:09 UTC (rev 707) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java 2011-02-15 16:52:10 UTC (rev 708) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.search; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-15 16:40:09 UTC (rev 707) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-15 16:52:10 UTC (rev 708) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.storage.solr;

1 0

r707 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by bpoussin＠users.nuiton.org 15 Feb '11

15 Feb '11

Author: bpoussin Date: 2011-02-15 17:40:09 +0100 (Tue, 15 Feb 2011) New Revision: 707 Url: http://nuiton.org/repositories/revision/wikitty/707 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> <modules> @@ -366,10 +366,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.4 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.0.4</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-api/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-dto/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-generators/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-hessian-client/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-hessian-server/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-perf-test/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-publication/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-02-15 16:40:03 UTC (rev 706) +++ trunk/wikitty-solr-impl/pom.xml 2011-02-15 16:40:09 UTC (rev 707) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4</version> + <version>3.0.5-SNAPSHOT</version> </parent>

1 0

r706 - in tags: . wikitty-3.0.4
by bpoussin＠users.nuiton.org 15 Feb '11

15 Feb '11

Author: bpoussin Date: 2011-02-15 17:40:03 +0100 (Tue, 15 Feb 2011) New Revision: 706 Url: http://nuiton.org/repositories/revision/wikitty/706 Log: [maven-release-plugin] copy for tag wikitty-3.0.4 Added: tags/wikitty-3.0.4/ Property changes on: tags/wikitty-3.0.4 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r705 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by bpoussin＠users.nuiton.org 15 Feb '11

15 Feb '11

Author: bpoussin Date: 2011-02-15 17:40:00 +0100 (Tue, 15 Feb 2011) New Revision: 705 Url: http://nuiton.org/repositories/revision/wikitty/705 Log: [maven-release-plugin] prepare release wikitty-3.0.4 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> <modules> @@ -93,6 +93,12 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> @@ -360,10 +366,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.0.4</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-api/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-dto/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-generators/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-hessian-client/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-hessian-server/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-perf-test/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-publication/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-02-15 14:42:04 UTC (rev 704) +++ trunk/wikitty-solr-impl/pom.xml 2011-02-15 16:40:00 UTC (rev 705) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.4-SNAPSHOT</version> + <version>3.0.4</version> </parent>  @@ -74,6 +74,10 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency>  <dependency> <groupId>junit</groupId>

1 0

r704 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 15 Feb '11

15 Feb '11

Author: bpoussin Date: 2011-02-15 15:42:04 +0100 (Tue, 15 Feb 2011) New Revision: 704 Url: http://nuiton.org/repositories/revision/wikitty/704 Log: update doc and small clean Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java 2011-02-10 12:20:08 UTC (rev 703) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java 2011-02-15 14:42:04 UTC (rev 704) @@ -28,6 +28,7 @@ /** + * use to permit client to modify fieldname during query generation * * @author poussin * @version $Revision$ @@ -35,7 +36,6 @@ * Last update: $Date$ * by : $Author$ */ -/** use to permit client to modify fieldname during query generation */ public interface FieldModifier { public String convertToSolr(WikittyTransaction transaction, String fieldname); public String convertToField(WikittyTransaction transaction, String solrName); Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-10 12:20:08 UTC (rev 703) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-15 14:42:04 UTC (rev 704) @@ -670,11 +670,9 @@ if (facet.getValues() != null) { for (FacetField.Count value : facet.getValues()) { String topicName = value.getName(); -// if(!topicName.endsWith(TREENODE_EMPTY)) { - int topicCount = (int) value.getCount(); - FacetTopic topic = new FacetTopic(facetName, topicName, topicCount); - topics.add(topic); -// } + int topicCount = (int) value.getCount(); + FacetTopic topic = new FacetTopic(facetName, topicName, topicCount); + topics.add(topic); } } facets.put(facetName, topics); @@ -758,7 +756,7 @@ // recuperation si demande du nombre d'attachment par noeud if (count) { // TODO poussin 20110128 regarder si on ne peut pas - // restreindre les facettes au noeud trouve dans la recherche + // restreindre les facettes aux noeuds trouve dans la recherche // precedente Criteria attCriteria = Search.query(filter).eq( TREENODE_ATTACHED_ALL, wikittyId).criteria() Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2011-02-10 12:20:08 UTC (rev 703) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2011-02-15 14:42:04 UTC (rev 704) @@ -64,17 +64,18 @@ /** Precise the query parser to use, is allow leading wildcard */ static final public String SOLR_QUERY_PARSER = "{!wikitty}"; - // Use for indexation tree node + /** Use for indexation tree node */ static final public String TREENODE_PREFIX = SOLR_WIKITTY_PREFIX + "tree."; - // Use as field on TreeNode + /** Use as field on TreeNode */ static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; - // Use as field on TreeNode, contains parent node id and himself node id + /** Use as field on TreeNode, contains parent node id and himself node id */ static final public String TREENODE_PARENTS = TREENODE_PREFIX + "parents"; - // Use as field on TreeNode, number of parents (root node depth=1) + /** Use as field on TreeNode, number of parents (root node depth=1) */ static final public String TREENODE_DEPTH = TREENODE_PREFIX + "depth"; - // Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end + /** Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end */ static final public String TREENODE_ATTACHED = TREENODE_PREFIX + "attached."; - // Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end + /** Use as field on Wikitty object attached on TreeNode, TreeNodeId is added at end + used for facetisation */ static final public String TREENODE_ATTACHED_ALL = TREENODE_PREFIX + "attached-all"; static final public String SUFFIX_BINARY = "_bi"; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java 2011-02-10 12:20:08 UTC (rev 703) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java 2011-02-15 14:42:04 UTC (rev 704) @@ -72,14 +72,29 @@ * <td>#extensions</td><td>string</td><td>la liste des extensions</td><td>true</td><td>true</td> * </tr> * <tr> - * <td>#not_null_fields</td><td>string</td><td>la liste des champs qui doivent etre non null</td><td>true</td><td>true</td> + * <td>#null_field-[fieldname]</td><td>boolean</td><td>vrai si le champs est null</td><td>true</td><td>false</td> * </tr> * <tr> * <td>#fulltext</td><td>text</td><td>la valeur de tous les champs ayant un suffix</td><td>true</td><td>true</td> * </tr> * </table> - * + * * <p> + * Pour les TreeNode, on ajoute des champs sur les objets attaches mais aussi + * sur les TreeNode eux meme. + * Sur les TreeNode: + * <li> #tree.root le nom racine de l'arbre + * <li> #tree.parents la liste de tous les parents de ce noeud, lui et le root compris + * <li> #tree.depth la profondeur de ce noeud dans l'arbre (le root = 1) + * + * Sur les objets attaches: + * <li> #tree.attached.[TreeNode.id] liste des parents du TreeNode (TreeNode.id) + * sur lequel est attache l'objet (l'objet pouvant etre sur plusieurs noeud + * <li> #tree.attached-all liste de tous les parents sur lequel est attache l'objet + * quelque soit le noeud de rattachement (utilise pour les facetisations) + * + * + * <p> * Les champs sont tous restockes dans une extension 'all' pour pouvoir faire * des recherches sur toutes les extensions en meme temps. Par exemple rechercher * tout ce qui porte le 'nom' 'portable' quelque soit l'extension (*.nom:portable) @@ -89,7 +104,7 @@ * indexer les chaines en 'string' et aussi en 'text' pour pouvoir les utiliser * dans les facettes mais aussi que la recheche soit plus permissive. * <p> - * SolR copie tous les champs dans le champs 'text' pour la recherche fulltext + * SolR copie tous les champs dans le champs 'fulltext' pour la recherche fulltext * ce champs est le champs par defaut de recherche. * <p> * id est marque comme devant etre un champs unique (et donc lorsqu'on enregistre @@ -97,12 +112,12 @@ * <p> * Tous les champs sont marque stored car lors de la reindexation des arbres * on a besoin de faire une copie de l'ancien document et donc de pouvoir - * recuperer la valeur des champs (voir alternative) + * recuperer la valeur des champs * <p> * Par exemple si on a un champs <b>product.description: String</b> nous le * retrouverons dans 7 champs de l'index: * - * <li> text : text (car est la copie de tous les champs) + * <li> #fulltext : text (car est la copie de tous les champs) * <li> product.description_s : string (necessaire pour la facetisation) * <li> product.description_s_c : string * <li> product.description_s_t : text @@ -131,19 +146,6 @@ * copyField ne support que une * et au debut ou a la fin, donc actuellement * il serait possible d'avoir * - * <copyField source="*_s" dest="*_s_c"/> - * <copyField source="*_s" dest="*_s_t"/> - * - * et d'enregistrer les champs deux fois en <b>extName.fieldName</b> et en - * <b>all.fieldName</b> ensuite lorsqu'on a besoin de copier un document - * il ne faut prendre les champs id, extensions, not_null_fields et les champs - * ne commencant pas par 'all.' et se finissant exclusivement par - * _bi, _b, _dt, _d, _s, _w. Cest dernier seront enregistrer aussi en all. - * - * Ainsi on passe de 6 champs stocke + 1, a 1 champ stocker + 6. Pour les chaines - * et de 2 champs stockes a 1 champ stocke + 1. - * - * * <h2>alternative au stockage de tout les champs</h2> * <p> * Une alternative serait de ne reprendre que les champs reels (pas les copies)

1 0

r703 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:20:08 +0100 (Thu, 10 Feb 2011) New Revision: 703 Url: http://nuiton.org/repositories/revision/wikitty/703 Log: Update mavenpom4redmine to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:29:37 UTC (rev 702) +++ trunk/pom.xml 2011-02-10 12:20:08 UTC (rev 703) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent>

1 0

r702 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:29:37 +0100 (Wed, 09 Feb 2011) New Revision: 702 Url: http://nuiton.org/repositories/revision/wikitty/702 Log: Update mavenpom4redmine to 2.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-02 14:08:09 UTC (rev 701) +++ trunk/pom.xml 2011-02-09 08:29:37 UTC (rev 702) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent>

1 0

r701 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 02 Feb '11

02 Feb '11

Author: bpoussin Date: 2011-02-02 15:08:09 +0100 (Wed, 02 Feb 2011) New Revision: 701 Url: http://nuiton.org/repositories/revision/wikitty/701 Log: Evolution #1254: Improve contains and in methods in search (in and contains work correctly now) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2011-01-31 15:25:48 UTC (rev 700) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2011-02-02 14:08:09 UTC (rev 701) @@ -49,6 +49,7 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; +import org.nuiton.wikitty.search.operators.In; /** * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> @@ -180,13 +181,30 @@ return contains(element, values); } - public static Contains contains(Element element, + public static Restriction contains(Element element, List<String> values) { Contains contains = new Contains(element, values); contains.setName(RestrictionName.CONTAINS); return contains; } + public static Restriction in(Element element, String value1, + String... otherValues) { + List<String> values = new LinkedList<String>(); + values.add(value1); + for (String val : otherValues) { + values.add(val); + } + return in(element, values); + } + + public static Restriction in(Element element, + List<String> values) { + In in = new In(element, values); + in.setName(RestrictionName.IN); + return in; + } + public static Restriction not(Restriction restriction) { Not not = new Not(restriction); not.setName(RestrictionName.NOT); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-01-31 15:25:48 UTC (rev 700) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-02-02 14:08:09 UTC (rev 701) @@ -144,7 +144,7 @@ /** * Contains. - * + * * @param element * @param values * @return @@ -162,13 +162,39 @@ * @param value * @return */ - public Search contains(String element, String value) { + public Search contains(String element, String value1, String ... values) { restrictions.add(RestrictionHelper.contains(elt(element), - value)); + value1, values)); return this; } /** + * Contains. + * + * @param element + * @param values + * @return + */ + public Search in(String element, Collection<String> values) { + restrictions.add(RestrictionHelper.in(elt(element), + new ArrayList<String>(values))); + return this; + } + + /** + * Contains. + * + * @param element + * @param value + * @return + */ + public Search in(String element, String value1, String ... values) { + restrictions.add(RestrictionHelper.in(elt(element), + value1, values)); + return this; + } + + /** * Equals. * * @param element Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-01-31 15:25:48 UTC (rev 700) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-02-02 14:08:09 UTC (rev 701) @@ -175,14 +175,27 @@ // FIXME poussin 20101220 i think this method return bad lucene syntaxe query // I think the syntaxe must be the same as contains private String in2solr(In in) { - boolean first = true; - String result = in.getElement().getName() + ":["; - for( String value : in.getValue() ) { - if ( !first ) { result += ", "; first = false; } - result += value; + if (in.getElement() == null) { + throw new WikittyException("in.element must not be null"); } - result +="]"; - return result; + if (in.getValue() == null) { + throw new WikittyException("in.values must not be null"); + } + if (in.getValue().size() < 1) { + throw new WikittyException("IN is an operator that handle 1 operand at least"); + } + + String operand = ""; + StringBuilder result = new StringBuilder(); + result.append(element2solr(in.getElement())).append(':'); + result.append('('); + for (String value : in.getValue()) { + result.append(operand); + result.append(value2solr(value)); + operand = " OR "; + } + result.append(')'); + return result.toString(); } private String associated2solr(AssociatedRestriction associated, SolrServer solr) throws WikittyException { @@ -356,13 +369,13 @@ private String between2solr(Between between) throws WikittyException { if (between.getElement() == null) { - throw new WikittyException("contains.element"); + throw new WikittyException("between.element must not be null"); } if (between.getMin() == null) { - throw new WikittyException("contains.min"); + throw new WikittyException("between.min must not be null"); } if (between.getMax() == null) { - throw new WikittyException("contains.max"); + throw new WikittyException("between.max must not be null"); } return element2solr(between.getElement()) + ":[" + value2solr(between.getMin()) + " TO " @@ -372,10 +385,10 @@ private String contains2solr(Contains contains) throws WikittyException { if (contains.getElement() == null) { - throw new WikittyException("contains.element"); + throw new WikittyException("contains.element must not be null"); } if (contains.getValue() == null) { - throw new WikittyException("contains.values"); + throw new WikittyException("contains.values must not be null"); } if (contains.getValue().size() < 1) { throw new WikittyException("CONTAINS is an operator that handle 1 operand at least"); @@ -388,7 +401,7 @@ for (String value : contains.getValue()) { result.append(operand); result.append(value2solr(value)); - operand = " OR "; + operand = " AND "; } result.append(')'); return result.toString(); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-01-31 15:25:48 UTC (rev 700) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-02-02 14:08:09 UTC (rev 701) @@ -35,7 +35,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; @@ -49,7 +48,6 @@ import org.nuiton.wikitty.entities.WikittyGroup; import org.nuiton.wikitty.entities.WikittyGroupImpl; import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.operators.Like; import org.nuiton.wikitty.search.operators.Like.SearchAs; import org.nuiton.wikitty.search.RestrictionHelper; import org.nuiton.wikitty.search.Search; @@ -175,6 +173,59 @@ } @Test + public void testContainsSearch() throws Exception { + { + Criteria criteria = Search.query() + .contains("Product.price", "20") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(3, list.size()); + } + { + Criteria criteria = Search.query() + .contains("Product.price", "20", "30", "35") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(0, list.size()); + } + } + + @Test + public void testInSearch() throws Exception { + { + Criteria criteria = Search.query() + .in("Product.price", "20") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(3, list.size()); + } + { + Criteria criteria = Search.query() + .in("Product.price", "20", "30", "35") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(4, list.size()); + } + { + Criteria criteria = Search.query() + .in("Product.price", "25", "30", "40") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(0, list.size()); + } + } + + @Test public void testAdvancedSearch() throws Exception { Criteria criteria = Search.query() .eq("Product.value", "1")

1 0