Author: laurent
Date: 2005-05-07 18:04:59 +0200 (Sat, 07 May 2005)
New Revision: 253
Modified:
trunk/nym3/Server/User.py
Log:
Bugfix in blobify, prepareSummary.
Modified: trunk/nym3/Server/User.py
===================================================================
--- trunk/nym3/Server/User.py 2005-05-07 15:22:51 UTC (rev 252)
+++ trunk/nym3/Server/User.py 2005-05-07 16:04:59 UTC (rev 253)
@@ -177,9 +177,9 @@
def blobify(self, l):
"""encrypts a set of synopses
l is a list of tuples (mid, status, synopsis) """
+ if len(l) == 0: return None
s = ""
m = []
- print str(l)
for mid, status, syn in l:
assert status == "clear"
assert len(mid) == 1
@@ -553,13 +553,12 @@
self.load_mbox()
# Prepare the midList.
midList = self.midAfter(after)[:num]
- print "midlist has size " + str(len(midList))
+ if len(midList) == 0: return []
ret = []
# Hold the clear syn
clearlist = []
nsyn = 0
while midList and (len(clearlist) + nsyn < num):
- print "Et hop, un tour de while."
# look for the synblob containing midList[0]
try:
i, u = self.getSyn(midList[0])
@@ -586,10 +585,10 @@
# Can we afford to add this blob?
if len(u[0]) + nsyn + len(clearlist) > num: continue
ret.append(bfprepare(u))
- #
- foo = self.blobify(clearlist)
- self.syn.append(foo)
- ret.append(bfprepare(foo))
+ if clearlist:
+ foo = self.blobify(clearlist)
+ self.syn.append(foo)
+ ret.append(bfprepare(foo))
return ret
if __name__ == '__main__':