[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 6ae1f6140711a2b9b7310f12e3633d7edeec72aa
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Wed Aug 26 15:32:43 2009 +0200

    opimd: place entries without field which is used for sorting always on end

diff --git a/framework/subsystems/opimd/query_manager.py b/framework/subsystems/opimd/query_manager.py
index 9f1862e..efe7ea1 100644
--- a/framework/subsystems/opimd/query_manager.py
+++ b/framework/subsystems/opimd/query_manager.py
@@ -96,10 +96,19 @@ class QueryMatcher(object):
                 reverse = False
             sortby = self.query_obj['_sortby']
 
-            def compare(element):
+            def compare(x,y):
+                if x and y == None:
+                    return 0
+                if x == None:
+                    return 1
+                if y == None:
+                    return -1
+                return cmp(x,y)
+
+            def getkey(element):
                 return entries[element][sortby]
 
-            results.sort(key=compare, reverse = reverse)
+            results.sort(key=getkey, cmp=compare, reverse = reverse)
 
         return results
 

-- 
FSO frameworkd Debian packaging