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

build.xml

@@ -30,6 +30,7 @@
   <property name="vufinddbpass" value="vufindtestpass" />
   <property name="dbtype" value="mysql" /><!-- use pgsql for PostgreSQL -->
   <property name="mysqlhost" value="localhost" />
+  <property name="mysqlport" value="3306" />
   <property name="mysqlrootuser" value="root" />
   <property name="mysqlrootpass" value="password" />
   <property name="pgsqlhost" value="localhost" />
@@ -498,7 +499,7 @@
         <property name="db_connection_string" value="pgsql://${vufinddbuser}:${vufinddbpass}@${pgsqlhost}/${vufinddb}" />
       </then>
       <else>
-        <property name="db_connection_string" value="mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}/${vufinddb}" />
+        <property name="db_connection_string" value="mysql://${vufinddbuser}:${vufinddbpass}@${mysqlhost}:${mysqlport}/${vufinddb}" />
       </else>
     </if>
 
@@ -562,13 +563,13 @@
       </then>
       <else>
         <!-- build database -->
-        <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} drop ${vufinddb}" />
-        <exec command="mysqladmin -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} create ${vufinddb}" checkreturn="true" />
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;DROP USER '${vufinddbuser}'@'${mysqlhost}'&quot;" />
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;CREATE USER '${vufinddbuser}'@'${mysqlhost}' IDENTIFIED BY '${vufinddbpass}'&quot;" checkreturn="true" />
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;GRANT SELECT,INSERT,UPDATE,DELETE ON ${vufinddb}.* TO '${vufinddbuser}'@'${mysqlhost}' WITH GRANT OPTION&quot;" checkreturn="true" />
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;FLUSH PRIVILEGES&quot;" checkreturn="true" />
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -D ${vufinddb} &lt; ${srcdir}/module/VuFind/sql/mysql.sql" checkreturn="true" />
+        <exec command="mysqladmin -f -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} drop ${vufinddb}" />
+        <exec command="mysqladmin -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} create ${vufinddb}" checkreturn="true" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;DROP USER '${vufinddbuser}'@'%'&quot;" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;CREATE USER '${vufinddbuser}'@'%' IDENTIFIED BY '${vufinddbpass}'&quot;" checkreturn="true" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;GRANT SELECT,INSERT,UPDATE,DELETE ON ${vufinddb}.* TO '${vufinddbuser}'@'%' WITH GRANT OPTION&quot;" checkreturn="true" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;FLUSH PRIVILEGES&quot;" checkreturn="true" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -D ${vufinddb} &lt; ${srcdir}/module/VuFind/sql/mysql.sql" checkreturn="true" />
       </else>
     </if>
   </target>
@@ -654,8 +655,8 @@ ${git_status}
         <exec command="sudo su -c &quot;psql -c \&quot;DROP USER ${vufinddbuser};\&quot;&quot; ${pgsqlrootuser}" checkreturn="true" />
       </then>
       <else>
-        <exec command="mysql -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;DROP USER '${vufinddbuser}'@'${mysqlhost}'&quot;" />
-        <exec command="mysqladmin -f -h ${mysqlhost} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} drop ${vufinddb}" />
+        <exec command="mysql -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} -e &quot;DROP USER '${vufinddbuser}'@'%'&quot;" />
+        <exec command="mysqladmin -f -h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser} ${mysqlpwswitch}${mysqlrootpass} drop ${vufinddb}" />
       </else>
     </if>
 

config/vufind/Blender.ini

@@ -110,6 +110,9 @@ relevance = sort_relevance
 year = sort_year
 year asc = "sort_year asc"
 
+[HiddenSorting]
+;pattern[] = .*
+
 ; ---------- facets.ini settings ----------
 
 ; The order of display is as shown below

config/vufind/Demo.ini

@@ -26,6 +26,10 @@ ILLRequests = true
 ; more holdings to display. (Default = no limit)
 ;itemLimit = "10"
 
+; Probability percentage that an item displayed in the holdings tab will include
+; "bound-with" information. (Default = 25% chance)
+;boundWithProbability = 25
+
 ; Configuration for retrieving sample records
 [Records]
 ; Search backend to pull records from

config/vufind/EDS.ini

@@ -245,6 +245,13 @@ SU                  = Subject
 ; be dynamically loaded from the API.
 [Sorting]
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 ; This section controls the behavior of the EDSRecord module.
 [Record]
 ; Set this to true in order to enable "next" and "previous" links to navigate
@@ -368,6 +375,10 @@ AU = None
 ; Requires configuration in LibGuidesAPI.ini. 
 ;useLibGuides = true
 
+; Find database URLs by the LibGuides alternate names field in addition
+; to the primary name. Default is true. Requires useLibGuides = true. 
+;useLibGuidesAlternateNames = false
+
 ; Map of database name (matching EDS API 'DbLabel' value) to website URL.
 ; These databases are added to any retrieved from LibGuides, and override
 ; the LibGuides URLs if the same name is present here.

config/vufind/EIT.ini

@@ -66,6 +66,13 @@ relevance = sort_relevance
 date = sort_year
 date2 = "sort_year asc"
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 [Record]
 ; Set this to true in order to enable "next" and "previous" links to navigate
 ; through the current result set from within the record view.

config/vufind/Pazpar2.ini

@@ -39,6 +39,13 @@ max_query_time  = 60
 [Sorting]
 relevance   = sort_relevance
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 ; This section controls the behavior of the Pazpar2Record module.  See the
 ; [Record] section of the main config.ini for more detailed documentation.
 [Record]

config/vufind/Primo.ini

@@ -232,6 +232,13 @@ scdate = sort_year
 screator = sort_author
 stitle = sort_title
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;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
 ; results. institutionCode is evaluated first, then onCampusRule, with

config/vufind/Search2.ini

@@ -104,6 +104,9 @@ callnumber-sort = sort_callnumber
 author = sort_author
 title = sort_title
 
+[HiddenSorting]
+;pattern[] = .*
+
 [DefaultSortingByType]
 CallNumber = callnumber-sort
 WorkKeys = year

config/vufind/Summon.ini

@@ -317,6 +317,13 @@ relevance = sort_relevance
 PublicationDate:desc = sort_year
 PublicationDate:asc = "sort_year asc"
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 ; This section controls spell checking -- it can be disabled if desired.
 [Spelling]
 enabled = true

config/vufind/WorldCat.ini

@@ -48,6 +48,13 @@ Date        = "sort_year asc"
 Author      = sort_author
 Title       = sort_title
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 ; This section controls the behavior of the WorldCatRecord module.  See the
 ; [Record] section of the main config.ini for more detailed documentation.
 [Record]

config/vufind/authority.ini

@@ -22,6 +22,13 @@ Heading             = "Any Heading"
 relevance = sort_relevance
 heading   = "Heading"
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 [Facets]
 source             = "Authority File"
 record_type        = "Record Type"

config/vufind/reserves.ini

@@ -22,6 +22,9 @@ department_str      = "Department"
 instructor_str      = "Instructor"
 course_str          = "Course"
 
+[HiddenSorting]
+;pattern[] = .*
+
 [Facets]
 department_str   = "Department"
 instructor_str   = "Instructor"

config/vufind/searches.ini

@@ -243,6 +243,13 @@ title = sort_title
 CallNumber = callnumber-sort
 WorkKeys = year
 
+; This section allows you to specify hidden sorting options. They can be used to create a
+; whitelist of sort values using regular expressions. If you want to do this add regexes to
+; the pattern[] array. All sort values that match at least one of these pattern are allowed
+; in searches. But they will not be shown in the sort selection in the result list.
+[HiddenSorting]
+;pattern[] = .* ; E.g. uncomment this line to allow any value
+
 ; Each search type defined in searchspecs.yaml can have one or more "recommendations
 ; modules" associated with it in the following sections.  These plug-ins will cause
 ; boxes of suggestions to appear beside (in [SideRecommendations]) or above (in

config/vufind/website.ini

@@ -23,6 +23,9 @@ AllFields           = "All Fields"
 relevance = sort_relevance
 title = sort_title
 
+[HiddenSorting]
+;pattern[] = .*
+
 [Facets]
 category = "Category"
 linktype = "Link Type"

harvest/batch-import-marc.sh

@@ -51,11 +51,11 @@ Options:
 EOF
 }
 
-while getopts ":dhmpx:z" OPT
+while getopts ":dhmp:x:z" OPT
 do
   case $OPT in
     d) BASEPATH_UNDER_HARVEST=false;;
-    h) usage; 
+    h) usage;
        exit 0;;
     m) MOVE_DATA=false;;
     p) PROPERTIES_FILE="$OPTARG"; export PROPERTIES_FILE;;

languages/en.ini

@@ -142,6 +142,9 @@ Bookmark = "Bookmark"
 bookplate_label = "%%title%% bookplate"
 Books = "Books"
 Borrowing Location = "Borrowing Location"
+bound_with_heading_multiple_callnumbers = "Contents of [%%callnumber%%]"
+bound_with_heading_one_callnumber = "Contents"
+bound_with_intro = "The following works are all found in the book indicated by the call number above."
 Braille = "Braille"
 Breadcrumbs = "Breadcrumbs"
 Brief View = "Brief View"