# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1437678351 -7200
# Node ID 77b77f48c975537d4115ce1171e831386206312d
# Parent  92549e4336a6bb220aa1d00fc2cf6cd2a91856c9
don't expect queries to specify all the fields

diff -r 92549e4336a6 -r 77b77f48c975 salut.py
--- a/salut.py	Mon Mar 30 10:30:54 2015 +0200
+++ b/salut.py	Thu Jul 23 21:05:51 2015 +0200
@@ -94,13 +94,18 @@
         try:
             query_elt = request.elements(NS_SEARCH, 'query').next()
             form_elt = query_elt.elements(data_form.NS_X_DATA, 'x').next()
+        except StopIteration:
+            raise ValueError # TODO: proper error handling
+        else:
             parsed_form = data_form.Form.fromElement(form_elt)
             for col in ('jid', 'description'):
-                value = parsed_form[col].strip()
-                if value:
-                    args[col] = value
-        except (StopIteration, KeyError):
-            raise ValueError # TODO: proper error handling
+                try:
+                    value = parsed_form[col].strip()
+                except KeyError:
+                    pass
+                else:
+                    if value:
+                        args[col] = value
 
         if args:
             query.append("WHERE")