[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 8ed2b2861a4479d68b21113592bf32a1cffe77a3
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Mon Aug 31 20:48:36 2009 +0200

    opimd: fix possible incorrect query results when using _at_least_one mode

diff --git a/framework/subsystems/opimd/docs/TODO b/framework/subsystems/opimd/docs/TODO
index 5a57188..a94dd6c 100644
--- a/framework/subsystems/opimd/docs/TODO
+++ b/framework/subsystems/opimd/docs/TODO
@@ -1,11 +1,9 @@
 Near future:
-* Messages on GenericDomain
 * UnfinishedTasks
-* check if sorting works with merged entries
 In mean-time:
 * Initialized signal in source
 After that:
-* quering "Phone" should check also "Office phone"
+* quering "Phone" should check also "Office phone" etc.
 * finished inteligent queries (ContactDeleted, ConactUpdated)
 * updating with SIM-Messages-FSO
 * adding new fields to for example SIM entry (by merging)
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 75c6b85..9ede546 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -440,7 +440,10 @@ class GenericEntry():
 
             except KeyError:
                 # entry has no data for this field contained in the query, so this entry cannot match
-                return 0.0
+                if not atleast:
+                    return 0.0
+                else:
+                    field_match = 0.0
 
             # Aggregate the field match value into the overall match
             # We don't use the average of all field matches as one

-- 
FSO frameworkd Debian packaging