From c113bca8699650a2fb602c2de58dd368b3213fc7 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 14 Dec 2021 12:16:02 +0100
Subject: [PATCH] Fix sorting

---
 djaosdb/caosdb_client.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/djaosdb/caosdb_client.py b/djaosdb/caosdb_client.py
index 0c5ce9d..02f6bd0 100644
--- a/djaosdb/caosdb_client.py
+++ b/djaosdb/caosdb_client.py
@@ -37,7 +37,7 @@ class CountResult(Result):
         return iter(self._results)
 
 def _sort_key(x, field):
-    return x[field] or ""
+    return str(x[field] or "")
 
 class FindResult(Result):
 
@@ -52,8 +52,9 @@ class FindResult(Result):
         if columns is not None:
             if sort:
                 fkey = list(sort)[0]
+                reverse = sort[fkey] < 0
                 named_columns = [dict(zip(columns, row)) for row in rows]
-                named_columns.sort(key=lambda x: _sort_key(x, fkey), reverse=sort[fkey] < 0)
+                named_columns.sort(key=lambda x: _sort_key(x, fkey), reverse=reverse)
                 self._results = named_columns[skip:upper]
             else:
                 self._results = []
-- 
GitLab