Author: bombe
Date: 2008-10-13 21:11:15 +0000 (Mon, 13 Oct 2008)
New Revision: 22984
Modified:
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Fix sorting by progress.
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-10-11
01:53:09 UTC (rev 22983)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-10-13
21:11:15 UTC (rev 22984)
@@ -617,7 +617,7 @@
}else if(sortBy.equals("size")){
result =
(firstRequest.getTotalBlocks() - secondRequest.getTotalBlocks()) < 0 ? -1 : 1;
}else if(sortBy.equals("progress")){
- result =
firstRequest.getSuccessFraction() - secondRequest.getSuccessFraction() < 0 ? -1
: 1;
+ result =
(firstRequest.getFetchedBlocks() / firstRequest.getMinBlocks() -
secondRequest.getFetchedBlocks() / secondRequest.getMinBlocks()) < 0 ? -1 : 1;
}else
isSet=false;
}else
