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

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 44c7e76675563b76d47a9cb70a255c47dbd3f3a2
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Fri Jul 10 23:39:22 2009 +0200

    opimd: make queries with _limit higher than amount of reslts working

diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index a2528c5..7d3d77e 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -90,6 +90,8 @@ class CallQueryMatcher(object):
 
             try:
                 limit = self.query_obj["_limit"]
+                if limit>len(kv_list):
+                    limit = len(kv_list)
             except KeyError:
                 limit = len(kv_list)
 
diff --git a/framework/subsystems/opimd/pimd_contacts.py b/framework/subsystems/opimd/pimd_contacts.py
index e98615e..045823d 100644
--- a/framework/subsystems/opimd/pimd_contacts.py
+++ b/framework/subsystems/opimd/pimd_contacts.py
@@ -86,6 +86,8 @@ class ContactQueryMatcher(object):
 
             try:
                 limit = self.query_obj["_limit"]
+                if limit>len(kv_list):
+                    limit = len(kv_list)
             except KeyError:
                 limit = len(kv_list)
 
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index 9940ee2..ae8d784 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -91,6 +91,8 @@ class MessageQueryMatcher(object):
 
             try:
                 limit = self.query_obj["_limit"]
+                if limit>len(kv_list):
+                    limit = len(kv_list)
             except KeyError:
                 limit = len(kv_list)
 

-- 
FSO frameworkd Debian packaging