[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Daniele Ricci]

The following commit has been merged in the debian branch:
commit 3874799c48c177762f74364771d3caa8bb08386d
Author: Daniele Ricci <daniele.athome at gmail.com>
Date:   Fri Oct 15 14:24:57 2010 +0200

    PIM.Messages: added TotalCount attribute in QueryThreads
    
    Signed-off-by: Daniele Ricci <daniele.athome at gmail.com>

diff --git a/framework/subsystems/opimd/db_handler.py b/framework/subsystems/opimd/db_handler.py
index 701d679..4dd6007 100644
--- a/framework/subsystems/opimd/db_handler.py
+++ b/framework/subsystems/opimd/db_handler.py
@@ -359,8 +359,9 @@ class DbHandler(object):
         ids = map(lambda x: x[0], raw_result)
         if cursor:
             try:
-                skip_field = cursor.description[0][0]
-            except IndexError:
+                columns = map(lambda x: x[0], cursor.description)
+                skip_field = columns[0]
+            except:
                 skip_field = None
             other_fields = map(lambda x: dict_factory(cursor, x, skip_field), raw_result)
         else:
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index 1091803..e779192 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -133,6 +133,11 @@ class QueryManager(DBusFBObject):
         query['sql'] = """
 SELECT m.messages_id messages_id,
     (
+        SELECT count(*) FROM messages_phonenumber
+        WHERE field_name = 'Peer'
+        and value = p1.value
+    ) TotalCount,
+    (
         SELECT count(*) FROM
             messages_boolean b
             OUTER LEFT JOIN

-- 
FSO frameworkd Debian packaging