Author: bpoussin Date: 2011-11-20 15:58:36 +0100 (Sun, 20 Nov 2011) New Revision: 1255 Url: http://nuiton.org/repositories/revision/wikitty/1255 Log: Evolution #1816: Add criteria name in PagedResult Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -64,6 +64,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 8518774558223121855L; + /** nom du critere qui a ete uitilise (peut-etre null) si le critete n'avait pas de nom */ + protected String criteriaName; /** indice element in global search result */ protected int firstIndice; /** total number of result if we call the query for all possible result */ @@ -92,8 +94,10 @@ * @param facets facet asked or null if no facet * @param results list of result in the wanted interval */ - public PagedResult(int firstIndice, int numFound, String queryString, + public PagedResult(String criteriaName, + int firstIndice, int numFound, String queryString, Map<String, List<FacetTopic>> facets, List<T> results) { + this.criteriaName = criteriaName; this.firstIndice = firstIndice; this.numFound = numFound; this.queryString = queryString; @@ -142,7 +146,7 @@ " wikitty String id but " + results.get(0).getClass()); } } - PagedResult<Wikitty> result = new PagedResult<Wikitty>( + PagedResult<Wikitty> result = new PagedResult<Wikitty>(criteriaName, firstIndice, numFound, queryString, facets, castedResult); return result; } @@ -212,11 +216,15 @@ } } } - PagedResult<E> result = new PagedResult<E>( + PagedResult<E> result = new PagedResult<E>(criteriaName, firstIndice, numFound, queryString, facets, castedResult); return result; } + public String getCriteriaName() { + return criteriaName; + } + public int getFirstIndice() { return firstIndice; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -331,6 +331,7 @@ } } + String criteriaName = resultWs.getCriteriaName(); int firstIndice = resultWs.getFirstIndice(); // FIXME le resultat est faux, le nombre total n'est pas la somme des deux :( int numFound = resultTx.getNumFound() + resultWs.getNumFound(); @@ -339,7 +340,7 @@ Map<String, List<FacetTopic>> facets = resultWs.getFacets(); List<String> results = new ArrayList<String>(ids); - result.add(new PagedResult<String>( + result.add(new PagedResult<String>(criteriaName, firstIndice, numFound, queryString, facets, results)); } 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 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -421,7 +421,8 @@ } } } - return new PagedResult<String>(firstIndex, ids.size(), criteria.getRestriction().toString(), null, ids); + return new PagedResult<String>(criteria.getName(), + firstIndex, ids.size(), criteria.getRestriction().toString(), null, ids); } @Override Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -521,7 +521,9 @@ } } } - result.add(new PagedResult<String>(firstIndex, ids.size(), + result.add(new PagedResult<String>( + cr.getName(), + firstIndex, ids.size(), restriction.toString(), null, ids)); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -355,6 +355,7 @@ // rebuild the result to match the expected criteria tempPagedResult = new PagedResult<String>( + currentCrit.getName(), currentCrit.getFirstIndex(), tempPagedResult.getNumFound(), currentCrit.toString(), @@ -407,6 +408,7 @@ // rebuilt the result PagedResult<String> tempPagedResult = new PagedResult<String>( + currentCrit.getName(), currentCrit.getFirstIndex(), number, currentCrit.toString(), currentResult.getFacets(), allresult); 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 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -804,7 +804,8 @@ // Build paged result PagedResult<String> result = new PagedResult<String>( - firstIndex, numFound, queryString, facets, ids); + criteria.getName(), + firstIndex, numFound, queryString, facets, ids); return result; } catch (SolrServerException eee) {