AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wait until we build the tree before sorting the threads, so we can have the most recently updated thread first

Browse Source
This commit is contained in:
jrandom
2005-11-11 05:10:38 +00:00
committed by zzz
parent 6de4673e9e
commit 4297edc88f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/syndie/java/src/net/i2p/syndie/ThreadNodeImpl.java
View File

@@ -75,6 +75,7 @@ class ThreadNodeImpl implements ThreadNode {
StringBuffer buf = new StringBuffer();
buf.append("<node><entry>").append(getEntry().toString()).append("</entry>\n");
buf.append("<tags>").append(getTags()).append("</tags>\n");
buf.append("<mostRecentPostDate>").append(getMostRecentPostDate()).append("</mostRecentPostDate>\n");
buf.append("<recursiveTags>").append(getRecursiveTags()).append("</recursiveTags>\n");
buf.append("<children>\n");
for (int i = 0; i < _children.size(); i++)

21
apps/syndie/java/src/net/i2p/syndie/WritableThreadIndex.java
View File

@@ -58,7 +58,6 @@ class WritableThreadIndex extends ThreadIndex {
HeaderReceiver rec = new HeaderReceiver();
Archive archive = BlogManager.instance().getArchive();
TreeSet roots = new TreeSet(new NewestNodeFirstComparator());
for (Iterator iter = nodes.keySet().iterator(); iter.hasNext(); ) {
BlogURI entry = (BlogURI)iter.next();
ThreadNodeImpl node = (ThreadNodeImpl)nodes.get(entry);
@@ -95,6 +94,20 @@ class WritableThreadIndex extends ThreadIndex {
}
node.summarizeThread();
}
// we do this in a second pass, since we need the data built by the
// summarizeThread() of a fully constructed tree
TreeSet roots = new TreeSet(new NewestNodeFirstComparator());
for (Iterator iter = nodes.keySet().iterator(); iter.hasNext(); ) {
BlogURI entry = (BlogURI)iter.next();
ThreadNode node = (ThreadNode)nodes.get(entry);
int depth = 0;
// climb the tree
while (node.getParent() != null)
node = node.getParent();
roots.add(node);
}
@@ -136,9 +149,11 @@ class WritableThreadIndex extends ThreadIndex {
public int compare(Object lhs, Object rhs) {
ThreadNodeImpl left = (ThreadNodeImpl)lhs;
ThreadNodeImpl right = (ThreadNodeImpl)rhs;
if (left.getEntry().getEntryId() > right.getEntry().getEntryId()) {
long l = left.getMostRecentPostDate();
long r = right.getMostRecentPostDate();
if (l > r) {
return -1;
} else if (left.getEntry().getEntryId() == right.getEntry().getEntryId()) {
} else if (l == r) {
return DataHelper.compareTo(left.getEntry().getKeyHash().getData(), right.getEntry().getKeyHash().getData());
} else {
return 1;