From: Adriana Draghici <adriana008@gmail.com>
Date: Fri, 4 Dec 2009 12:20:06 +0000 (+0200)
Subject: Tribler - LogParser update
X-Git-Tag: getopt_long~227^2~2
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=ee877de038603d178ffcc4915236ccb9df06504e;p=cs-p2p-next.git

Tribler - LogParser update
---

diff --git a/log-parser/tribler/LogParser.py b/log-parser/tribler/LogParser.py
index 6347846..1c9aeed 100644
--- a/log-parser/tribler/LogParser.py
+++ b/log-parser/tribler/LogParser.py
@@ -15,7 +15,7 @@ import re
 # the names used by Tribler for the BitTorrent messages 
 msg_types = {"BT_REQUEST_SEND": "new_request", "BT_REQUEST_RECV": "REQUEST(", "BT_CHOKE": "CHOKE from", "BT_UNCHOKE": "UNCHOKE from",
             "BT_HAVE": "HAVE(", "BT_PIECE": "PIECE(", "BT_BITFIELD": "BITFIELD from", 
-            "BT_CANCEL": "sent cancel", "BT_INTERESTED": "INTERESTED from"} 
+            "BT_CANCEL": "sent cancel", "BT_INTERESTED": "INTERESTED"} 
 
 msg_db_code = {"BT_CHOKE" : 0, "BT_UNCHOKE": 1, "BT_INTERESTED": 2, "BT_NOT_INTERESTED": 3, 
             "BT_HAVE" : 4, "BT_BITFIELD": 5, "BT_REQUEST" : 6, "BT_PIECE": 7, "BT_CANCEL": 8}
@@ -290,6 +290,9 @@ def tribler_parse_line(line):
     if result != None:
            return result
     result = tribler_parse_cancel_msg(line)
+    if result != None:
+           return result
+    result = tribler_parse_interested_msg(line)
     return result;
 
 def tribler_parse_status_file(dbw, client_session_id, filename):