Merge branch 'dev' into consortial-vufind-cache

build.xml

@@ -63,6 +63,8 @@
   <property name="test_theme" value="" /><!-- set to a theme name to override the default theme for Mink tests -->
   <property name="psql_needs_sudo" value="true" /><!-- set to false if psql (Postgresql) must be run with current user instead of sudo -->
   <property name="solr_pid_file" value="${localdir}/solr-${solr_port}.pid" />
+  <property name="marc_bib_dir" value="${srcdir}/tests/data" /><!-- directory containing MARC bib records for test environment -->
+  <property name="marc_authority_dir" value="${marc_bib_dir}/authority" /><!-- directory containing MARC authority records for test environment -->
 
   <property name="version" value="10.0" />
 
@@ -744,6 +746,7 @@
         <!-- avoid PHP Errors by creating each level separately -->
         <mkdir dir="${themedir}" />
         <mkdir dir="${themedir}/templates" />
+        <mkdir dir="${themedir}/templates/ajax" />
         <mkdir dir="${contentdir}" />
         <mkdir dir="${contentdir}/test" />
         <mkdir dir="${contentdir}/test/sub" />
@@ -754,6 +757,16 @@ return [
     'extends' =&gt; 'sandal',
 ];
 </echo>
+
+    <copy file="${srcdir}/themes/bootstrap3/templates/ajax/status-full.phtml" tofile="${themedir}/templates/ajax/status-full.phtml" overwrite="true" />
+    <!-- Add a script for testing that inline scripts work -->
+    <echo file="${themedir}/templates/ajax/status-full.phtml" append="true">
+&lt;div class="js-status-test hidden"&gt;&lt;/div&gt;
+&lt;script nonce="foo"&gt;
+  document.querySelector('.js-status-test').classList.remove('hidden');
+&lt;/script&gt;
+</echo>
+
     <echo file="${contentdir}/content.phtml">&lt;?php include $this-&gt;parentTemplate('content/content.phtml');?&gt;
 
 &lt;div class="content-footer"&gt;Content page footer&lt;/div&gt;
@@ -876,7 +889,7 @@ return [
   <!-- Import test biblio data -->
   <target name="import_biblios" description="import all biblio test records">
     <foreach param="relfilename" absparam="filename" target="importrec">
-      <fileset dir="${srcdir}/tests/data">
+      <fileset dir="${marc_bib_dir}">
           <include name="*.mrc" />
           <include name="*.xml" />
       </fileset>
@@ -885,11 +898,16 @@ return [
 
   <!-- Import test authority data -->
   <target name="import_authorities" description="import all authority test records">
-    <foreach param="relfilename" absparam="filename" target="importauthrec">
-      <fileset dir="${srcdir}/tests/data/authority">
-          <include name="*.mrc" />
-      </fileset>
-    </foreach>
+    <if>
+      <available file="${marc_authority_dir}" />
+      <then>
+        <foreach param="relfilename" absparam="filename" target="importauthrec">
+          <fileset dir="${marc_authority_dir}">
+              <include name="*.mrc" />
+          </fileset>
+        </foreach>
+      </then>
+    </if>
   </target>
 
   <!-- Delete some fake record IDs so we have deleted records to test with -->

config/vufind/EDS.ini

@@ -403,3 +403,19 @@ AU = None
 ; the LibGuides URLs if the same name is present here.
 ;url[Expensive Science Database] = https://some.url
 ;url[Cool Humanities Database] = https://another.url
+
+; This section controls how the authors of EDS records are displayed.
+[AuthorDisplay]
+; Control which data is used to display author information in search results.
+; - 'Short' (the default) is fetched from the RecordInfo section of a record (the
+;   'BibRecord/BibRelationships/HasContributorRelationships/*PersonEntity/Name/NameFull' data).
+;   Also, when you set 'ResultListFormat' to 'Short' you can change the default delimiter "; " between
+;   the author names by overriding the styles defined in the EDS.css file
+;   under: 'Author name delimiters'.
+; - 'Long' is fetched from the item 'Au' group data.
+ResultListFormat = 'Short'
+; This setting controls how many author names to display when ResultListFormat is
+; set to 'Short'. It is ignored if the setting is 'Long'. If a record has more author names
+; than you define in AuthorNameLimit, then VuFind will display the more_authors_abbrev text.
+; If undefined, the default value is 3.
+;ShortAuthorLimit = 3

config/vufind/Folio.ini

@@ -191,6 +191,10 @@ displayCourseCodes = false
 ; are excluded.
 includeSuppressed = false
 
+; If set to true, course reserves data will include courses from past terms;
+; otherwise, expired courses will be omitted.
+includeExpiredCourses = false
+
 [Availability]
 ; The Folio ILS driver needs to make several calls to obtain availability status.
 ; Indicate with showDueDate whether an additional call should be made to obtain the

config/vufind/KohaRest.ini

@@ -145,6 +145,32 @@ extraFields = item-issue:acceptTerms:pickUpLocation
 ;helpText[*] = "Help text for all languages."
 ;helpText[en-gb] = "Help text for British English localization."
 
+[Holdings]
+; This setting controls how the location field in the holdings/status results is populated.
+; It can either be Branch (Koha library branch/physical location) or Shelving (Koha
+; permanent shelving location of an item).
+; The default value is Branch.
+;locationField = Branch
+; If enabled, home library is displayed instead of holding library as item location.
+; Default is false.
+;useHomeLibrary = false
+; Whether to sort items by serial issue. Default is true.
+;sortBySerialIssue = true
+; Whether to include suspended holds in hold queue length calculation. Default is
+; false. Requires Koha REST DI plugin version 23.11.06 or later (earlier versions
+; included suspended holds by default).
+;includeSuspendedHoldsInQueueLength = false
+; This section allows libraries to define different custom itemLimit rules for 
+; different biblio-level item types.
+; In Koha the biblio-level item type is defined in the 942$c subfield.
+; Set 'itemLimit' to set a fallback value that will be used for any item types not given a more 
+; specific setting.
+; Set 'itemLimitByType' followed by a [] containing a string for the Koha biblio-level item type.
+; The string after the equal sign is the number of items to display in the holdings tab.
+; By default, all items are displayed in the holdings tab, unless a rule has been defined.
+;itemLimit = 10
+;itemLimitByType[J] = 3
+
 ; This section allows modification of the default mappings from item status codes to
 ; VuFind item statuses
 [ItemStatusMappings]

config/vufind/RecordDataFormatter.ini

@@ -24,7 +24,9 @@
 ; Example:
 ;core[] = "Extra"
 ;core[] = "MySpecialField"
-; to add the two fields "Extra" and "MySpecialField" to core. See below for the configuration.
+;core[] = "TextualHoldings"
+; to add the three fields "Extra", "MySpecialField" and "TextualHoldings" to core.
+; See below for the configuration.
 
 ; To change options on a specific field one has to add a section [Field_<field's name>].
 ; E.g. to enable ISBNs and to override the separator option use:
@@ -44,6 +46,10 @@
 ;pos = 1500
 ;renderType = "RecordDriverTemplate"
 ;template = "data-mySpecialField.phtml"
+;
+;[Field_TextualHoldings]
+;dataMethod = "getTextualHoldings"
+;pos = 2000
 
 ; If you want to apply some options to a specific context only you can use the overrideContext option.
 ; Add overrideContext[<context>] = <context options section> where <context> is either "collection-info",

config/vufind/authority.ini

@@ -3,6 +3,8 @@
 [General]
 default_handler      = AllFields    ; Search handler to use if none is specified
 default_sort         = relevance
+default_limit        = 20
+;limit_options        = 10,20,40,60,80,100
 case_sensitive_bools = true
 default_side_recommend[] = SideFacets:Facets:CheckboxFacets:authority
 ;default_record_fields = "*,score"

config/vufind/permissions.ini

@@ -18,36 +18,42 @@
 ; The values associated with these keys will be passed along to the services.
 ; You can define your own permission providers, or use some of the following:
 ;
-; ipRange     - Grant the permission to the single IP address or to the range.
-;               Accepts a single IP address or a range with a minus character without
-;               blanks as separator. Also partial addresses can be used (e.g. 192.168
-;               denotes 192.168.0.0-192.168.255.255) and IPv6 addresses are also
-;               supported (unless PHP is compiled with IPv6 disabled).
-; ipRegEx     - Grant the permission to IP addresses matching the provided regular
-;               expression(s). Accepts a string or an array; if an array is passed,
-;               permission will be granted if ANY one of the expressions matches.
-; role        - Grant the permission automatically to the role or roles specified
-;               (accepts a string or an array). Note that VuFind uses 'guest' for
-;               logged-out users and 'loggedin' for all logged-in users. You may
-;               define additional roles with custom code.
-; serverParam - Grant the permission if request server params match the given rules.
-;               Accepts a string or an array; if an array is passed permission will
-;               be granted if ALL of the rules match. Rules are specified as
-;               <server param name> [modifier] <value> [<value 2> ... <value n>]
-;               with optional modifier ~ (match instead of string comparison, values
-;               are treated as regular expressions), ! (not) or !~ (no match). Only
-;               one of the values must match (OR).
-; shibboleth  - Same as serverParam with support for Shibboleth multi-valued
-;               attributes (values separated by semicolons). The IdP entityId can be
-;               referenced with idpentityid. Please note that only checking the IdP
-;               entityId is dangerous (no authorization, anybody with a valid login
-;               gets the permission) so this should always be combined with a second
-;               rule that checks an attribute.
-; username    - Grant the permission to logged-in users whose usernames match the
-;               specified value(s). Accepts a string or an array.
-; user        - Grant the permissions to logged in users whose user attribute match
-;               the given regular expression pattern. For valid pattern syntax see
-;               http://php.net/manual/de/reference.pcre.pattern.syntax.php.
+; insecureCookie  - Grant the permissions to users who have the named cookie(s) set in
+;                   their browser. This can be easily spoofed by an end user, so it
+;                   should not be used to protect secure features; however, it may be
+;                   useful for setting flags to control unprotected behavior. If you use
+;                   the cookie consent option, also be sure to add any custom cookies you
+;                   create to CookieConsent.yaml so they are properly documented.
+; ipRange         - Grant the permission to the single IP address or to the range.
+;                   Accepts a single IP address or a range with a minus character without
+;                   blanks as separator. Also partial addresses can be used (e.g. 192.168
+;                   denotes 192.168.0.0-192.168.255.255) and IPv6 addresses are also
+;                   supported (unless PHP is compiled with IPv6 disabled).
+; ipRegEx         - Grant the permission to IP addresses matching the provided regular
+;                   expression(s). Accepts a string or an array; if an array is passed,
+;                   permission will be granted if ANY one of the expressions matches.
+; role            - Grant the permission automatically to the role or roles specified
+;                   (accepts a string or an array). Note that VuFind uses 'guest' for
+;                   logged-out users and 'loggedin' for all logged-in users. You may
+;                   define additional roles with custom code.
+; serverParam     - Grant the permission if request server params match the given rules.
+;                   Accepts a string or an array; if an array is passed permission will
+;                   be granted if ALL of the rules match. Rules are specified as
+;                   <server param name> [modifier] <value> [<value 2> ... <value n>]
+;                   with optional modifier ~ (match instead of string comparison, values
+;                   are treated as regular expressions), ! (not) or !~ (no match). Only
+;                   one of the values must match (OR).
+; shibboleth      - Same as serverParam with support for Shibboleth multi-valued
+;                   attributes (values separated by semicolons). The IdP entityId can be
+;                   referenced with idpentityid. Please note that only checking the IdP
+;                   entityId is dangerous (no authorization, anybody with a valid login
+;                   gets the permission) so this should always be combined with a second
+;                   rule that checks an attribute.
+; username        - Grant the permission to logged-in users whose usernames match the
+;                   specified value(s). Accepts a string or an array.
+; user            - Grant the permissions to logged in users whose user attribute match
+;                   the given regular expression pattern. For valid pattern syntax see
+;                   http://php.net/manual/de/reference.pcre.pattern.syntax.php.
 ;
 ; Example configuration (grants the "sample.permission" permission to users named
 ; admin1 or admin2, or anyone coming from the IP addresses 1.2.3.4 or 1.2.3.5):
@@ -59,6 +65,7 @@
 ; ipRegEx = "/1\.2\.3\.4|1\.2\.3\.5/"
 ; ipRange[] = "1.2.3.4"
 ; ipRange[] = "1.2.3.7-1.2.5.254"
+; insecureCookie = "VUFIND_CUSTOM_COOKIE_NAME"
 ; permission = sample.permission
 
 ; Example configuration (grants the "sample.permission" permission to users

config/vufind/sitemap.ini

@@ -106,12 +106,21 @@ baseSitemapUrl = false
 indexFileName  = sitemapIndex
 
 ; In addition to the generated sitemap files which contain the URLs for each
-;   record, the sitemap index file can reference a static sitemap file for other
+;   record, the sitemap index file can reference one or more static sitemaps for other
 ;   pages in your catalogue interface such as the Advanced Search, Browse, etc.
-;   In creating this sitemap, you can avail of the <priority /> element to indicate
+;
+; Each baseSitemapFileName[] entry can be in one of two possible formats: either a
+;   fully qualified URL (in which case it will be added to the sitemap without any
+;   validation) or a simple filename with no base URL or extension (in which case
+;   it will be associated with the baseSitemapUrl and given an .xml extension, and
+;   it will only be added to the sitemap index if it actually exists relative to
+;   fileLocation in the file system).
+;
+; In creating these sitemaps, you can avail of the <priority /> element to indicate
 ;   the priority of these URLs relative to the record URLs which have the default
 ;   priority of 0.5. baseSitemapFileName dictates the base name of this sitemap
-;   file.  Note that this file must actually exist in fileLocation in order for it
-;   to be added to the sitemap index!
+;   file.
+;
 ; You can comment out this setting if you do not want to use a base sitemap.
-baseSitemapFileName = baseSitemap
+baseSitemapFileName[] = baseSitemap
+;baseSitemapFileName[] = https://myuniversity.edu/fully-qualified-example-sitemap.xml

import/marc_local.properties

@@ -17,8 +17,10 @@
 #fullrecord = FullRecordAsXML
 
 # Uncomment the following lines to track history of indexing times for RSS feeds,
-# OAI-PMH server and other updates.  The parameter to these functions must be the
-# same fieldspec as the id setting above!
+# OAI-PMH server and other updates. The first parameter to these functions must
+# be the same fieldspec as the id setting above! You can optionally provide your
+# Solr index name as the second parameter if you are using a value other than the
+# default of "biblio".
 # IMPORTANT: Indexing this extra information will make extra database calls during
 #            the indexing process and will likely slow things down significantly.
 #first_indexed = custom, getFirstIndexed(001)

languages/ar.ini

@@ -126,6 +126,7 @@ Book = "كتاب"
 Book Bag = "سلة الكتب"
 Book Chapter = "فصل الكتاب"
 Book Cover = "غلاف الكتاب"
+bookbag_confirm_delete = "هل أنت متأكد من انك تريد حذف هذا؟"
 bookbag_confirm_empty = "هل أنت متأكد من أنك تريد إفراغ سلة كتبك؟"
 bookbag_delete = "حذف مواد سلة الكتب المحددة"
 bookbag_delete_selected = "حذف المحدد"

languages/bn.ini

@@ -127,6 +127,7 @@ Book = "গ্রন্থ"
 Book Bag = "গ্রন্থ সম্ভার"
 Book Chapter = "গ্রন্থের অধ্যায়"
 Book Cover = "গ্রন্থের প্রচ্ছদ"
+bookbag_confirm_delete = "আপনি কি এটা মুছে ফেলতে চান ?"
 bookbag_confirm_empty = "আপনি কি আপনার গ্রন্থ সম্ভার শূন্য রাখতে ইচ্ছুক?"
 bookbag_delete = "গ্রন্থ সম্ভার থেকে নির্বাচিত গ্রন্থ মুছে দিন"
 bookbag_delete_selected = "নির্বাচিত রেকর্ড মুছে দিন"

languages/ca.ini

@@ -137,6 +137,7 @@ Book = "Llibre"
 Book Bag = "Bossa de llibres"
 Book Chapter = "Capítol de llibre"
 Book Cover = "Portada"
+bookbag_confirm_delete = "Esteu segurs que el voleu eliminar?"
 bookbag_confirm_empty = "Esteu segur que voleu buidar el cistell de llibres?"
 bookbag_delete = "Eliminar els llibres seleccionats del cistell"
 bookbag_delete_selected = "Eliminar seleccionats"

languages/cs.ini

@@ -124,6 +124,7 @@ Book = "Kniha"
 Book Bag = "Košík"
 Book Chapter = "Kapitola"
 Book Cover = "Obálka"
+bookbag_confirm_delete = "Chcete je smazat?"
 bookbag_confirm_empty = "Jste si jistí, že chcete vyprázdnit košík?"
 bookbag_delete = "Odstranit vybrané položky"
 bookbag_delete_selected = "Odstranit vybrané"

languages/cy.ini

@@ -117,6 +117,7 @@ Book = "Llyfr"
 Book Bag = "Bag Llyfrau"
 Book Chapter = "Pennod Llyfr"
 Book Cover = "Clawr y Llyfr"
+bookbag_confirm_delete = "Ydych chi'n siŵr eich bod am ddileu hwn?"
 bookbag_confirm_empty = "Ydych chi'n siŵr eich bod am gwacau eich Bag Llyfrau?"
 bookbag_delete = "Dileu Eitemau Bag Llyfr a Ddetholwyd"
 bookbag_delete_selected = "Dileu Eitemau a Ddetholwyd"

languages/da.ini

@@ -87,6 +87,7 @@ Bibliography = "Bibliografi"
 Book = "Bog"
 Book Bag = "Bogkurv"
 Book Cover = "Bogomslag"
+bookbag_confirm_delete = "Er du sikker på at du ønsker at slette dette?"
 bookbag_confirm_empty = "Er du sikker på at du vil tømme din bogkurv?"
 bookbag_delete = "Slet valgte emner i bogkurven"
 bookbag_delete_selected = "Slet valgte"