Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2010-04-18 16:24:23
|
Revision: 2288
http://openutils.svn.sourceforge.net/openutils/?rev=2288&view=rev
Author: fgiust
Date: 2010-04-18 16:24:17 +0000 (Sun, 18 Apr 2010)
Log Message:
-----------
number of total pages incorrectly rounded
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2010-04-08 12:28:36 UTC (rev 2287)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2010-04-18 16:24:17 UTC (rev 2288)
@@ -113,7 +113,8 @@
*/
public int getNumberOfPages()
{
- return itemsPerPage > 0 ? jcrQueryResult.getTotalSize() / itemsPerPage : 1;
+ return itemsPerPage > 0 ? (int) Math.round(Math
+ .ceil(((float) jcrQueryResult.getTotalSize() / (float) itemsPerPage))) : 1;
}
public ResultIterator<AdvancedResultItem> getItems()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-03-05 18:41:26
|
Revision: 3368
http://openutils.svn.sourceforge.net/openutils/?rev=3368&view=rev
Author: fgiust
Date: 2011-03-05 18:41:17 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
CRIT-35 Returning the total number of elements with getTotalSize() also when jackrabbit doesn't, when no paging is used
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 17:10:36 UTC (rev 3367)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-05 18:41:17 UTC (rev 3368)
@@ -115,6 +115,17 @@
*/
public int getTotalSize()
{
+ if (jcrQueryResult.getTotalSize() == -1 && itemsPerPage == 0)
+ {
+ try
+ {
+ return (int) jcrQueryResult.getNodes().getSize();
+ }
+ catch (RepositoryException e)
+ {
+ // ignore, the standard total size will be returned
+ }
+ }
return jcrQueryResult.getTotalSize();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fn...@us...> - 2011-03-08 10:07:18
|
Revision: 3375
http://openutils.svn.sourceforge.net/openutils/?rev=3375&view=rev
Author: fnecci
Date: 2011-03-08 10:07:11 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
CRIT-35 Little refactor
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 09:48:50 UTC (rev 3374)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-03-08 10:07:11 UTC (rev 3375)
@@ -194,8 +194,7 @@
@Override
public boolean hasNext()
{
- return super.getPosition() - offset < Math.min(super.getSize() - offset, itemsPerPage)
- && super.hasNext();
+ return super.getPosition() - offset < getSize() && super.hasNext();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-09-06 15:09:07
|
Revision: 3666
http://openutils.svn.sourceforge.net/openutils/?rev=3666&view=rev
Author: fgiust
Date: 2011-09-06 15:08:56 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
check size before skipping records
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-08-26 10:11:00 UTC (rev 3665)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-09-06 15:08:56 UTC (rev 3666)
@@ -220,7 +220,10 @@
}
// removing preceding records
- rows.skip(offset);
+ if (rows.getSize() >= offset)
+ {
+ rows.skip(offset);
+ }
// removing folllowing records and alter getSize()
return new AccessibleResultItemResultIterator(rows, this.hm)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-09-06 15:30:19
|
Revision: 3667
http://openutils.svn.sourceforge.net/openutils/?rev=3667&view=rev
Author: fgiust
Date: 2011-09-06 15:30:10 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
rows.getSize() may return -1, remove check
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-09-06 15:08:56 UTC (rev 3666)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-09-06 15:30:10 UTC (rev 3667)
@@ -219,11 +219,11 @@
offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
}
+ // rows.getSize() may return -1
+ // if (rows.getSize() >= offset)
+
// removing preceding records
- if (rows.getSize() >= offset)
- {
- rows.skip(offset);
- }
+ rows.skip(offset);
// removing folllowing records and alter getSize()
return new AccessibleResultItemResultIterator(rows, this.hm)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-09-16 16:35:33
|
Revision: 3669
http://openutils.svn.sourceforge.net/openutils/?rev=3669&view=rev
Author: carlocolombo
Date: 2011-09-16 16:35:27 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
[CRIT-44]handled only offset set in criteria
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-09-16 16:34:03 UTC (rev 3668)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-09-16 16:35:27 UTC (rev 3669)
@@ -211,7 +211,7 @@
throw jqe;
}
- if (applyLocalPaging && itemsPerPage > 0)
+ if ((applyLocalPaging && (itemsPerPage > 0 || offset > 0)))
{
if (offset == 0)
@@ -219,9 +219,6 @@
offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
}
- // rows.getSize() may return -1
- // if (rows.getSize() >= offset)
-
// removing preceding records
rows.skip(offset);
@@ -244,7 +241,7 @@
@Override
public long getSize()
{
- return Math.min(super.getSize() - offset, itemsPerPage);
+ return Math.min(super.getSize() - offset, itemsPerPage == 0 ? super.getSize() : itemsPerPage);
}
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X