[Nym3-commit] r271 - trunk/nym3/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-05-28 23:29:06 +0200 (Sat, 28 May 2005)
New Revision: 271

Modified:
   trunk/nym3/Client/Main.py
Log:
correct bugs in build_index and Summarize


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-05-28 13:46:53 UTC (rev 270)
+++ trunk/nym3/Client/Main.py	2005-05-28 21:29:06 UTC (rev 271)
@@ -149,7 +149,7 @@
 	    #TODO remove the blob?
 	    #TODO if yes remove the following line
 	else:
-	    for mid in enumerate(midlist):
+	    for mid in midlist:
 		synlen = Message.strToIntBE(synset[20: 22])
 		syn = synset[22: 22 + synlen]
 		synset = synset[22 + synlen:]
@@ -188,8 +188,8 @@
 		continue
 	    try:
 		e2 = h[s[0]][s[1]]
-		if is_hex_mid(e2):
-		    l.append(2)
+		if len(e2) == Common.midLength:
+		    l.append(e2)
 		else:
 		    ui.display("%s: dereferenced value not a valid mid" % e)
 	    except KeyError:
@@ -372,10 +372,10 @@
 	if is_hex_mid(older):
 	    older = binascii.unhexlify(older)
 	else:
-	    idx = account.build_index(ui, config, account)
-	    l = decode_message_references([older], ['syn'], {'syn': idx})
+	    idx = build_index(ui, config, account)
+	    l = decode_message_references(ui, [older], ['syn'], {'syn': idx})
 	    if len(l) == 1:
-		older = binascii.unhexlify(l[0])
+		older = l[0]
 	    else:
 		#The passed reference didn't correspond to a valid mid, abort
 		ui.display('the reference passed did not correspond to a ' +