[Nym3-commit] r70 - trunk

nym3-devel@lists.noreply.org nym3-devel@lists.noreply.org
Wed, 04 Aug 2004 15:55:24 +0200


Author: laurent
Date: 2004-08-04 15:55:23 +0200 (Wed, 04 Aug 2004)
New Revision: 70

Modified:
   trunk/User.py
Log:
Correct midAfter to use oldestMid.


Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-04 13:37:29 UTC (rev 69)
+++ trunk/User.py	2004-08-04 13:55:23 UTC (rev 70)
@@ -65,20 +65,18 @@
 	"""Retrieve mids of messages that came after message `mid'
         the elements of the output are ordered by ascending
         order of arrival time"""
-        def aux(l,msg):
-            for i, e in enumerate(l):
-                if(self.index[msg][time] < self.index[e][time]):
-                    l.insert(i,msg)
-                    return l
-            l.append(msg)
+        def ourcmp(a, b):
+	    return cmp(self.index[a][time], self.index[b][time])
         
 	self.load_index()
 	midtime = self.index[mid][time]
 
 	ret = []
-	for msg in self.index.keys():
-	    if self.index[msg][time] >= midtime: aux(ret,msg)
-	return ret
+	if mid == oldestMid: ret = self.index.keys()
+	else:
+	    for msg in self.index.keys():
+		if self.index[msg][time] >= midtime: ret.append(msg)
+	ret.sort(ourcmp)
     
     def save_data(self):
 	self.lock()