Author: bpoussin Date: 2012-03-07 19:17:46 +0100 (Wed, 07 Mar 2012) New Revision: 1445 Url: http://nuiton.org/repositories/revision/wikitty/1445 Log: rename WikittyQuery.first in WikittyQuery.offset this name is better and used in many database and other framework 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-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.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-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -68,7 +68,7 @@ protected Condition condition; /** First index to get result. */ - protected int first = 0; + protected int offset = 0; /** Number of result to retrieve. 100 by default. */ protected int limit = 100; @@ -133,7 +133,7 @@ } else if (ObjectUtils.equals(this.getClass(), o.getClass())) { WikittyQuery other = (WikittyQuery)o; result = ObjectUtils.equals(this.getName(), other.getName()) && - ObjectUtils.equals(this.getFirst(), other.getFirst()) && + ObjectUtils.equals(this.getOffset(), other.getOffset()) && ObjectUtils.equals(this.getLimit(), other.getLimit()) && ObjectUtils.equals(this.isFacetExtension(), other.isFacetExtension()) && ObjectUtils.equals(this.getFacetField(), other.getFacetField()) && @@ -192,12 +192,40 @@ return this; } + /** + * Indique le premier element retourne par la requete. Si la requete peut + * retourner 100 reponses, et qu'on fixe l'offset a 25 alors il n'y aura + * au maximume que 75 reponses retournees. + * @return + */ + public int getOffset() { + return offset; + } + + /** + * Indique le premier element retourne par la requete. Si la requete peut + * retourner 100 reponses, et qu'on fixe l'offset a 25 alors il n'y aura + * au maximume que 75 reponses retournees. + * @return + */ + public void setOffset(int offset) { + this.offset = offset; + } + + /** + * @deprecated since 3.5 use {@link #getOffset()} + */ + @Deprecated public int getFirst() { - return first; + return offset; } + /** + * @deprecated since 3.5 use {@link #setOffset(int)} + */ + @Deprecated public WikittyQuery setFirst(int first) { - this.first = first; + this.offset = first; 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-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -93,7 +93,7 @@ q.setFacetField(new ArrayList<Element>(o.getFacetField())); q.setFacetLimit(o.getFacetLimit()); q.setFacetMinCount(o.getFacetMinCount()); - q.setFirst(o.getFirst()); + q.setOffset(o.getOffset()); q.setLimit(o.getLimit()); q.setFacetSort(o.getFacetSort()); q.setName(o.getName()); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -789,7 +789,7 @@ if (!idSet.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, wikittyNodeId); - WikittyTreeNodeHelper.setParent(treeNode, null); + WikittyTreeNodeHelper.setParent(treeNode, (String)null); storedWikitties.add(treeNode); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -120,7 +120,7 @@ List<FacetTopic> topics = resultSelect.getFacets().get(select.getElement().getValue()); List<String> selectList = new ArrayList<String>(topics.size()); - if (query.getFirst() < topics.size()) { + if (query.getOffset() < topics.size()) { // il faut que le premier demande soit inferieur a la taille, // sinon on ne fait rien for (FacetTopic topic : topics) { @@ -137,10 +137,10 @@ } // on ne garde que ce qui est demande - if (query.getFirst() < topics.size()) { - int first = query.getFirst(); - int last = Math.min(topics.size(), query.getFirst() + query.getLimit()); - selectList = selectList.subList(first, last); + if (query.getOffset() < topics.size()) { + int offset = query.getOffset(); + int last = Math.min(topics.size(), query.getOffset() + query.getLimit()); + selectList = selectList.subList(offset, last); } // gestion des agregats 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-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -322,7 +322,7 @@ result = WikittySearchEngineHelper.findAllByQueryWithSelect( this, transaction, query); } else { - int first = query.getFirst(); + int offset = query.getOffset(); int limit = query.getLimit(); List<String> ids = new LinkedList<String>(); FacetPredicate facets = new FacetPredicate(this, transaction, query); @@ -344,7 +344,7 @@ if (!w.isDeleted()) { if (checkRestriction(this, transaction, c, w)) { totalResult++; - if (totalResult > first && ids.size() < limit) { + if (totalResult > offset && ids.size() < limit) { // ajout en tant que resultat ids.add(id); } @@ -354,7 +354,7 @@ } result = new WikittyQueryResult<String>(query.getName(), - first, totalResult, query.getCondition().toString(), facets.getFacets(), ids); + offset, totalResult, query.getCondition().toString(), facets.getFacets(), ids); } return result; } 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-03-06 19:00:56 UTC (rev 1444) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-03-07 18:17:46 UTC (rev 1445) @@ -671,15 +671,15 @@ SolrQuery querySolr = new SolrQuery(SOLR_QUERY_PARSER + queryString); // Add paged - int first = query.getFirst(); + int offset = query.getOffset(); int limit = query.getLimit(); if (limit == Integer.MAX_VALUE) { // WARNING It is necessary to substract 'start' otherwise, // there is a capacity overlow in solR - limit = Integer.MAX_VALUE - first; + limit = Integer.MAX_VALUE - offset; } - querySolr.setStart(first); + querySolr.setStart(offset); querySolr.setRows(limit); // Add sorting @@ -794,7 +794,7 @@ // Build paged result result = new WikittyQueryResult<String>( query.getName(), - first, numFound, queryString, facets, ids); + offset, numFound, queryString, facets, ids); } return result;