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}";