Merge bd34654 into 2a76d70

LibreCat · Apr 11, 2019 · d2fd162 · d2fd162
2 parents 2a76d70 + bd34654
commit d2fd162
Show file tree

Hide file tree

Showing 25 changed files with 798 additions and 790 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: perl
 
 perl:
@@ -12,17 +12,17 @@ cache:
     - perl_modules
     - es_download
 
-env: GEARMAN_NETWORK_TEST=1 NETWORK_TEST=0 CSL_TEST=1 DEVEL_COVER=0
+env: GEARMAN_NETWORK_TEST=1 NETWORK_TEST=0 THUMBNAIL_TEST=0 CSL_TEST=1 DEVEL_COVER=0 ES_VERSION=6.5.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 matrix:
   include:
     - perl: "5.28"
-      env: GEARMAN_NETWORK_TEST=1 NETWORK_TEST=0 CSL_TEST=1 DEVEL_COVER=0
+      env: GEARMAN_NETWORK_TEST=1 NETWORK_TEST=0 THUMBNAIL_TEST=0 CSL_TEST=1 DEVEL_COVER=1 ES_VERSION=6.5.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 
 before_install:
   - docker pull librecat/citeproc-node
   - docker run -d -p 8085:8085 librecat/citeproc-node
-  - test -e es_download/elasticsearch-* || wget -P es_download/ https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.5.deb
-  - sudo dpkg -i --force-confnew es_download/elasticsearch-1.7.5.deb && sudo service elasticsearch restart
+  - test -e es_download/elasticsearch-* || wget -P es_download/ ${ES_DOWNLOAD_URL}
+  - cd es_download && tar -xzf elasticsearch-${ES_VERSION}.tar.gz && ./elasticsearch-${ES_VERSION}/bin/elasticsearch &
   - sudo apt-get install --yes --force-yes gearman gearman-tools gearman-job-server libgearman-dev imagemagick ghostscript
   - cpanm local::lib
   - eval "$(perl -Mlocal::lib=${PWD}/perl_modules)"
@@ -32,6 +32,8 @@ after_install:
 
 before_script:
   - sleep 3
+  # cf. https://stackoverflow.com/questions/42928765/convertnot-authorized-aaaa-error-constitute-c-readimage-453
+  - sudo sed -i -e 's/<\/policymap>/  <policy domain="coder" rights="read|write" pattern="PDF"\/>\n  <policy domain="coder" rights="read|write" pattern="LABEL"\/>\n\/policymap>/g' /etc/ImageMagick-6/policy.xml
 
 service:
   - sqlite3

diff --git a/config/catmandu.local.yml-example b/config/catmandu.local.yml-example
@@ -35,36 +35,36 @@ default_person_sort:
 default_facets:
     open_access:
       terms:
-        fields: ['oa']
+        field: oa
         size: 1
     popular_science:
       terms:
-        field: 'popular_science'
+        field: popular_science
         size: 1
     extern:
       terms:
-        field: 'extern'
+        field: extern
         size: 2
     status:
       terms:
-        field: 'status'
+        field: status
         size: 8
     year:
       terms:
-        field: 'year'
-        size: 100
-        order: 'reverse_term'
+        field: year
+        size: 20
+        order: {_key: desc}
     type:
       terms:
-        field: 'type'
+        field: type
         size: 25
     isi:
       terms:
-        field: 'isi'
+        field: isi
         size: 1
     pmid:
       terms:
-        field: 'pmid'
+        field: pmid
         size: 1
 
 request_copy: