Author: kmorin Date: 2010-02-05 10:36:36 +0100 (Fri, 05 Feb 2010) New Revision: 377 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: - correction in the criteria copy in findAllByCriteria method in WikittyProxy : did not recreate the facets in the copy of the criteria Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-05 09:36:36 UTC (rev 377) @@ -255,6 +255,7 @@ public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { + System.out.println("facetField : " + criteria.getFacetField()); PagedResult<String> resultId = getSearchEngine().findAllByCriteria(criteria); PagedResult<Wikitty> result = resultId.cast(getWikittyStorage()); return result; Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-05 09:36:36 UTC (rev 377) @@ -204,7 +204,6 @@ */ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - // newInstance only return BusinessEntityWikittyImpl BusinessEntityWikitty sample = (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); @@ -217,6 +216,14 @@ Criteria serviceCriteria = search.criteria(criteria.getName()); serviceCriteria.setFirstIndex(criteria.getFirstIndex()); serviceCriteria.setEndIndex(criteria.getEndIndex()); + List<String> fieldFacets = criteria.getFacetField(); + if(fieldFacets != null) { + serviceCriteria.setFacetField(fieldFacets.toArray(new String[fieldFacets.size()])); + } + List<Criteria> criteriaFacets = criteria.getFacetCriteria(); + if(criteriaFacets != null) { + serviceCriteria.setFacetCriteria(criteriaFacets.toArray(new Criteria[criteriaFacets.size()])); + } PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(serviceCriteria); // we can cast with autoconvert true because we have add restriction Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-05 09:36:36 UTC (rev 377) @@ -384,7 +384,6 @@ public PagedResult<String> findAllByCriteria(Criteria criteria) { try { - // Create query with restriction String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString);