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

r1486 - trunk
by ymartel＠users.nuiton.org June 11, 2012

June 11, 2012

Author: ymartel Date: 2012-06-11 11:39:38 +0200 (Mon, 11 Jun 2012) New Revision: 1486 Url: http://nuiton.org/repositories/revision/wikitty/1486 Log: migrate to mavenpom 3.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-08 10:17:55 UTC (rev 1485) +++ trunk/pom.xml 2012-06-11 09:39:38 UTC (rev 1486) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.3.3</version> </parent>

1 0

r1485 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org June 8, 2012

June 8, 2012

Author: bpoussin Date: 2012-06-08 12:17:55 +0200 (Fri, 08 Jun 2012) New Revision: 1485 Url: http://nuiton.org/repositories/revision/wikitty/1485 Log: Anomalie #2131: Error in findTreeNode client method when Node depth + depth asked > Integer.MAX_VALUE Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.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-06-02 03:31:35 UTC (rev 1484) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-06-08 10:17:55 UTC (rev 1485) @@ -353,7 +353,7 @@ addTreeIndexField(solrResource, null, attachmentInTree); } catch (Exception eee) { - throw new WikittyException("Can't store wikitty", eee); + throw new WikittyException("Can't store wikitty " + wikitties, eee); } timeLog.log(startTime, "store", String.format( "nb %s in force mode %s", wikitties.size(), force)); @@ -819,7 +819,7 @@ * * @param transaction wikitty transaction * @param wikittyId l'objet root du resultat - * @param depth profondeur souhaite pour la recherche des fils + * @param depth profondeur souhaite pour la recherche des fils, ou -1 pour tous * @param count vrai si l'on souhaite avoir le nombre d'attachment associe * au noeud retourne * @param filter filtre utilise pour compter le nombre d'attachment @@ -841,7 +841,12 @@ .and().eq(TREENODE_PARENTS, wikittyId); if (depth >= 0) { Integer d = SolrUtil.getIntFieldValue(doc, TREENODE_DEPTH); - treeSearch = treeSearch.bw(TREENODE_DEPTH, d, d + depth); + depth = d + depth; + if (depth < 0) { + // debordement, on fixe la valeur a MAX_VALUE + depth = Integer.MAX_VALUE; + } + treeSearch = treeSearch.bw(TREENODE_DEPTH, d, depth); } WikittyQuery treeQuery = treeSearch.getQuery();

1 0

r1484 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org June 2, 2012

June 2, 2012

Author: bpoussin Date: 2012-06-02 05:31:35 +0200 (Sat, 02 Jun 2012) New Revision: 1484 Url: http://nuiton.org/repositories/revision/wikitty/1484 Log: si pas de resultat apres une recherche de noeud, il ne faut pas essayer de reconstruire l'arbre pour le retourner Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.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-06-02 03:07:04 UTC (rev 1483) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-06-02 03:31:35 UTC (rev 1484) @@ -1056,21 +1056,24 @@ WikittyQueryResultTreeNode<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); - RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); - resultId.acceptVisitor(retrieveIdVisitor); + WikittyQueryResultTreeNode<Wikitty> result = null; + if (resultId != null) { + RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); + resultId.acceptVisitor(retrieveIdVisitor); - List<String> ids = retrieveIdVisitor.getIds(); - List<Wikitty> wikitties = restore(ids); - - IdToObjectConverter<Wikitty> converter = - new IdToObjectConverter<Wikitty>(ids, wikitties); + List<String> ids = retrieveIdVisitor.getIds(); + List<Wikitty> wikitties = restore(ids); - ConvertTreeVisitor<Wikitty> convertVisitor = - new ConvertTreeVisitor<Wikitty>(converter); + IdToObjectConverter<Wikitty> converter = + new IdToObjectConverter<Wikitty>(ids, wikitties); - resultId.acceptVisitor(convertVisitor); + ConvertTreeVisitor<Wikitty> convertVisitor = + new ConvertTreeVisitor<Wikitty>(converter); - WikittyQueryResultTreeNode<Wikitty> result = convertVisitor.getTree(); + resultId.acceptVisitor(convertVisitor); + + result = convertVisitor.getTree(); + } timeLog.log(start, "findTreeNode<Wikitty>"); return result; } @@ -1099,21 +1102,24 @@ WikittyQueryResultTreeNode<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); - RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); - resultId.acceptVisitor(retrieveIdVisitor); + WikittyQueryResultTreeNode<E> result = null; + if (resultId != null) { + RetrieveIdVisitor retrieveIdVisitor = new RetrieveIdVisitor(); + resultId.acceptVisitor(retrieveIdVisitor); - List<String> ids = retrieveIdVisitor.getIds(); - List<E> wikitties = restore(clazz, ids); + List<String> ids = retrieveIdVisitor.getIds(); + List<E> wikitties = restore(clazz, ids); - IdToObjectConverter<E> converter = - new IdToObjectConverter<E>(ids, wikitties); + IdToObjectConverter<E> converter = + new IdToObjectConverter<E>(ids, wikitties); - ConvertTreeVisitor<E> convertVisitor = - new ConvertTreeVisitor<E>(converter); + ConvertTreeVisitor<E> convertVisitor = + new ConvertTreeVisitor<E>(converter); - resultId.acceptVisitor(convertVisitor); + resultId.acceptVisitor(convertVisitor); - WikittyQueryResultTreeNode<E> result = convertVisitor.getTree(); + result = convertVisitor.getTree(); + } timeLog.log(start, "findTreeNode"); return result; }

1 0

r1483 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org June 2, 2012

June 2, 2012

Author: bpoussin Date: 2012-06-02 05:07:04 +0200 (Sat, 02 Jun 2012) New Revision: 1483 Url: http://nuiton.org/repositories/revision/wikitty/1483 Log: if after conversion from object to wikitty id, id is blank then replace it by null Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-06-01 14:27:32 UTC (rev 1482) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-06-02 03:07:04 UTC (rev 1483) @@ -656,6 +656,12 @@ result = value.toString(); } } + + if (StringUtils.isBlank(result)) { + // id never can be empty or blank. If result is blank then result must be null + result = null; + } + return result; }

1 0

r1482 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by ymartel＠users.nuiton.org June 1, 2012

June 1, 2012

Author: ymartel Date: 2012-06-01 16:27:32 +0200 (Fri, 01 Jun 2012) New Revision: 1482 Url: http://nuiton.org/repositories/revision/wikitty/1482 Log: fixes #2123 can set a file for a Binary field Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-05-31 16:39:41 UTC (rev 1481) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-06-01 14:27:32 UTC (rev 1482) @@ -26,9 +26,12 @@ package org.nuiton.wikitty; import java.beans.PropertyDescriptor; +import java.io.File; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; + +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.WikittyExtension; @@ -507,6 +510,12 @@ // } } else if (value instanceof byte[]) { result = (byte[]) value; + } else if (value instanceof File) { + try { + result = FileUtils.readFileToByteArray((File) value); + } catch (IOException eee) { + throw new WikittyException("Unable to read the file " + value, eee); + } } else { result = value.toString().getBytes(); }

1 0

r1481 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 18:39:41 +0200 (Thu, 31 May 2012) New Revision: 1481 Url: http://nuiton.org/repositories/revision/wikitty/1481 Log: gestion du passage en argument de null Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.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-05-31 16:24:37 UTC (rev 1480) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-05-31 16:39:41 UTC (rev 1481) @@ -1356,8 +1356,10 @@ */ public Collection<WikittyExtension> restoreExtensionLastVersion(String[] extensionName) { long start = TimeLog.getTime(); - Collection<String> extName = new ArrayList<String>(extensionName.length); - extName.addAll(Arrays.asList(extensionName)); + Collection<String> extName = new ArrayList<String>(); + if (extensionName != null) { + extName.addAll(Arrays.asList(extensionName)); + } Collection<WikittyExtension> result = restoreExtensionLastVersion(extName);

1 0

r1480 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 18:24:37 +0200 (Thu, 31 May 2012) New Revision: 1480 Url: http://nuiton.org/repositories/revision/wikitty/1480 Log: add new method restoreExtensionLastVersion with collection or array in argument that restore only asked extension in last version Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.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-05-31 15:51:17 UTC (rev 1479) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-05-31 16:24:37 UTC (rev 1480) @@ -31,11 +31,13 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; @@ -43,6 +45,7 @@ import java.util.Set; import java.util.regex.Pattern; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; @@ -1313,14 +1316,14 @@ /** * Search extension with name in last version. - * + * * @param extensionName extension name * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtensionLastVersion(String extensionName) { long start = TimeLog.getTime(); WikittyExtension extension = wikittyService.restoreExtensionLastVersion(securityToken, extensionName); - + timeLog.log(start, "restoreExtensionLastVersion"); return extension; } @@ -1328,7 +1331,84 @@ /** * Search extension with name in last version. * + * @param extensionName extension name + * @return the corresponding object, exception if no such object found. + */ + public Collection<WikittyExtension> restoreExtensionLastVersion(String extensionName1, String extensionName2, String ... extensionName) { + long start = TimeLog.getTime(); + + Collection<String> extName = new ArrayList<String>(extensionName.length + 2); + extName.add(extensionName1); + extName.add(extensionName2); + extName.addAll(Arrays.asList(extensionName)); + + Collection<WikittyExtension> result = restoreExtensionLastVersion(extName); + + timeLog.log(start, "restoreExtensionLastVersion[...]"); + return result; + } + + /** + * Search extension with name in last version. + * + * @param extensionName extension name + * @return the corresponding object, exception if no such object found. + */ + public Collection<WikittyExtension> restoreExtensionLastVersion(String[] extensionName) { + long start = TimeLog.getTime(); + Collection<String> extName = new ArrayList<String>(extensionName.length); + extName.addAll(Arrays.asList(extensionName)); + + Collection<WikittyExtension> result = restoreExtensionLastVersion(extName); + + timeLog.log(start, "restoreExtensionLastVersion[]"); + return result; + } + + /** + * Search extension with name in last version. If extensionNames is null or + * empty, return all extension + * * @param extensionNames extension name + * @return the corresponding object, exception if no such object found. + */ + // TODO poussin 20120531 l'implantation de cette methode devrait etre fait cote serveur, mais + // cela implique de modifier la signature de tous les WikittyService, donc pour l'instant + // l'implantation est cote client + public Collection<WikittyExtension> restoreExtensionLastVersion(Collection<String> extensionNames) { + long start = TimeLog.getTime(); + + if (CollectionUtils.isEmpty(extensionNames)) { + // recuperation de toutes les extensions + extensionNames = new LinkedHashSet<String>(); + Collection<String> extIds = getAllExtensionIds(); + for (String id : extIds) { + String name = WikittyExtension.computeName(id); + extensionNames.add(name); + } + } + + Map<String, WikittyExtension> extensionMaps = new LinkedHashMap<String, WikittyExtension>(); + // chargement de la definition de toutes les extensions + List<WikittyExtension> exts = restoreExtensionAndDependenciesLastVesion(extensionNames); + for (WikittyExtension ext : exts) { + extensionMaps.put(ext.getName(), ext); + } + + // suppression des extensions non souhaitee + // le mieux serait d'avoir une method sur le client 'restoreExtensionLastVesion' + extensionMaps.keySet().retainAll(extensionNames); + + Collection<WikittyExtension> result = extensionMaps.values(); + + timeLog.log(start, "restoreExtensionLastVersion"); + return result; + } + + /** + * Search extension with name in last version. + * + * @param extensionNames extension name * @return extension wanted with dependencies extensions at head of list */ public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion(Collection<String> extensionNames) {

1 0

r1479 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 17:51:17 +0200 (Thu, 31 May 2012) New Revision: 1479 Url: http://nuiton.org/repositories/revision/wikitty/1479 Log: petit erreur sur les arbres Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.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-05-31 15:11:50 UTC (rev 1478) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-05-31 15:51:17 UTC (rev 1479) @@ -849,7 +849,7 @@ // et ses enfants jusqu'a la profondeur demandee // Create querySolr WikittyQueryVisitorToSolr v = new WikittyQueryVisitorToSolr( - transaction, this, elementModifier, filter.getWikittyFieldSearchDepth()); + transaction, this, elementModifier, 0); treeQuery.getCondition().accept(v); String queryString = v.getSolrQuery(); SolrQuery querySolr = new SolrQuery(SOLR_QUERY_PARSER + queryString);

1 0

r1478 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/query wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 17:11:50 +0200 (Thu, 31 May 2012) New Revision: 1478 Url: http://nuiton.org/repositories/revision/wikitty/1478 Log: Evolution #2121: add new query property wikittyFieldSearchDepth on query that permit to follow link between wikitty for search Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.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-05-31 15:03:05 UTC (rev 1477) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-05-31 15:11:50 UTC (rev 1478) @@ -101,6 +101,11 @@ /** Sort descending on fields. */ protected List<Element> sortDescending; + /** Profondeur de recherche sur les champs de type wikitty. Ce qui permet + de ne pas passer un id ou faire un select, mais directement passer une chaine. + Par defaut pas de recherche profonde, une valeur superieur a 1 est + dangereuse pour les performances. */ + protected int wikittyFieldSearchDepth = 0; /** create anonymous query */ public WikittyQuery() { @@ -143,7 +148,8 @@ ObjectUtils.equals(this.getFacetSort(), other.getFacetSort()) && ObjectUtils.equals(this.getFacetMinCount(), other.getFacetMinCount()) && ObjectUtils.equals(this.getFacetQuery(), other.getFacetQuery()) && - ObjectUtils.equals(this.getCondition(), other.getCondition()); + ObjectUtils.equals(this.getCondition(), other.getCondition()) && + ObjectUtils.equals(this.getWikittyFieldSearchDepth(), other.getWikittyFieldSearchDepth()); } else { result = false; } @@ -402,4 +408,13 @@ return this; } + public int getWikittyFieldSearchDepth() { + return wikittyFieldSearchDepth; + } + + public WikittyQuery setWikittyFieldSearchDepth(int wikittyFieldSearchDepth) { + this.wikittyFieldSearchDepth = wikittyFieldSearchDepth; + return this; + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java 2012-05-31 15:03:05 UTC (rev 1477) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java 2012-05-31 15:11:50 UTC (rev 1478) @@ -99,6 +99,7 @@ q.setName(o.getName()); q.setSortAscending(new ArrayList<Element>(o.getSortAscending())); q.setSortDescending(new ArrayList<Element>(o.getSortDescending())); + q.setWikittyFieldSearchDepth(o.getWikittyFieldSearchDepth()); for (FacetQuery c : o.getFacetQuery()) { WikittyQueryVisitorCopy v = new WikittyQueryVisitorCopy(); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2012-05-31 15:03:05 UTC (rev 1477) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2012-05-31 15:11:50 UTC (rev 1478) @@ -24,6 +24,11 @@ */ package org.nuiton.wikitty.storage.solr; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery; @@ -33,36 +38,11 @@ import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; -import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.entities.WikittyTypes; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.nuiton.util.TimeLog; -import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTypes; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SOLR_ID; -// FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_BINARY_MULTIVALUED; -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_BOOLEAN_MULTIVALUED; -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_DATE_MULTIVALUED; -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_NUMERIC_MULTIVALUED; -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_STRING_MULTIVALUED; -//import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_WIKITTY_MULTIVALUED; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.TREENODE_PARENTS; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.TREENODE_ATTACHED; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_BINARY; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_BOOLEAN; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_DATE; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_NUMERIC; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_STRING; -import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SUFFIX_WIKITTY; - /** * * @author poussin @@ -71,7 +51,7 @@ * Last update: $Date$ * by : $Author$ */ -public class SolrUtil { +public class SolrUtil implements WikittySolrConstant { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(SolrUtil.class); @@ -227,6 +207,10 @@ long numfound = result.getResults().getNumFound(); timeLog.log(start, "executeQuery", String.format( "nb result %s/%s query was '%s'", numGet, numfound, query)); + if (log.isDebugEnabled()) { + log.debug(String.format( + "nb result %s/%s query was '%s'", numGet, numfound, query)); + } return result; } Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-05-31 15:03:05 UTC (rev 1477) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-05-31 15:11:50 UTC (rev 1478) @@ -25,11 +25,18 @@ package org.nuiton.wikitty.storage.solr; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -42,6 +49,7 @@ import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.False; import org.nuiton.wikitty.query.conditions.Greater; @@ -84,16 +92,20 @@ protected ElementModifier elementModifier; protected String solrQuery = ""; + /** indique la profondeur de recherche en suivant les liens des champs de type wikitty */ + protected int wikittyFieldSearchDepth; public String getSolrQuery() { return solrQuery; } public WikittyQueryVisitorToSolr(WikittyTransaction tx, - WikittySearchEngineSolr solrServer, ElementModifier elementModifier) { + WikittySearchEngineSolr solrServer, ElementModifier elementModifier, + int wikittyFieldSearchDepth) { this.tx = tx; this.searchEngine = solrServer; this.elementModifier = elementModifier; + this.wikittyFieldSearchDepth = wikittyFieldSearchDepth; } /** @@ -219,6 +231,120 @@ return result; } + /** + * Si element2solr est de type Wikitty, alors on fait une recherche pour + * recuperer tous les ids des objets qui contiennent dans 1 de leur champs + * une valeur de l'argument values. + * + * La chaine retournee est (query OR element2solr:(valeur retournee par la recherche concatenee par de OR)) + * ou directement query si element2solr n'est pas de type Wikitty + * + * @param query la requete initial de l'utilisateur + * @param element2solr l'element sur lequel la requete est faite + * @param operator l'operateur pour concatener les sous requetes + * @param values les differentes valeurs a rechercher + * @return + */ + protected String deepSearchOnWikittyField(String query, String element2solr, String operator, Collection<String> values) { + if (log.isDebugEnabled()) { + log.debug("enter deepSearchOnWikittyField query: "+ query+ " element2solr:" + element2solr + " values:" + values); + } + if ( wikittyFieldSearchDepth > 0 ) { + // La recherche ce fait sur un champs de type wikitty, vu qu'on ne + // stocke que des id, si l'utilisateur passe autre chose, la recherche + // echouera. Ici on aide donc l'utilisateur en faisant pour lui + // la recherche sur les wikitties pour recuperer les ids qui pourraient + // convenir et faire la recherche sur ces ids + if (element2solr == null + || element2solr.endsWith(WikittySolrConstant.SUFFIX_WIKITTY) + || element2solr.startsWith(WikittySolrConstant.SOLR_ALL_EXTENSIONS) + || element2solr.startsWith(WikittySolrConstant.SOLR_FULLTEXT_ALL_EXTENSIONS) + ) { + + WikittyQuery sub = new WikittyQueryMaker() + .containsOne(Element.ALL_FIELD, values) + .end().setLimit(WikittyQuery.MAX) + .setWikittyFieldSearchDepth(wikittyFieldSearchDepth - 1); + // eval sub + WikittyQueryResult<String> subResult = + searchEngine.findAllByQuery(tx, sub); + + // si on a bien des resultat en plus on modifie la requete + if (subResult.size() > 0) { + query = "(" + query + " " + operator + " "; + // on ajoute les * car sinon pour la recherche fulltext + // solr modifie la requete et fini par retourne le monde + // entier lorsqu'on passe un id. Cela vient peut-etre de + // solr.WordDelimiterFilterFactory qui a un splitOnNumerics="1" + String subResultString = "*" + StringUtils.join(subResult, "* OR *") + "*"; + if (element2solr == null) { + query += "(" + subResultString + ")"; + } else { + query += element2solr + ":(" + subResultString + ")"; + } + query += ")"; + } + +// String subResult = ""; +// try { +// // on fait la recherhce le nombre de recursion demande +// Collection<String> currentValue = values; +// for (int i=0; i<wikittyFieldSearchDepth; i++) { +// System.out.println("## boucle " + i + " currentValue:" + currentValue); +// String queryString = ""; +// String sep = ""; +// for(String e : currentValue) { +// queryString += sep + e; +// sep = " OR "; +// } +// SolrQuery querySolr = new SolrQuery( +// WikittySolrConstant.SOLR_QUERY_PARSER + queryString); +// QueryResponse resp = SolrUtil.executeQuery( +// searchEngine.getSolrServer(), querySolr); +// SolrDocumentList solrResults = resp.getResults(); +// // Extract ids +// currentValue = new LinkedList<String>(); +// for (SolrDocument doc : solrResults) { +// String id = SolrUtil.getStringFieldValue(doc, WikittySolrConstant.SOLR_ID); +// currentValue.add(id); +// } +// } +// // a la suite de la derniere recursion on transforme en requete texte +// String sep = ""; +// for (String id : currentValue) { +// subResult += sep + "*" + escape2solr(id) + "*"; +// sep = " OR "; +// } +// +// } catch (Exception eee) { +// log.info("Can't make deep search on wikitty field, continue without", eee); +// } +// +// // si on a bien des resultat en plus on modifie la requete +// if (StringUtils.isNotBlank(subResult)) { +// query = "(" + query + " " + operator + " "; +// if (element2solr == null) { +// query += "(" + subResult + ")"; +// } else { +// query += element2solr + ":(" + subResult + ")"; +// } +// query += ")"; +// } + } + } + if(log.isDebugEnabled()) { + log.debug("exit deepSearchOnWikittyField query: "+ query); + } + return query; + } + /** + * + * @see {@link #deepSearchOnWikittyField(java.lang.String, java.lang.String, java.util.Collection) } + */ + protected String deepSearchOnWikittyField(String query, String element2solr, String operateur, String value) { + return deepSearchOnWikittyField(query, element2solr, operateur, Collections.singleton(value)); + } + @Override public void visit(ConditionValueString o) { // do nothing @@ -355,13 +481,27 @@ } else { String element2solr = element2solr(o.getElement()); - solrQuery += element2solr + ":("; + + // query contient ce qu'il faut ajouter a solrQuery + // on pre-calcul au cas ou il y aurait d'autres traitements a faire + // (pour les champs de type wikitty) + String query = element2solr + ":("; String sep = ""; for(String e : values) { - solrQuery += sep + fixSolrBug(element2solr, e); + query += sep + fixSolrBug(element2solr, e); sep = " OR "; } - solrQuery += ")"; + query += ")"; + + solrQuery += deepSearchOnWikittyField(query, element2solr, "OR", values); + +// solrQuery += element2solr + ":("; +// String sep = ""; +// for(String e : values) { +// solrQuery += sep + fixSolrBug(element2solr, e); +// sep = " OR "; +// } +// solrQuery += ")"; } return false; } @@ -390,7 +530,10 @@ value = fixSolrBug(element2solr, value); - solrQuery += element2solr + ":" + value; + String query = element2solr + ":" + value; + solrQuery += deepSearchOnWikittyField(query, element2solr, "OR", value); + +// solrQuery += element2solr + ":" + value; return false; } @@ -413,7 +556,9 @@ value= fixSolrBug(element2solr, value); - solrQuery += "-" + element2solr + ":" + value; + String query = "-" + element2solr + ":" + value; + solrQuery += deepSearchOnWikittyField(query, element2solr, "AND NOT", value); +// solrQuery += "-" + element2solr + ":" + value; return false; } @@ -463,7 +608,9 @@ // pour keyword on ajout automatiquement les *, sinon il faut faire un like value = "*" + value + "*"; - solrQuery += value; + String query = value; + solrQuery += deepSearchOnWikittyField(query, null, "OR", value); +// solrQuery += value; return false; } @@ -515,7 +662,9 @@ value = fixSolrBug(element2solr, value); - solrQuery += element2solr + ":" + value; + String query = element2solr + ":" + value; + solrQuery += deepSearchOnWikittyField(query, element2solr, "OR", value); +// solrQuery += element2solr + ":" + value; return false; } @@ -534,8 +683,9 @@ } value = fixSolrBug(element2solr, value); - - solrQuery += "-" + element2solr + ":" + value; + String query = "-" + element2solr + ":" + value; + solrQuery += deepSearchOnWikittyField(query, element2solr, "AND NOT", value); +// solrQuery += "-" + element2solr + ":" + value; return false; } 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-05-31 15:03:05 UTC (rev 1477) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-05-31 15:11:50 UTC (rev 1478) @@ -59,7 +59,6 @@ import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.generator.WikittyTagValue; import org.nuiton.wikitty.query.FacetQuery; import org.nuiton.wikitty.query.FacetTopic; import org.nuiton.wikitty.query.WikittyQuery; @@ -90,6 +89,8 @@ final static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); final static private TimeLog timeLog = new TimeLog(WikittySearchEngineSolr.class); + protected ApplicationConfig config; + /** solr server */ protected SolrServer solrServer; @@ -117,6 +118,7 @@ // init system env solr.data.dir if (config != null) { + this.config = config; // choix du storage (file or Ram) String solrDirFactoryKey = WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); @@ -157,6 +159,14 @@ } } + public ApplicationConfig getConfig() { + return config; + } + + public SolrServer getSolrServer() { + return solrServer; + } + @Override public void clear(WikittyTransaction transaction) { try { @@ -665,7 +675,7 @@ // Create querySolr WikittyQueryVisitorToSolr v = new WikittyQueryVisitorToSolr( - transaction, this, elementModifier); + transaction, this, elementModifier, query.getWikittyFieldSearchDepth()); query.getCondition().accept(v); String queryString = v.getSolrQuery(); SolrQuery querySolr = new SolrQuery(SOLR_QUERY_PARSER + queryString); @@ -733,7 +743,7 @@ if (facetQuery != null) { for (FacetQuery facet : facetQuery) { v = new WikittyQueryVisitorToSolr( - transaction, this, elementModifier); + transaction, this, elementModifier, 0); // pas de recherche recursive sur les champs wikitty pour les facettes facet.getCondition().accept(v); String queryFacet = v.getSolrQuery(); facetQueryToName.put(queryFacet, facet.getName()); @@ -839,7 +849,7 @@ // et ses enfants jusqu'a la profondeur demandee // Create querySolr WikittyQueryVisitorToSolr v = new WikittyQueryVisitorToSolr( - transaction, this, elementModifier); + transaction, this, elementModifier, filter.getWikittyFieldSearchDepth()); treeQuery.getCondition().accept(v); String queryString = v.getSolrQuery(); SolrQuery querySolr = new SolrQuery(SOLR_QUERY_PARSER + queryString);

1 0

r1477 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query
by bpoussin＠users.nuiton.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 17:03:05 +0200 (Thu, 31 May 2012) New Revision: 1477 Url: http://nuiton.org/repositories/revision/wikitty/1477 Log: Evolution #2120: add extContainsOne method on WikittyQueryMaker Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 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-05-31 10:20:15 UTC (rev 1476) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-05-31 15:03:05 UTC (rev 1477) @@ -558,6 +558,29 @@ } /** + * Extension equals. + * + * Restrict search to wikitties that got one of the extensions in parameter. + * + * @param extensionNames list of the extension to restrict the results to + * @return {@code this} with the {@code exteq} restriction added. + * @see {@link ContainsAll} + */ + public WikittyQueryMaker extContainsOne(Collection<String> extensionNames) { + return containsOne(Element.EXTENSION, extensionNames); + } + + /** + * @see {@link ContainsOne} + */ + public WikittyQueryMaker extContainsOne(String ext1, String ... exts) { + List<String> l = new LinkedList<String>(); + l.add(ext1); + l.addAll(Arrays.asList(exts)); + return containsOne(Element.EXTENSION, l); + } + + /** * @see {@link NotEquals} */ public WikittyQueryMaker ne(Element element) {

1 0