pyes -- 0.16

bibserver/dao.py

@@ -6,6 +6,7 @@
 import urllib
 from datetime import datetime
 import hashlib
+import logging
 
 import pyes
 from werkzeug import generate_password_hash, check_password_hash
@@ -14,6 +15,7 @@
 from bibserver.config import config
 import bibserver.util, bibserver.auth
 
+log = logging.getLogger(__name__)
 
 def make_id(data):
     '''Create a new id for data object based on a hash of the data representation

bibserver/search.py

@@ -97,7 +97,7 @@ def collections(self):
                 self.search_options['search_url'] = '/query/collection?'
                 self.search_options['facets'] = [{'field':'owner','size':100},{'field':'_created','size':100}]
                 self.search_options['result_display'] = [[{'pre':'<h3>','field':'label','post':'</h3>'}],[{'field':'description'}],[{'pre':'created by ','field':'owner'}]]
-                self.search_options['result_display'] = config['colls_result_display']
+                self.search_options['result_display'] = config['collections_result_display']
                 return render_template('collection/index.html', current_user=self.current_user, search_options=json.dumps(self.search_options), collection=None)
         elif len(self.parts) == 2:
             if self.parts[0] == "collections":

setup.py

@@ -5,10 +5,10 @@
     version = '0.0.1',
     packages = find_packages(),
     install_requires = [
-        "Flask==0.08",
+        "Flask==0.10",
         "Flask-Login",
         "Flask-WTF",
-        "pyes==0.20",
+        "pyes==0.16",
         "chardet",
         "requests",
     ],