Merge branch 'dev' into combined-no-results-recommendations

maccabeelevine · Dec 21, 2023 · 483531f · 483531f
2 parents 5b19c83 + a0f7e1a
commit 483531f
Show file tree

Hide file tree

Showing 131 changed files with 1,268 additions and 158 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,9 @@
 module.exports = function(grunt) {
   const fs = require("fs");
 
+  // Load dart-sass
+  grunt.loadNpmTasks('grunt-dart-sass');
+
   // Local custom tasks
   if (fs.existsSync("./Gruntfile.local.js")) {
     require("./Gruntfile.local.js")(grunt);
@@ -16,6 +19,7 @@ module.exports = function(grunt) {
     // initialize search path with directory containing LESS file
     var retVal = [];
     retVal.push(parts.join('/'));
+    retVal.push(parts.join('/') + '/vendor/');
 
     // Iterate through theme.config.php files collecting parent themes in search path:
     while (config = fs.readFileSync("themes/" + parts[1] + "/theme.config.php", "UTF-8")) {
@@ -39,6 +43,7 @@ module.exports = function(grunt) {
 
       parts[1] = matches[1];
       retVal.push(parts.join('/') + '/');
+      retVal.push(parts.join('/') + '/vendor/');
     }
     return retVal;
   }
@@ -72,15 +77,16 @@ module.exports = function(grunt) {
       }
     },
     // SASS compilation
-    scss: {
-      sass: {
+    'scss': {
+      'dart-sass': {
         options: {
           outputStyle: 'compressed',
+          quietDeps: true
         }
       }
     },
     'check:scss': {
-      sass: {
+      'dart-sass': {
       }
     },
 
@@ -207,13 +213,13 @@ module.exports = function(grunt) {
   });
 
   grunt.registerMultiTask('scss', function sassScan() {
-    grunt.config.set('sass', getSassConfig(this.data.options, false));
-    grunt.task.run('sass');
+    grunt.config.set('dart-sass', getSassConfig(this.data.options, false));
+    grunt.task.run('dart-sass');
   });
 
   grunt.registerMultiTask('check:scss', function sassCheck() {
-    grunt.config.set('sass', getSassConfig(this.data.options, true));
-    grunt.task.run('sass');
+    grunt.config.set('dart-sass', getSassConfig(this.data.options, true));
+    grunt.task.run('dart-sass');
   });
 
   grunt.registerTask('default', function help() {
@@ -240,9 +246,7 @@ module.exports = function(grunt) {
     for (var i in themeList) {
       if (Object.prototype.hasOwnProperty.call(themeList, i)) {
         var config = {
-          options: {
-            implementation: require("node-sass"),
-          },
+          options: {},
           files: [{
             expand: true,
             cwd: path.join('themes', themeList[i], 'scss'),
@@ -257,6 +261,8 @@ module.exports = function(grunt) {
           }
         }
         config.options.includePaths = getLoadPaths('themes/' + themeList[i] + '/scss/compiled.scss');
+        // This allows loading of styles from composer dependencies:
+        config.options.includePaths.push('vendor/');
 
         sassConfig[themeList[i]] = config;
       }

diff --git a/config/vufind/Primo.ini b/config/vufind/Primo.ini
@@ -15,12 +15,42 @@ case_sensitive_bools = true
 ; HTTP timeout
 timeout = 30
 
+; Primo API to use. Possible values are:
+;   legacy     Legacy brief search API (default, and the only option before VuFind 10)
+;   rest       REST API (less buggy, supports also boolean NOT and cites/cited by functions)
+;api = legacy
+
+; ONLY when `api = legacy` above:
 ; URL of the Primo server. For hosted services typically of the form
-; http://XYZ.hosted.exlibrisgroup.com:1701 where XYZ is the ID of the Primo
-; instance (e.g. primoapac01). Use http://mlplus.hosted.exlibrisgroup.com for
-; MetaLib Plus.
+; https://XYZ.hosted.exlibrisgroup.com where XYZ is the ID of the Primo
+; instance (e.g. primoapac01).
 ; You may also enter the full URL including a path to the brief search if necessary.
-url = "http://XYZ.hosted.exlibrisgroup.com:1701"
+;url = "https://XYZ.hosted.exlibrisgroup.com"
+
+; ONLY when `api = rest` above:
+; Search URL of the Primo server. For hosted services typically of the form
+; https://api-XY.hosted.exlibrisgroup.com/primo/v1/search?vid=...&tab=...&scope=...&apikey=...
+; where XY is the region ID of the Primo instance (na, eu, ap, ca or cn). The URL
+; should also contain scope, vid, tab etc. as well.
+; See https://developers.exlibrisgroup.com/primo/apis/docs/primoSearch/R0VUIC9wcmltby92MS9zZWFyY2g=/
+; for more information.
+; {{INSTCODE}} in the URL is replaced with the institution code determined by the
+; rules in the [Institutions] section.
+;search_url = "https://api-XY.hosted.exlibrisgroup.com/primo/v1/search?vid={{INSTCODE}}&tab=default_tab&scope=default_scope&apikey=<apikey>"
+; On-premises example:
+;search_url = "https://onpremises-primo-host/primo_library/libweb/webservices/rest/primo-explore/v1/pnxs?vid={{INSTCODE}}&tab={{INSTCODE}}&scope=CDI&inst={{INSTCODE}}"
+
+; ONLY when `api = rest` above:
+; JWT URL of the Primo server. For hosted services typically of the form
+; https://api-XY.hosted.exlibrisgroup.com/primo/v1/jwt/<institution_code>?lang=en_US&vid=<view_code>
+; where XY is the region ID of the Primo instance (na, eu, ap, ca or cn).
+; {{INSTCODE}} in the URL is replaced with the institution code determined by the
+; rules in the [Institutions] section.
+; N.B. For hosted Primo you can probably leave jwt_url unspecified or empty, and
+; include the apikey parameter in search_url setting.
+;jwt_url = "https://api-na.hosted.exlibrisgroup.com/primo/v1/jwt/{{INSTCODE}}?lang=en_US&vid={{INSTCODE}}&apikey=<apikey>"
+; On-premises example:
+;jwt_url = "https://onpremises-primo-host/primo_library/libweb/webservices/rest/v1/guestJwt/{{INSTCODE}}?lang=en_US&vid={{INSTCODE}}"
 
 ; This section controls the result limit options for search results. default_limit
 ; sets the default number of results per page. limit_options is a comma-separated
@@ -99,7 +129,8 @@ dateRange[] = creationdate
 [Facets]
 tlevel  = "Limit To"
 rtype   = "Format"
-creator = "Author"
+; creator does not work with CDI, but could be usable with a local Primo index
+;creator = "Author"
 jtitle  = "Journal Title"
 topic   = Subjects
 creationdate = "Year of Publication"
@@ -240,7 +271,7 @@ stitle = sort_title
 ;pattern[] = .* ; E.g. uncomment this line to allow any value
 
 ; This section specifies permission rules which may be used to determine the
-; institution code and access level for the current user when retrieving Primo
+; view code and access level for the current user when retrieving Primo
 ; results. institutionCode is evaluated first, then onCampusRule, with
 ; defaultCode used only when no more specific rule is matched.
 ; Please note that these settings are only applied for certain keys; they are

diff --git a/languages/ar.ini b/languages/ar.ini
@@ -1384,7 +1384,7 @@ total_saved_items = "إجمالي المواد المحفوظة"
 total_tags = "إجمالي الوسوم"
 total_users = "إجمالي المستخدمين"
 Transliterated Title = "عنوان ترانسليتريتد"
-tree_search_limit_reached_html = 'لقد أعاد بحثك نتائج أكثر من اللازم لعرضها في الشجرة. عرض المواد الأولى <b>%%limit%%</b> فقط. للبحث الكامل قم بالنقر على <a id="fullSearchLink" href="%%url%%" target="_blank">هنا.</a>'
+tree_search_limit_reached_html = "لقد أعاد بحثك نتائج أكثر من اللازم لعرضها في الشجرة. عرض المواد الأولى <b>%%limit%%</b> فقط."
 trending_items_channel_title = "مواد رائجة"
 unique_tags = "وسوم متفردة"
 University Library = "مكتبة الجامعة"

diff --git a/languages/bn.ini b/languages/bn.ini
@@ -1385,7 +1385,7 @@ total_saved_items = "মোট সংরক্ষিত উপাদানগু
 total_tags = "মোট ট্যাগ"
 total_users = "মোট ব্যবহারকারী"
 Transliterated Title = "বর্ণান্তরিত আখ্যা"
-tree_search_limit_reached_html = 'আপনার অনুসন্ধানের ফলাফল অনেক বেশি, তাই তা রেখাচিত্রের আকারে প্রদর্শিত। Showing only the first <b>%%limit%%</b> items. For a full search click <a id="fullSearchLink" href="%%url%%" target="_blank">here.</a>'
+tree_search_limit_reached_html = "আপনার অনুসন্ধানের ফলাফল অনেক বেশি, তাই তা রেখাচিত্রের আকারে প্রদর্শিত। Showing only the first <b>%%limit%%</b> items."
 trending_items_channel_title = "প্রলেখ চাহিদা ধারা"
 unique_tags = "স্বতন্ত্র ট্যাগ"
 University Library = "বিশ্ববিদ্যালয় গ্রন্থাগার"

diff --git a/languages/ca.ini b/languages/ca.ini
@@ -1395,7 +1395,7 @@ total_saved_items = "Registres total guardats"
 total_tags = "Etiquetes totals"
 total_users = "Usuaris totals"
 Transliterated Title = "Títol transliterat"
-tree_search_limit_reached_html = 'La seva cerca ha retornat massa registres per veure\'ls a l\'arbre de col·leccions. Veure els primers <b>%%limit%%</b> exemplars. Per una cerca completa cliqueu <a id="fullSearchLink" href="%%url%%" target="_blank">aquí.</a>'
+tree_search_limit_reached_html = "La seva cerca ha retornat massa registres per veure'ls a l'arbre de col·leccions. Veure els primers <b>%%limit%%</b> exemplars."
 trending_items_channel_title = "més populars"
 unique_tags = "Etiquetes úniques"
 University Library = "Biblioteca universitària"

diff --git a/languages/cs.ini b/languages/cs.ini
@@ -1382,7 +1382,7 @@ total_saved_items = "Celkem uložených položek"
 total_tags = "Celkem tagů"
 total_users = "Celkem uživatelů"
 Transliterated Title = "Transliterovaný název"
-tree_search_limit_reached_html = 'Na Váš dotaz bylo nalezeno příliš mnoho výsledků, proto je nebylo možné všechny zobrazit ve stromové struktuře. Bylo zobrazeno pouze prvních <b>%%limit%%</b> položek. Pro zobrazení všech výsledků klikněte <a id="fullSearchLink" href="%%url%%" target="_blank">zde.</a>'
+tree_search_limit_reached_html = "Na Váš dotaz bylo nalezeno příliš mnoho výsledků, proto je nebylo možné všechny zobrazit ve stromové struktuře. Bylo zobrazeno pouze prvních <b>%%limit%%</b> položek."
 trending_items_channel_title = "O co je teď zájem"
 unique_tags = "Unikátní tagy"
 University Library = "Univerzitní knihovna"

diff --git a/languages/cy.ini b/languages/cy.ini
@@ -1221,7 +1221,7 @@ total_saved_items = "Cyfanswm Eitemau wedi'u Cadw"
 total_tags = "Cyfanswm Tagiau"
 total_users = "Cyfanswm Defnyddwyr"
 Transliterated Title = "Teitl Wedi'i Drawslythrennu"
-tree_search_limit_reached_html = 'Roedd gormod o ganlyniadau i\'w dangos yn y goeden. Ond yn dangos y <b>%%limit%%</b> eitem gyntaf. I chwilio\'r cyfan, cliciwch <a id="fullSearchLink" href="%%url%%" target="_blank">yma.</a>'
+tree_search_limit_reached_html = "Roedd gormod o ganlyniadau i'w dangos yn y goeden. Ond yn dangos y <b>%%limit%%</b> eitem gyntaf."
 trending_items_channel_title = "Eitemau sy'n Trendio"
 unique_tags = "Tagiau Unigryw"
 University Library = "Llyfrgell y Brifysgol"

diff --git a/languages/de.ini b/languages/de.ini
@@ -1383,7 +1383,7 @@ total_saved_items = "Total gespeicherter Objekte"
 total_tags = "Total Tags"
 total_users = "Total Benutzer"
 Transliterated Title = "Transliterierter Titel"
-tree_search_limit_reached_html = 'Ihr Suche ergab zuviele Treffer, um die gesamte Hierarchie anzeigen zu können. Es werden nur the ersten <b>%%limit%%</b> Treffer angezeigt. Für eine vollständige Suche klicken Sie <a id="fullSearchLink" href="%%url%%" target="_blank">hier.</a>'
+tree_search_limit_reached_html = "Ihr Suche ergab zuviele Treffer, um die gesamte Hierarchie anzeigen zu können. Es werden nur the ersten <b>%%limit%%</b> Treffer angezeigt."
 trending_items_channel_title = "Beliebte Medien"
 unique_tags = "Einmalige Tags"
 University Library = "Universitätsbibliothek"

diff --git a/languages/el.ini b/languages/el.ini
@@ -1379,7 +1379,7 @@ total_saved_items = "Σύνολο αποθηκευμένων"
 total_tags = "Σύνολο ετικετών"
 total_users = "Σύνολο χρηστών"
 Transliterated Title = "Μεταγλωττισμένος Τίτλος"
-tree_search_limit_reached_html = "Η αναζήτηση επέστρεψε πάρα πολλά αποτελέσματα. Εμφανίζονται μόνο τα πρώτα <b>%%limit%%</b>. Δείτε όλα τα αποτελέσματα <a id"
+tree_search_limit_reached_html = "Η αναζήτηση επέστρεψε πάρα πολλά αποτελέσματα. Εμφανίζονται μόνο τα πρώτα <b>%%limit%%</b>."
 trending_items_channel_title = "Επίκαιρα τεκμήρια"
 unique_tags = "Μοναδικές ετικέτες"
 University Library = "Πανεπιστημιακή Βιβλιοθήκη"

diff --git a/languages/en.ini b/languages/en.ini
@@ -1388,7 +1388,7 @@ total_saved_items = "Total Saved Items"
 total_tags = "Total Tags"
 total_users = "Total Users"
 Transliterated Title = "Transliterated Title"
-tree_search_limit_reached_html = 'Your search returned too many results to display in the tree. Showing only the first <b>%%limit%%</b> items. For a full search click <a id="fullSearchLink" href="%%url%%" target="_blank">here.</a>'
+tree_search_limit_reached_html = "Your search returned too many results to display in the tree. Showing only the first <b>%%limit%%</b> items."
 trending_items_channel_title = "Trending Items"
 unique_tags = "Unique Tags"
 University Library = "University Library"

diff --git a/languages/es.ini b/languages/es.ini
@@ -1384,7 +1384,7 @@ total_saved_items = "Total de elementos guardados"
 total_tags = "Total de etiquetas"
 total_users = "Total de usuarios"
 Transliterated Title = "Título Transliterado"
-tree_search_limit_reached_html = 'Su búsqueda tiene muchos resultados para desplegar en el árbol. Mostrando solo los primeros <b>%%limit%%</b> elementos. Para una búsqueda completa clic <a id="fullSearchLink" href="%%url%%" target="_blank">aquí.</a>'
+tree_search_limit_reached_html = "Su búsqueda tiene muchos resultados para desplegar en el árbol. Mostrando solo los primeros <b>%%limit%%</b> elementos."
 trending_items_channel_title = "Itemes de tendencia"
 unique_tags = "Etiquetas únicas"
 University Library = "Biblioteca Universitaria"

diff --git a/languages/eu.ini b/languages/eu.ini
@@ -1709,7 +1709,7 @@ total_saved_items = "Gordetako elementuen guztizkoa"
 total_tags = "Etiketen guztizkoa"
 total_users = "Erabiltzaileen guztizkoa"
 Transliterated Title = "Titulu letraldatua"
-tree_search_limit_reached_html = 'Zure bilaketak aurkitu zituen erakusteko emaitza gehiegi. Erakusten dira bakarrik lehenengo <b>%%limit%%</b> items. Emaitza gehiago ikusteko, sakatu <a id="fullSearchLink" href="%%url%%" target="_blank">here.</a>'
+tree_search_limit_reached_html = "Zure bilaketak aurkitu zituen erakusteko emaitza gehiegi. Erakusten dira bakarrik lehenengo <b>%%limit%%</b> items."
 trending_items_channel_title = "Artikulu-Joerak"
 unique_tags = "Etiketa bakarrak"
 University Library = "Liburutegi unibertsitarioa"

diff --git a/languages/fi.ini b/languages/fi.ini
@@ -1382,7 +1382,7 @@ total_saved_items = "Tallennettuja tietueita yhteensä"
 total_tags = "Tageja yhteensä"
 total_users = "Käyttäjiä yhteensä"
 Transliterated Title = "Translitteroitu nimeke"
-tree_search_limit_reached_html = 'Hakusi tuotti liikaa tuloksia puussa näytettäväksi. Näytetään vain ensimmäiset <b>%%limit%%</b> kohdetta. Klikkaa <a id="fullSearchLink" href="%%url%%" target="_blank">tästä</a> nähdäksesi koko hakutuloksen.'
+tree_search_limit_reached_html = "Hakusi tuotti liikaa tuloksia puussa näytettäväksi. Näytetään vain ensimmäiset <b>%%limit%%</b> kohdetta."
 trending_items_channel_title = "Nousussa"
 unique_tags = "Yksilöllisiä tageja yhteensä"
 University Library = "Yliopiston kirjasto"

diff --git a/languages/fr.ini b/languages/fr.ini
@@ -1383,7 +1383,7 @@ total_saved_items = "Nombre total d'éléments sauvegardés"
 total_tags = "Nombre total de tags"
 total_users = "Nombre total d'utilisateurs"
 Transliterated Title = "Titre translittéré"
-tree_search_limit_reached_html = 'Trop de réponses pour l\'affichage arborescent. Seuls les <b>%%limit%%</b> premiers éléments sont affichés. Pour une recherche complète, cliquez <a id="fullSearchLink" href="%%url%%" target="_blank">ici.</a>'
+tree_search_limit_reached_html = "Trop de réponses pour l'affichage arborescent. Seuls les <b>%%limit%%</b> premiers éléments sont affichés."
 trending_items_channel_title = "Documents populaires"
 unique_tags = "Tags uniques"
 University Library = "Bibliothèque universitaire"