# HG changeset patch
# User Sverre Rabbelier <sverre@rabbelier.nl>
# Date 1243289949 -7200
# Node ID 5a5e3d84b43e88c9a671836d0aeb76874f14896b
# Parent  0edff67b472d0a88164a6cfbd45e11f4874cf222# Parent  d830123c1be1440db47c58871ef0a717e5855212
Merged with Sverre

diff -r 0edff67b472d -r 5a5e3d84b43e app/soc/logic/models/base.py
--- a/app/soc/logic/models/base.py	Mon May 25 23:45:20 2009 +0200
+++ b/app/soc/logic/models/base.py	Tue May 26 00:19:09 2009 +0200
@@ -25,6 +25,8 @@
   ]
 
 
+import logging
+
 from google.appengine.ext import db
 
 from django.utils.translation import ugettext
@@ -324,7 +326,13 @@
 
     query = self.getQueryForFields(filter=filter, order=order)
 
-    result = query.fetch(limit, offset)
+    try:
+      result = query.fetch(limit, offset)
+    except db.NeedIndexError, exception:
+      result = []
+      logging.exception("%s, model: %s filter: %s, order: %s" % 
+                        (exception, self._model, filter, order))
+      # TODO: send email
 
     if unique:
       return result[0] if result else None