Merge b3774d8 into 43de61f

inveniosoftware · Nov 19, 2019 · 57016eb · 57016eb
2 parents 43de61f + b3774d8
commit 57016eb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,9 @@
 
 addons:
   postgresql: 9.4
+  apt:
+    packages:
+    - rabbitmq-server
 
 notifications:
   email: false

diff --git a/invenio_oaiserver/config.py b/invenio_oaiserver/config.py
@@ -114,7 +114,7 @@
 OAISERVER_QUERY_PARSER = 'elasticsearch_dsl:Q'
 """Define query parser for OIASet definition."""
 
-OAISERVER_QUERY_PARSER_FIELDS = None
+OAISERVER_QUERY_PARSER_FIELDS = []
 """Define query parser search fields list for OIASet definition."""
 
 OAISERVER_CACHE_KEY = 'DynamicOAISets::'

diff --git a/invenio_oaiserver/query.py b/invenio_oaiserver/query.py
@@ -25,7 +25,8 @@ def query_string_parser(search_pattern):
         if isinstance(query_parser, six.string_types):
             query_parser = import_string(query_parser)
         current_oaiserver.query_parser = query_parser
-    query_parser_fields = current_app.config['OAISERVER_QUERY_PARSER_FIELDS']
+    query_parser_fields = current_app.config.get(
+        'OAISERVER_QUERY_PARSER_FIELDS', {}) or {}
     if query_parser_fields:
         query_parser_fields = dict(fields=query_parser_fields)
     return current_oaiserver.query_parser(

diff --git a/setup.py b/setup.py
@@ -37,7 +37,7 @@
         'Flask-Admin>=1.3.0',
     ],
     'celery': [
-        'Flask-CeleryExt>=0.3.0',
+        'invenio-celery>=1.1.1',
     ],
     'docs': [
         'Sphinx>=1.6.7',