Merge remote-tracking branch 'origin/dev' into jumpmenu-to-menu-button

.gitignore

@@ -21,6 +21,7 @@ lessphp_*.list
 module/VuFind/tests/.phpunit.result.cache
 node_modules
 public/swagger-ui
+local/DirLocations.ini
 local/config/vufind/*.ini
 local/config/vufind/*.json
 local/config/vufind/*.yaml

build.xml

@@ -56,7 +56,7 @@
   <property name="phpunit_remote_coverage" value="" /><!-- set to 1 to enable code coverage for Mink tests  -->
   <property name="retain_coverage_files" value="false" /><!-- set to true to keep temporary coverage files from Mink tests -->
 
-  <property name="version" value="9.0.1" />
+  <property name="version" value="9.0.3" />
 
   <!-- We only need the -p switch if the password is non-blank -->
   <if>

composer.json

@@ -71,7 +71,7 @@
         "laminas/laminas-validator": "2.30.1",
         "laminas/laminas-view": "2.27.0",
         "league/commonmark": "2.3.9",
-        "league/oauth2-server": "8.5.1",
+        "league/oauth2-server": "8.5.3",
         "lm-commons/lmc-rbac-mvc": "3.3.2",
         "matthiasmullie/minify": "1.3.70",
         "ocramius/proxy-manager": "2.14.1",

config/vufind/EDS.ini

@@ -61,6 +61,9 @@ api_url = "https://eds-api.ebscohost.com/edsapi/rest"
 ; This is the URL of the EBSCO authorization endpoint:
 auth_url = "https://eds-api.ebscohost.com/authservice/rest"
 
+; This is the URL of the EBSCO session creation endpoint:
+session_url = "https://eds-api.ebscohost.com/edsapi/rest"
+
 ; The following two sections can be used to associate specific recommendations
 ; modules with specific search types defined in the [Basic_Searches] section
 ; below.  For all the details on how these sections work, see the comments above
@@ -165,16 +168,8 @@ top_rows = 2
 ; VuFind displays match actual behavior.
 ;orFacets = *
 
-; These settings affect the way the facets are displayed
-[Facet_Settings]
-facet_limit        = 30     ; how many values should we show for each facet?
-
 ; These settings affect the way facets are displayed on the advanced screen
 [Advanced_Facet_Settings]
-; How many values should we show for each facet? Note: you may need to clear your
-; $VUFIND_LOCAL_DIR/cache/objects directory to make changes to this setting take
-; effect immediately.
-facet_limit      = 100
 ; Should we OR together facets rather than ANDing them? Set to * for
 ; all facets, use a comma-separated list to apply to some of the facets, set
 ; to false or omit to disable ORed facets.
@@ -239,15 +234,15 @@ SU                  = Subject
 next_prev_navigation = false
 
 ; This section represents the EBSCO EDS API Account credentials.
-; If using IP Authentication, then the user_id and password should remain blank
+; If using IP Authentication, then the user_name and password should remain blank
 ; and ip_auth should be set to true.
 [EBSCO_Account]
 ; IP authentication for the API
 ip_auth = false
 user_name = [USERNAME]
 password  = [PASSWORD]
 profile   = [PROFILE]
-organization_id = "VuFind 2.x from MyUniversity"
+organization_id = "VuFind from MyUniversity"
 
 ; This section controls what happens when a record title in a search result list
 ; is clicked. VuFind can either embed the full result directly in the list using

config/vufind/EPF.ini

@@ -0,0 +1,102 @@
+; For the EBSCO Publication Finder data source
+[General]
+default_view        = brief
+
+; These are the default recommendations modules to use when no specific setting
+; are found in the [TopRecommendations], [SideRecommendations] or
+; [NoResultsRecommendations] sections below.
+; See the comments above those sections for details on legal settings.  You may
+; repeat these lines to load multiple recommendations.
+;
+; Right now, VuFind is configured to use all facets ON the side. You can reconfigure
+; this by changing the default_top_recommend setting and [Facets] / [FacetsTop]
+; sections below.
+default_top_recommend[] = TopFacets:FacetsTop:EPF
+default_side_recommend[] = SideFacets:Facets:CheckboxFacets:EPF
+;default_noresults_recommend[] = SwitchTab
+default_noresults_recommend[] = SwitchType
+default_noresults_recommend[] = RemoveFilters
+
+; This is the URL of the EPF API endpoint:
+api_url = "https://eds-api.ebscohost.com/edsapi/publication"
+
+; This is the URL of the EBSCO authorization endpoint:
+auth_url = "https://eds-api.ebscohost.com/authservice/rest"
+
+; This is the URL of the EBSCO session creation endpoint:
+session_url = "https://eds-api.ebscohost.com/edsapi/rest"
+
+; The order of display is controlled by EBSCO's administrative system.
+; The name of the index field is on the left
+; The display name of the field is on the right
+[Facets]
+SubjectPubDb = Subject
+TypePublicationPubD = Resource Type
+PublisherPubDb = Publisher
+
+; These facets will be shown above search results if the TopFacets recommendations
+; module is used, as opposed to the [Facets] section, which is shown to the side
+; of search results when the SideFacets module is used.
+;
+; NOTE: This section is not used by default -- see default_top_recommend setting
+; above for more details.
+[FacetsTop]
+
+; This section controls where facet labels are retrieved from when facets are not
+; explicitly configured.
+[FacetLabels]
+; This setting lists configuration sections containing facet field => label
+; mappings. Later values will override earlier values. These mappings will be used
+; only when a label is not explicitly configured (i.e. through SideFacets settings).
+; If you customize your facet display, be sure to add any new facet configuration
+; sections to this list to ensure proper display in search history, etc.
+labelSections[] = FacetsTop
+labelSections[] = Facets
+
+; This setting lists configuration settings defining checkbox facets. If you use
+; a custom section to configure additional facets, be sure to add it to this list
+; so labels display correctly in history, the advanced search editor, etc. If you
+; are using the reverse label => filter format rather than filter => label, you
+; should prefix the section name with a ~ character to ensure proper loading.
+checkboxSections[] = CheckboxFacets
+
+; Facet display settings
+[Results_Settings]
+; By default, the side facets will only show 6 facets and then the "show more"
+; button. This can get configured with the showMore settings.
+; You can use the * to set a new default setting.
+showMore[*] = 6
+; Or you can set a facet specific value by using the facet name as index.
+;showMore['SourceType'] = 10
+; Number of rows of values for top facets to show above the "more" button
+top_rows = 2
+; Should we OR together facets rather than ANDing them? Set to * for
+; all facets, use a comma-separated list to apply to some of the facets, set
+; to false or omit to disable ORed facets.
+; NOTE: In EDS, facet behavior is controlled through the EBSCO admin panel,
+; but you should configure this setting to match the EBSCO settings so that
+; VuFind displays match actual behavior.
+;orFacets = *
+
+; Prevent specific facet values from being displayed to the user.
+; Use facet field names as keys and untranslated facet values as values.
+[HideFacetValue]
+;TypePublicationPubD[] = "book"
+
+; Prevent all but specific facet values from being displayed to the user.
+; Use facet field names as keys and untranslated facet values as values.
+[ShowFacetValue]
+;TypePublicationPubD[] = "book"
+
+; This section represents the EBSCO EDS API Account credentials,
+; which are also used for the EPF API.
+; So these should be the same credentials as in EDS.ini if both are used.
+; If using IP Authentication, then the user_name and password should remain blank
+; and ip_auth should be set to true.
+[EBSCO_Account]
+; IP authentication for the API
+ip_auth = false
+user_name = [USERNAME]
+password  = [PASSWORD]
+profile   = [PROFILE]
+organization_id = "VuFind from MyUniversity"

config/vufind/LibGuidesAPI.ini

@@ -0,0 +1,27 @@
+; This file is used for the LibGuides *API*, which uses an
+; oauth connection mechanism.  This API is currently used
+; by the LibGuidesProfile recommendation module.
+
+; LibGuides API documentation:
+; https://ask.springshare.com/libguides/faq/873
+
+; This file is NOT used by the LibGuides (research guides)
+; or LibGuidesAZ (database list) data sources, which
+; do not actually use the LibGuides API
+; -- they retrieve data through a LibGuides Search Box widget.
+; https://ask.springshare.com/libguides/faq/867
+; See LibGuides.ini and LibGuidesAZ.ini for that configuration.
+
+[General]
+; Client Id & Secret provided by LibGuides API configuration
+; See https://ask.springshare.com/libguides/faq/873#api-auth
+;client_id = 123
+;client_secret = ABCD
+
+; Base URL of the LibGuides API
+api_base_url = https://lgapi-us.libapps.com/1.2
+
+; Calls to GET (...)/accounts endpoint
+[GetAccounts]
+; Duration (seconds) to cache response data.  Default is 600.
+;cache_lifetime = 600

config/vufind/Search2.ini

@@ -113,7 +113,6 @@ WorkKeys = year
 [TopRecommendations]
 Author[]            = AuthorFacets
 Author[]            = SpellingSuggestions
-;Author[]           = WorldCatIdentities
 CallNumber[]        = "TopFacets:ResultsTop"
 WorkKeys[]          = false