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

r1424 - trunk
by echatellier＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: echatellier Date: 2012-02-20 14:49:35 +0100 (Mon, 20 Feb 2012) New Revision: 1424 Url: http://nuiton.org/repositories/revision/wikitty/1424 Log: #1910 : Update to h2 1.3.164 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:48:19 UTC (rev 1423) +++ trunk/pom.xml 2012-02-20 13:49:35 UTC (rev 1424) @@ -170,7 +170,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.157</version> + <version>1.3.164</version> <scope>test</scope> </dependency>

1 0

r1423 - trunk
by echatellier＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: echatellier Date: 2012-02-20 14:48:19 +0100 (Mon, 20 Feb 2012) New Revision: 1423 Url: http://nuiton.org/repositories/revision/wikitty/1423 Log: #1979 : Update to commons-pool 1.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:44:53 UTC (rev 1422) +++ trunk/pom.xml 2012-02-20 13:48:19 UTC (rev 1423) @@ -158,7 +158,7 @@ <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> - <version>1.5.6</version> + <version>1.6</version> </dependency> <dependency>

1 0

r1422 - in trunk: wikitty-lucene wikitty-publication wikitty-publication-ui wp-maven-plugin
by echatellier＠users.nuiton.org Feb. 20, 2012

Feb. 20, 2012

Author: echatellier Date: 2012-02-20 14:44:53 +0100 (Mon, 20 Feb 2012) New Revision: 1422 Url: http://nuiton.org/repositories/revision/wikitty/1422 Log: Fix poms Modified: trunk/wikitty-lucene/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2012-02-04 12:51:10 UTC (rev 1421) +++ trunk/wikitty-lucene/pom.xml 2012-02-20 13:44:53 UTC (rev 1422) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2012-02-04 12:51:10 UTC (rev 1421) +++ trunk/wikitty-publication/pom.xml 2012-02-20 13:44:53 UTC (rev 1422) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.5-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2012-02-04 12:51:10 UTC (rev 1421) +++ trunk/wikitty-publication-ui/pom.xml 2012-02-20 13:44:53 UTC (rev 1422) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.5-SNAPSHOT</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2012-02-04 12:51:10 UTC (rev 1421) +++ trunk/wp-maven-plugin/pom.xml 2012-02-20 13:44:53 UTC (rev 1422) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - EUGene :: Maven plugin $Id$ $HeadURL$ @@ -34,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1421 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/entities main/java/org/nuiton/wikitty/storage test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Feb. 4, 2012

Feb. 4, 2012

Author: bpoussin Date: 2012-02-04 13:51:10 +0100 (Sat, 04 Feb 2012) New Revision: 1421 Url: http://nuiton.org/repositories/revision/wikitty/1421 Log: amelioration de l'implantation in memory - support des ElementField avec le type Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2012-02-04 12:19:52 UTC (rev 1420) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2012-02-04 12:51:10 UTC (rev 1421) @@ -264,7 +264,7 @@ /** * Extract field name from fully qualified field name (suppression [n/m] if - * field is collection + * field is collection) and suppress TYPE if needed * * @param fqFieldName fully qualified field name like 'WikittyUser.login' * @return return field name. Example 'login' Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 12:19:52 UTC (rev 1420) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 12:51:10 UTC (rev 1421) @@ -51,6 +51,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.ElementExtension; +import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.entities.ElementId; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; @@ -803,6 +804,16 @@ */ protected boolean check(Predicate predicate, org.nuiton.wikitty.entities.Element element, Object expected) { + if (element instanceof ElementField) { + String fqf = element.getValue(); + // suppression du type dans l'element, car on en a pas besoin + String extName = WikittyUtil.getExtensionNameFromFQFieldName(fqf); + String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqf); + // on reconstruit fqf, sans l'optionnel 3eme composantes (Type) + fqf = WikittyUtil.getFQFieldName(extName, fieldName); + element = org.nuiton.wikitty.entities.Element.get(fqf); + } + boolean result = false; Map<String, Collection> fieldValues = new HashMap<String, Collection>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 12:19:52 UTC (rev 1420) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 12:51:10 UTC (rev 1421) @@ -1410,8 +1410,6 @@ @Test public void testQueryMarkerWilcardEquals() { - assumeTrueSearchEngineCanRunTest(); // wildcards - WikittyQuery query1 = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end(); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult()); @@ -1433,8 +1431,6 @@ @Test public void testQueryParserWilcardEquals() { - assumeTrueSearchEngineCanRunTest(); // wildcard - WikittyQuery query1 = WikittyQueryParser.parse("Product.name=Lanfeust"); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult());

1 0

r1420 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Feb. 4, 2012

Feb. 4, 2012

Author: bpoussin Date: 2012-02-04 13:19:52 +0100 (Sat, 04 Feb 2012) New Revision: 1420 Url: http://nuiton.org/repositories/revision/wikitty/1420 Log: passage de la classe de constante en interface et utilisation dans le search engine solr Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-02-04 12:17:17 UTC (rev 1419) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-02-04 12:19:52 UTC (rev 1420) @@ -25,8 +25,7 @@ package org.nuiton.wikitty.storage.solr; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.*; - +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -34,7 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Set; - +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery; @@ -47,36 +47,32 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.storage.WikittyExtensionStorage; -import org.nuiton.wikitty.storage.WikittySearchEngine; -import org.nuiton.wikitty.services.WikittyTransaction; - -import java.io.File; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementField; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.query.FacetQuery; import org.nuiton.wikitty.query.FacetTopic; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; -import org.nuiton.wikitty.entities.Element; -import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.conditions.Select; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyTransaction; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; +import org.nuiton.wikitty.storage.WikittySearchEngine; import org.nuiton.wikitty.storage.WikittySearchEngineHelper; /** @@ -87,7 +83,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittySearchEngineSolr implements WikittySearchEngine { +public class WikittySearchEngineSolr implements WikittySearchEngine, WikittySolrConstant { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2012-02-04 12:17:17 UTC (rev 1419) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2012-02-04 12:19:52 UTC (rev 1420) @@ -37,7 +37,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittySolrConstant { +public interface WikittySolrConstant { /** Precise the query parser to use, is allow leading wildcard */ static final public String SOLR_QUERY_PARSER = "{!wikitty}";

1 0

r1419 - in trunk: . wikitty-api wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-api/src/test/java/org/nuiton/wikitty wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Feb. 4, 2012

Feb. 4, 2012

Author: bpoussin Date: 2012-02-04 13:17:17 +0100 (Sat, 04 Feb 2012) New Revision: 1419 Url: http://nuiton.org/repositories/revision/wikitty/1419 Log: amelioration de l'implementation in memory pour faire passer plus de test - sorted result - sorted facet Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-04 01:32:53 UTC (rev 1418) +++ trunk/pom.xml 2012-02-04 12:17:17 UTC (rev 1419) @@ -65,6 +65,7 @@ <nuitonProcessessorVersion>1.2.2</nuitonProcessessorVersion> <nuiton-struts2>1.3</nuiton-struts2> + <cxf.version>2.5.1</cxf.version>  <locales>fr,en</locales> @@ -73,8 +74,14 @@ <dependencyManagement> <dependencies> -  <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>11.0</version> + </dependency> + +  + <dependency> <groupId>org.parboiled</groupId> <artifactId>parboiled-core</artifactId> <version>1.0.2</version> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-02-04 01:32:53 UTC (rev 1418) +++ trunk/wikitty-api/pom.xml 2012-02-04 12:17:17 UTC (rev 1419) @@ -17,7 +17,7 @@ <dependencies> -  +   <dependency> @@ -26,6 +26,11 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> +  <dependency> <groupId>org.parboiled</groupId> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 01:32:53 UTC (rev 1418) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 12:17:17 UTC (rev 1419) @@ -24,10 +24,13 @@ */ package org.nuiton.wikitty.storage; +import com.google.common.collect.Multiset; +import com.google.common.collect.TreeMultiset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Deque; import java.util.HashMap; import java.util.Iterator; @@ -38,10 +41,8 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.collections.Bag; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Factory; -import org.apache.commons.collections.bag.HashBag; import org.apache.commons.collections.map.LazyMap; import org.apache.commons.lang.ClassUtils; import org.apache.commons.lang3.StringUtils; @@ -49,11 +50,14 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.ElementExtension; +import org.nuiton.wikitty.entities.ElementId; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.query.FacetQuery; +import org.nuiton.wikitty.query.FacetSortType; import org.nuiton.wikitty.query.FacetTopic; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -64,8 +68,6 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.entities.ElementExtension; -import org.nuiton.wikitty.entities.ElementId; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.Greater; import org.nuiton.wikitty.query.conditions.GreaterOrEquals; @@ -131,11 +133,93 @@ return result; } + /** comparateur generic qui accept deux objets de meme type en argument */ + static public Comparator<Object> genericComparator = new Comparator<Object>() { + public int compare(Object v1, Object v2) { + if (v1 == null && v2 == null) { + return 0; + } else if (v1 == null) { + return -1; + } else if (v2 == null) { + return 1; + } + + if (v1 == v2 || v1.equals(v2)) { + return 0; + } + + if (v1 instanceof Collection) { + v1 = CollectionUtils.get(v1, 0); + } + if (v2 instanceof Collection) { + v2 = CollectionUtils.get(v2, 0); + } + Comparable c1; + Comparable c2; + if (v1 instanceof Comparable) { + c1 = (Comparable)v1; + } else { + return 0; // non comparable on retourne 0 + } + if (v2 instanceof Comparable) { + c2 = (Comparable)v2; + } else { + return 0; // non comparable on retourne 0 + } + + int result = c1.compareTo(c2); + return result; + } + }; + + static public class WikittyComparator implements Comparator<Wikitty> { + + protected List<org.nuiton.wikitty.entities.Element> asc; + protected List<org.nuiton.wikitty.entities.Element> desc; + + public WikittyComparator(List<org.nuiton.wikitty.entities.Element> asc, List<org.nuiton.wikitty.entities.Element> desc) { + this.asc = asc; + this.desc = desc; + } + + /** compare un champs de deux objets Wikitty */ + protected int compareValue(Wikitty o1, Wikitty o2, org.nuiton.wikitty.entities.Element e, boolean asc) { + Object v1 = o1.getFqField(e.getValue()); + Object v2 = o2.getFqField(e.getValue()); + + int result = genericComparator.compare(v1, v2); + if (!asc) { + result = result * -1; + } + return result; + } + + public int compare(Wikitty o1, Wikitty o2) { + int result = 0; + + for (org.nuiton.wikitty.entities.Element e : asc) { + result = compareValue(o1, o2, e, true); + if (result != 0) { + return result; + } + } + + for (org.nuiton.wikitty.entities.Element e : desc) { + result = compareValue(o1, o2, e, false); + if (result != 0) { + return result; + } + } + return result; + } + + } + static public class FacetPredicate { WikittyTransaction tx; WikittySearchEngine searchEngine; WikittyQuery query; - Map<String, Bag> topic; + Map<String, Multiset> topic; public FacetPredicate(WikittySearchEngine searchEngine, WikittyTransaction tx, WikittyQuery query) { @@ -145,7 +229,7 @@ topic = LazyMap.decorate(new HashMap(), new Factory() { public Object create() { - return new HashBag(); + return TreeMultiset.create(genericComparator); } }); @@ -155,17 +239,21 @@ Map<String, List<FacetTopic>> result = new HashMap<String, List<FacetTopic>>(); for (String facetName : topic.keySet()) { List<FacetTopic> list = new ArrayList<FacetTopic>(); - Bag b = topic.get(facetName); - for (Object topicName : b.uniqueSet()) { - int count = b.getCount(topicName); + Multiset b = topic.get(facetName); + for (Object topicName : b.elementSet()) { + int count = b.count(topicName); // pour ajouter le topic il faut un minimum indique dans la query if (count >= query.getFacetMinCount()) { FacetTopic ft = new FacetTopic(facetName, String.valueOf(topicName), count); list.add(ft); } } - // on tri les facets selon l'ordre demande ... - Collections.sort(list, query.getFacetSort().compartor); + + // on re-tri si besoin, sinon l'ordre par defaut est sur la valeur des topics + if (query.getFacetSort() == FacetSortType.count) { + Collections.sort(list, query.getFacetSort().compartor); + } + // ... et on en prend que le nombre demande if (list.size() > query.getFacetLimit()) { list = list.subList(0, query.getFacetLimit()); @@ -238,10 +326,19 @@ List<String> ids = new LinkedList<String>(); FacetPredicate facets = new FacetPredicate(this, transaction, query); + ArrayList<Wikitty> wikitties = + new ArrayList<Wikitty>(wikittyStorage.getWikitties().values()); + + // on tri les wikitties selon l'ordre demande ... + if (!query.getSortAscending().isEmpty() + || !query.getSortDescending().isEmpty() ) { + Collections.sort(wikitties, new WikittyComparator( + query.getSortAscending(), query.getSortDescending())); + } + int totalResult = 0; - for (Entry<String, Wikitty> entry : wikittyStorage.getWikitties().entrySet()) { - Wikitty w = entry.getValue(); - String id = entry.getKey(); + for (Wikitty w : wikitties) { + String id = w.getId(); Condition c = query.getCondition(); if (!w.isDeleted()) { if (checkRestriction(this, transaction, c, w)) { @@ -255,8 +352,6 @@ } } - // TODO poussin 20120106 faire le tri des resultats en fonction de ce qui est demande - result = new WikittyQueryResult<String>(query.getName(), first, totalResult, query.getCondition().toString(), facets.getFacets(), ids); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 01:32:53 UTC (rev 1418) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 12:17:17 UTC (rev 1419) @@ -331,7 +331,7 @@ } @Test - public void testSearchExtensionFacet() throws Exception { + public void testSearchExtensionFacetExplicitly() throws Exception { // essai de facettiser sur les extensions WikittyQuery query = new WikittyQueryMaker().keyword("*").end(); query.setFirst(0); @@ -345,6 +345,21 @@ Assert.assertNotNull(result.getFacets().get(Element.EXTENSION.getValue())); } + @Test + public void testSearchExtensionFacet() throws Exception { + // essai de facettiser sur les extensions + WikittyQuery query = new WikittyQueryMaker().keyword("*").end(); + query.setFirst(0); + query.setLimit(0); + query.setFacetField(Element.EXTENSION); + WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); + Assert.assertEquals(1, result.getFacetNames().size()); + //TODO echatellier 20120112 : revue this code + //Assert.assertNotNull(result.getFacets().get(Element.EXTENSION)); + // is more convenient, but wont work + Assert.assertNotNull(result.getFacets().get(Element.EXTENSION.getValue())); + } + /** * Test qu'une recherche fonctionne et que la même recherche apres * suppression ne trouve plus l'element. @@ -1497,8 +1512,6 @@ */ @Test public void testSearchWithSort2() { - assumeTrueSearchEngineCanRunTest(); // sorting - //Create ext sortable String sortableExtName = "sortable"; String numFieldName = "num"; @@ -1537,8 +1550,6 @@ */ @Test public void testSearchWithSortTestData() { - assumeTrueSearchEngineCanRunTest(); // sorting - WikittyQuery query1 = WikittyQueryParser.parse("Product.price <= 100"); query1.setSortDescending(Product.ELEMENT_FIELD_PRODUCT_PRICE); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); @@ -1647,8 +1658,6 @@ @Test public void testQueryMarkerSelectSortAndAggregate() throws Exception { - assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier (il manque le sort in memory) - WikittyExtension ext = new WikittyExtension("Test", "1.0", // version WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values @@ -1717,35 +1726,35 @@ } { WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end(); - WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); - Assert.assertEquals("10.0", result.peek()); + Assert.assertEquals(Double.valueOf(10), result.peek()); } { WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MAX).end() .addSortDescending(new ElementField("Test", "number")); - WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); - Assert.assertEquals("10.0", result.peek()); + Assert.assertEquals(Double.valueOf(10), result.peek()); } { WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end(); - WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); - Assert.assertEquals("-4.0", result.peek()); + Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.MIN).end() .addSortDescending(new ElementField("Test", "number")); - WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); - Assert.assertEquals("-4.0", result.peek()); + Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { WikittyQuery q = new WikittyQueryMaker().select("Test.number", Aggregate.SUM).end(); - WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); + WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); - Assert.assertEquals("12", result.peek()); + Assert.assertEquals(Double.valueOf(12), result.peek()); } } Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-02-04 01:32:53 UTC (rev 1418) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-02-04 12:17:17 UTC (rev 1419) @@ -752,7 +752,7 @@ // la facet sur les extensions est directement et convenablement // gere comme un champs - if (CollectionUtils.isNotEmpty(facetField)) { + if (isFacetExtension || CollectionUtils.isNotEmpty(facetField)) { for (FacetField facet : resp.getFacetFields()) { String facetName = elementModifier.convertToField(facet.getName()); List<FacetTopic> topics = new ArrayList<FacetTopic>();

1 0

r1418 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty main/java/org/nuiton/wikitty/entities main/java/org/nuiton/wikitty/query main/java/org/nuiton/wikitty/storage test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Feb. 4, 2012

Feb. 4, 2012

Author: bpoussin Date: 2012-02-04 02:32:53 +0100 (Sat, 04 Feb 2012) New Revision: 1418 Url: http://nuiton.org/repositories/revision/wikitty/1418 Log: amelioration de l'implementation in memory pour faire passer plus de test Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -29,6 +29,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.math.BigDecimal; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -1465,7 +1466,8 @@ result = new ArrayList<E>(objects.size()); for (Object o : objects) { BigDecimal v = WikittyUtil.toBigDecimal(o); - result.add((E)v); + Number n = toNumber(target, v); + result.add((E)n); } } else if (Date.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); @@ -1503,6 +1505,25 @@ return result; } + protected Number toNumber(Class target, BigDecimal v) { + Number result = v; + if (Byte.class.isAssignableFrom(target)) { + result = v.byteValue(); + } else if (Double.class.isAssignableFrom(target)) { + result = v.doubleValue(); + } else if (Float.class.isAssignableFrom(target)) { + result = v.floatValue(); + } else if (Integer.class.isAssignableFrom(target)) { + result = v.intValue(); + } else if (Long.class.isAssignableFrom(target)) { + result = v.longValue(); + } else if (Short.class.isAssignableFrom(target)) { + result = v.shortValue(); + } else if (BigInteger.class.isAssignableFrom(target)) { + result = v.toBigInteger(); + } + return result; + } /** * Convert e parameter to the wanted type and return it. * For business object transformation, if some Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -79,6 +79,10 @@ result = Element.NODE_PATH; } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { result = Element.NODE_DEPTH; + } else if (Element.ALL_FIELD.getValue().equalsIgnoreCase(v)) { + result = Element.ALL_FIELD; + } else if ("*".equalsIgnoreCase(v)) { + result = Element.ALL_FIELD; } else { result = new ElementField(v); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -286,7 +286,7 @@ * @see {@link ContainsAll} */ public WikittyQueryMaker containsAll(String element) { - return containsAll(new ElementField(element)); + return containsAll(Element.get(element)); } /** @@ -307,7 +307,7 @@ * @see {@link ContainsAll} */ public <E> WikittyQueryMaker containsAll(String fqfield, Collection<E> values) { - return containsAll(new ElementField(fqfield), values); + return containsAll(Element.get(fqfield), values); } /** @@ -362,7 +362,7 @@ * @see {@link ContainsOne} */ public WikittyQueryMaker containsOne(String element) { - return containsOne(new ElementField(element)); + return containsOne(Element.get(element)); } /** @@ -380,7 +380,7 @@ * @see {@link ContainsOne} */ public <E> WikittyQueryMaker containsOne(String fqfield, Collection<E> values) { - return containsOne(new ElementField(fqfield), values); + return containsOne(Element.get(fqfield), values); } /** @@ -443,7 +443,7 @@ * @see {@link Equals} */ public WikittyQueryMaker eq(String fqfield, Object value) { - return eq(new ElementField(fqfield), value); + return eq(Element.get(fqfield), value); } /** @@ -476,7 +476,7 @@ * @see {@link Equals} */ public WikittyQueryMaker eqIgnoreCaseAndAccent(String fqfield, Object value) { - return eqIgnoreCaseAndAccent(new ElementField(fqfield), value); + return eqIgnoreCaseAndAccent(Element.get(fqfield), value); } /** @@ -557,7 +557,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker ne(String fqfield, Object value) { - return ne(new ElementField(fqfield), value); + return ne(Element.get(fqfield), value); } /** @@ -589,7 +589,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker neIgnoreCaseAndAccent(String fqfield, Object value) { - return neIgnoreCaseAndAccent(new ElementField(fqfield), value); + return neIgnoreCaseAndAccent(Element.get(fqfield), value); } /** @@ -647,7 +647,7 @@ * @see {@link Greater} */ public WikittyQueryMaker gt(String fqfield, Object value) { - return gt(new ElementField(fqfield), value); + return gt(Element.get(fqfield), value); } /** @@ -678,7 +678,7 @@ * @see {@link GreaterOrEquals} */ public WikittyQueryMaker ge(String fqfield, Object value) { - return ge(new ElementField(fqfield), value); + return ge(Element.get(fqfield), value); } /** @@ -709,7 +709,7 @@ * @see {@link Less} */ public WikittyQueryMaker lt(String fqfield, Object value) { - return lt(new ElementField(fqfield), value); + return lt(Element.get(fqfield), value); } /** @@ -740,7 +740,7 @@ * @see {@link LessOrEquals} */ public WikittyQueryMaker le(String fqfield, Object value) { - return le(new ElementField(fqfield), value); + return le(Element.get(fqfield), value); } /** @@ -773,7 +773,7 @@ * @see {@link Between} */ public WikittyQueryMaker bw(String fqfield, Object lowerValue, Object upperValue) { - return bw(new ElementField(fqfield), lowerValue, upperValue); + return bw(Element.get(fqfield), lowerValue, upperValue); } /** @@ -797,7 +797,7 @@ * @see {@link Equals} */ public WikittyQueryMaker sw(String fqfield, String value) { - return sw(new ElementField(fqfield), value); + return sw(Element.get(fqfield), value); } /** @@ -819,7 +819,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker notsw(String fqfield, String value) { - return notsw(new ElementField(fqfield), value); + return notsw(Element.get(fqfield), value); } /** @@ -841,7 +841,7 @@ * @see {@link Equals} */ public WikittyQueryMaker ew(String fqfield, Object value) { - return ew(new ElementField(fqfield), value); + return ew(Element.get(fqfield), value); } /** @@ -863,7 +863,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker notew(String fqfield, Object value) { - return notew(new ElementField(fqfield), value); + return notew(Element.get(fqfield), value); } /** @@ -915,7 +915,7 @@ * @see {@link Null} */ public WikittyQueryMaker isNull(String fqfield) { - return isNull(new ElementField(fqfield)); + return isNull(Element.get(fqfield)); } /** @@ -936,7 +936,7 @@ * @see {@link NotNull} */ public WikittyQueryMaker isNotNull(String fqfield) { - return isNotNull(new ElementField(fqfield)); + return isNotNull(Element.get(fqfield)); } /** @@ -993,7 +993,7 @@ * @see {@link Like} */ public WikittyQueryMaker like(String fqfield, Object value) { - return like(new ElementField(fqfield), value); + return like(Element.get(fqfield), value); } /** @@ -1024,7 +1024,7 @@ * @see {@link Unlike} */ public WikittyQueryMaker unlike(String fqfield, Object value) { - return unlike(new ElementField(fqfield), value); + return unlike(Element.get(fqfield), value); } /** @@ -1081,7 +1081,7 @@ * @see {@link Select} */ public WikittyQueryMaker select(String element) { - return select(new ElementField(element)); + return select(Element.get(element)); } /** @@ -1091,7 +1091,7 @@ * @see {@link Select} */ public WikittyQueryMaker select(String element, Aggregate aggregate) { - return select(new ElementField(element), aggregate); + return select(Element.get(element), aggregate); } /* @@ -1118,7 +1118,7 @@ // * @see {@link In} // */ // public WikittyQueryMaker in(String foreignFieldName) { -// return in(new ElementField(foreignFieldName)); +// return in(Element.get(foreignFieldName)); // } // // /* Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -189,11 +189,23 @@ // create facet field for (org.nuiton.wikitty.entities.Element e : query.getFacetField()) { - String fqf = e.getValue(); - Object value = w.getFqField(fqf); - if (value != null) { - topic.get(fqf).add(value); - result = true; + if (ElementExtension.EXTENSION.equals(e)) { + String facetName = ElementExtension.EXTENSION.getValue(); + for (String extName : w.getExtensionNames()) { + topic.get(facetName).add(extName); + result = true; + } + } else { + String fqf = e.getValue(); + Object value = w.getFqField(fqf); + if (value != null) { + if (value instanceof Collection) { + topic.get(fqf).addAll((Collection)value); + } else { + topic.get(fqf).add(value); + } + result = true; + } } } @@ -231,13 +243,15 @@ Wikitty w = entry.getValue(); String id = entry.getKey(); Condition c = query.getCondition(); - if (!w.isDeleted() && checkRestriction(this, transaction, c, w)) { - totalResult++; - if (totalResult > first && ids.size() < limit) { - // ajout en tant que resultat - ids.add(id); + if (!w.isDeleted()) { + if (checkRestriction(this, transaction, c, w)) { + totalResult++; + if (totalResult > first && ids.size() < limit) { + // ajout en tant que resultat + ids.add(id); + } + facets.add(w); } - facets.add(w); } } @@ -518,9 +532,7 @@ String exp = String.valueOf(i.next()); for (Object fieldValue : values) { String val = String.valueOf(fieldValue); - result = StringUtils.containsIgnoreCase( - StringUtils.stripAccents(val), - StringUtils.stripAccents(exp)); + result = matchString(val, exp, true); if (result) { // si une des valeurs correspond, on retourne true break; @@ -578,44 +590,17 @@ * @return true if sub match s */ static private boolean matchString(String s, String sub, boolean ignoreCaseAndAccent) { - boolean result; - if (sub.startsWith("*") && sub.endsWith("*")) { - sub = StringUtils.substring(sub, 1, -1); - if (ignoreCaseAndAccent) { - result = StringUtils.containsIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.contains(s, sub); - } - } else if (sub.startsWith("*")) { - sub = StringUtils.substring(sub, 1); - if (ignoreCaseAndAccent) { - result = StringUtils.endsWithIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.endsWith(s, sub); - } - } else if (sub.endsWith("*")) { - sub = StringUtils.substring(sub, 0, -1); - if (ignoreCaseAndAccent) { - result = StringUtils.startsWithIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.startsWith(s, sub); - } - } else { - if (ignoreCaseAndAccent) { - result = StringUtils.equalsIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.equals(s, sub); - } - } + if (ignoreCaseAndAccent) { + s = StringUtils.stripAccents(s); + s = s.toLowerCase(); + sub = StringUtils.stripAccents(sub); + sub = sub.toLowerCase(); + } + sub = sub.replaceAll("\\*", ".*"); + sub = sub.replaceAll("\\?", "."); + + boolean result = s.matches(sub); return result; } @@ -1081,7 +1066,7 @@ boolean result = false; result = check(KeywordPredicate, o.getElement(), - evalConditionValue(o.getValue())); + "*" + evalConditionValue(o.getValue()) + "*"); evalStack.push(result); return false; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -60,41 +60,28 @@ throw new WikittyException("Can't clone ?", eee); } String actualVersion = null; + Date deletionDate = null; Wikitty inMemoryWikitty = this.wikitties.get(wikitty.getId()); if (inMemoryWikitty != null) { actualVersion = inMemoryWikitty.getVersion(); + deletionDate = inMemoryWikitty.getDeleteDate(); } String requestedVersion = wikitty.getVersion(); String newVersion = null; if (force) { - if (actualVersion == null) { - //no version in place - if (requestedVersion == null) { - //no version requested - newVersion = WikittyUtil.DEFAULT_VERSION; - } else { - //version requested + // requestedVersion is never null + // versionGreaterThan support null for actualVersion + // and in this case return true + // see javadoc for more explanation + if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { newVersion = requestedVersion; - } - } else { - //version in place is not null - if (requestedVersion == null || requestedVersion.startsWith(WikittyUtil.DEFAULT_MAJOR_VERSION_PREFIX)) { - //no version requested - newVersion = WikittyUtil.incrementMajorRevision(actualVersion); - } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { - //same version - // wikitty is not modified, do nothing - continue; - } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { - //requested version is newer - newVersion = requestedVersion; } else { - //requested version is obsolete - throw new WikittyObsoleteException(String.format("Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); + // else take actualVersion as base version + newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } - } } else { - if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { + if (WikittyUtil.versionEquals(actualVersion, requestedVersion) + && deletionDate == null) { // no modification, continue continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -280,8 +280,6 @@ @Test public void testSearchByExampleFacet() throws Exception { - assumeTrueSearchEngineCanRunTest(); // facets - // create some wikitty Wikitty gf1Movie = new WikittyImpl(); gf1Movie.addExtension(MEDIA_EXTENSION); @@ -334,13 +332,11 @@ @Test public void testSearchExtensionFacet() throws Exception { - assumeTrueSearchEngineCanRunTest(); // facets - // essai de facettiser sur les extensions WikittyQuery query = new WikittyQueryMaker().keyword("*").end(); query.setFirst(0); query.setLimit(0); - query.addFacetField(Element.EXTENSION); + query.setFacetExtension(true); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); Assert.assertEquals(1, result.getFacetNames().size()); //TODO echatellier 20120112 : revue this code @@ -539,9 +535,6 @@ */ @Test public void testStorageVersionForce() { - // FIXME version force fails, but should work - assumeTrueSearchEngineCanRunTest(); // TODO - // store 1 Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); @@ -591,9 +584,6 @@ */ @Test public void testStoragePreviouslyDeleted() { - // FIXME echatellier 20120125 should work - assumeTrueSearchEngineCanRunTest(); - // store 1 Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); @@ -720,7 +710,6 @@ public void testFindQueryOnMovies() { // The Dark Knight Rises // Die hard 4 - assumeTrueSearchEngineCanRunTest(); // ? in regex WikittyQuery query = new WikittyQueryMaker().eq(MOVIE_EXTENSION_NAME + ".name", "*ar?*").end(); WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query); Assert.assertEquals(2, results.getAll().size()); @@ -774,7 +763,8 @@ assumeTrueSearchEngineCanRunTest(); // facets WikittyImportExportService ieService = new WikittyImportExportService(wikittyClient); - WikittyQuery query = new WikittyQueryMaker().eq(Element.EXTENSION, WikittyTreeNode.EXT_WIKITTYTREENODE).end(); + WikittyQuery query = new WikittyQueryMaker() + .eq(Element.EXTENSION, WikittyTreeNode.EXT_WIKITTYTREENODE).end(); String csvExport = ieService.syncExportAllByQuery(FORMAT.CSV, query); // extension definition is present in xml export @@ -933,8 +923,6 @@ */ @Test public void testQueryMakerEq() { - assumeTrueSearchEngineCanRunTest(); // ant like patterns - // test strict equals WikittyQuery query = new WikittyQueryMaker().eq(Product.ELEMENT_FIELD_PRODUCT_PRICE, 42).end(); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); @@ -963,8 +951,6 @@ */ @Test public void testQueryMakerEqFqf() { - assumeTrueSearchEngineCanRunTest(); // ant like patterns - // test strict equals WikittyQuery query = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_PRICE, 42).end(); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); @@ -993,9 +979,6 @@ */ @Test public void testQueryMakerNeq() { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // 22 wikitty in init // only one with price == 42 // test strict equals @@ -1136,9 +1119,6 @@ @Test public void testQueryMakerUnlike() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1149,9 +1129,6 @@ @Test public void testQueryParserUnlike() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1194,9 +1171,6 @@ @Test public void testQueryMakerNotsw() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1207,9 +1181,6 @@ @Test public void testQueryParserNotsw() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1220,9 +1191,6 @@ @Test public void testQueryMakerNotew() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -1 sorciers @@ -1233,9 +1201,6 @@ @Test public void testQueryParserNotew() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -1 sorciers @@ -1412,8 +1377,6 @@ @Test public void testSearchFacetSingleField() throws Exception { -// assumeTrueSearchEngineCanRunTest(); // facets - importBooks(); WikittyQuery query = new WikittyQueryMaker().exteq(Product.EXT_PRODUCT).end(); @@ -1432,7 +1395,7 @@ @Test public void testQueryMarkerWilcardEquals() { - assumeTrueSearchEngineCanRunTest(); // wildcard + assumeTrueSearchEngineCanRunTest(); // wildcards WikittyQuery query1 = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end(); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); @@ -1478,8 +1441,6 @@ @Test public void testQueryMakerLowerCaseSearch() { - assumeTrueSearchEngineCanRunTest(); // lower case - WikittyQuery query1 = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end(); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult()); @@ -1499,8 +1460,6 @@ @Test public void testQueryParserLowerCaseSearch() { - assumeTrueSearchEngineCanRunTest(); // lower case - WikittyQuery query1 = WikittyQueryParser.parse("Product.name=Lanfeust"); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult()); @@ -1523,8 +1482,6 @@ */ @Test public void testSearchWithSort1() { -// assumeTrueSearchEngineCanRunTest(); // sorting - // FIXME poussin 20120202 comment savoir que les objets sont bien trie ? // Il y a toute sorte d'extension avec *.name et on ne recupere que // les ID. @@ -1657,7 +1614,6 @@ */ @Test public void testPaginedSearchSelect() throws IOException { - assumeTrueSearchEngineCanRunTest(); // pagination importBooks(); // first @@ -1667,11 +1623,11 @@ query1.setSortAscending(Product.ELEMENT_FIELD_PRODUCT_PRICE); query1.setFirst(0); query1.setLimit(2); - WikittyQueryResult<String> results1 = wikittyClient.findAllByQuery(query1); + WikittyQueryResult<Double> results1 = wikittyClient.findAllByQuery(Double.class, query1); // 17 books, but only 11 differents prices ? Assert.assertEquals(11, results1.getTotalResult()); Assert.assertEquals(2, results1.getAll().size()); - Assert.assertEquals("13.0", results1.get(0)); + Assert.assertEquals(Double.valueOf(13), results1.get(0)); // second // FIXME echatellier 20120201 setLimit -1 us buggy @@ -1684,14 +1640,14 @@ // third query1.setFirst(0); query1.setLimit(0); - results1 = wikittyClient.findAllByQuery(query1); + results1 = wikittyClient.findAllByQuery(Double.class, query1); Assert.assertEquals(11, results1.getTotalResult()); Assert.assertEquals(0, results1.getAll().size()); } @Test public void testQueryMarkerSelectSortAndAggregate() throws Exception { - assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier + assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier (il manque le sort in memory) WikittyExtension ext = new WikittyExtension("Test", "1.0", // version @@ -1848,8 +1804,6 @@ @Test public void testQueryMakerEqOnGroup() throws Exception { - assumeTrueSearchEngineCanRunTest(); // regex - // for id for easy debugging WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); g1.setName("Group1"); @@ -1928,8 +1882,6 @@ @Test public void testQueryMarkerSelect() throws Exception { - assumeTrueSearchEngineCanRunTest(); // select not implemented ? - // for id for easy debugging WikittyImpl w = new WikittyImpl("g1"); WikittyGroupImpl g1 = new WikittyGroupImpl(w); @@ -2073,8 +2025,6 @@ */ @Test public void testSearchEngineFullTextSearch() { - assumeTrueSearchEngineCanRunTest(); // regex - // for id for easy debugging WikittyImpl w = new WikittyImpl("label"); WikittyLabelImpl l = new WikittyLabelImpl(w);

1 0

r1417 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Feb. 3, 2012

Feb. 3, 2012

Author: bpoussin Date: 2012-02-03 19:45:27 +0100 (Fri, 03 Feb 2012) New Revision: 1417 Url: http://nuiton.org/repositories/revision/wikitty/1417 Log: suppression de warning Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-03 18:31:47 UTC (rev 1416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-03 18:45:27 UTC (rev 1417) @@ -36,11 +36,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.addons.WikittyI18nTestUtil; import org.nuiton.wikitty.addons.WikittyI18nUtil; @@ -74,7 +72,6 @@ import org.nuiton.wikitty.test.CatalogNode; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; -import org.nuiton.wikitty.test.ProductImpl; /** * Wikitty client test to test for client use. @@ -103,7 +100,7 @@ w.addExtension(MOVIE_EXTENSION); String id = w.getId(); - w = wikittyClient.store(w); + wikittyClient.store(w); w = wikittyClient.restore(id); Assert.assertTrue(w.hasExtension(MOVIE_EXTENSION_NAME)); Assert.assertTrue(w.hasField(MOVIE_EXTENSION_NAME, "name")); @@ -220,7 +217,7 @@ public void testStorageRestoreSingle() throws Exception { Wikitty w = new WikittyImpl(); String id = w.getId(); - w = wikittyClient.store(w); + wikittyClient.store(w); w = wikittyClient.restore(id); Assert.assertEquals(id, w.getId()); } @@ -274,7 +271,7 @@ w2.addToField("TestConstraint", "ext", "tata"); // tata ne doit pas s'ajouter w2.addToField("TestConstraint", "ext", "toto"); - w2 = wikittyClient.store(w2); + wikittyClient.store(w2); Wikitty w3 = wikittyClient.restore(w.getId()); Set<String> set = new HashSet<String>(Arrays.asList("tata", "titi", "toto")); @@ -467,7 +464,7 @@ // leaf.addChild( subLeaf.getWikittyId() ); } } - wikittyNodes = wikittyClient.storeWikitty(wikittyNodes); // store treeNodes. + wikittyClient.storeWikitty(wikittyNodes); // store treeNodes. Wikitty dieHard = wikitties.get(0); Wikitty edgar = wikitties.get(1);

1 0

r1416 - trunk/src/site/rst/user
by bpoussin＠users.nuiton.org Feb. 3, 2012

Feb. 3, 2012

Author: bpoussin Date: 2012-02-03 19:31:47 +0100 (Fri, 03 Feb 2012) New Revision: 1416 Url: http://nuiton.org/repositories/revision/wikitty/1416 Log: update ~ et !~ documentation (eqIgnoreCaseAndAccent et neIgnoreCaseAndAccent) Modified: trunk/src/site/rst/user/query.rst Modified: trunk/src/site/rst/user/query.rst =================================================================== --- trunk/src/site/rst/user/query.rst 2012-02-03 18:29:27 UTC (rev 1415) +++ trunk/src/site/rst/user/query.rst 2012-02-03 18:31:47 UTC (rev 1416) @@ -123,6 +123,32 @@ WikittyQuery q = WikittyQueryParser.parse("User.lastname!=*ssin"); WikittyQuery q = WikittyQueryParser.parse("User.lastname!=*ssin"); +Egalité sans casse ni accent: eqIgnoreCaseAndAccent ++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Vérifie si un champ est égal a une valeur, si le champs est un +champs texte, il est possible d'ajouter des "*" en début et en fin de la +chaîne de recherche pour faire l'équivalent d'un startsWith ou endsWith. La +recherche est faite sans tenir compte de la casse ni des accents:: + + WikittyQuery q = new WikittyQueryMaker().eqIgnoreCaseAndAccent(User.ELEMENT_FIELD_USER_LASTNAME, "Poussin").end(); + WikittyQuery q = new WikittyQueryMaker().eqIgnoreCaseAndAccent(User.ELEMENT_FIELD_USER_LASTNAME, "*SSIN").end(); + + WikittyQuery q = WikittyQueryParser.parse("User.lastname~Poussin"); + WikittyQuery q = WikittyQueryParser.parse("User.lastname~*SSIN"); + +Non égalité sans casse ni accent: neIgnoreCaseAndAccent ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Vérifie si un champ n'est pas égal a une valeur. De la +même façon que le eqIgnoreCaseAndAccent, il est possible d'ajouter des '*'.:: + + WikittyQuery q = new WikittyQueryMaker().ne(User.ELEMENT_FIELD_USER_LASTNAME, "Poussin").end(); + WikittyQuery q = new WikittyQueryMaker().ne(User.ELEMENT_FIELD_USER_LASTNAME, "*SSIN").end(); + + WikittyQuery q = WikittyQueryParser.parse("User.lastname!~Poussin"); + WikittyQuery q = WikittyQueryParser.parse("User.lastname!~*SSIN"); + Contient un : containsOne +++++++++++++++++++++++++++

1 0

r1415 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query
by bpoussin＠users.nuiton.org Feb. 3, 2012

Feb. 3, 2012

Author: bpoussin Date: 2012-02-03 19:29:27 +0100 (Fri, 03 Feb 2012) New Revision: 1415 Url: http://nuiton.org/repositories/revision/wikitty/1415 Log: Anomalie #1928: Query limit set to MAX (or -1) won't work remplacement de -1 par Integer.MAX_VALUE Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-02-03 18:27:46 UTC (rev 1414) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-02-03 18:29:27 UTC (rev 1415) @@ -60,7 +60,7 @@ private static final long serialVersionUID = 1L; /** Use to not limit result. */ - static final public int MAX = -1; + static final public int MAX = Integer.MAX_VALUE; /** query name */ protected String name;

1 0