diff --git a/code/axis_360_export/axis_360_export.jar b/code/axis_360_export/axis_360_export.jar index 7efb91c31a..043d820e3c 100644 Binary files a/code/axis_360_export/axis_360_export.jar and b/code/axis_360_export/axis_360_export.jar differ diff --git a/code/carlx_export/carlx_export.jar b/code/carlx_export/carlx_export.jar index 415ba633ed..d5503ddc02 100644 Binary files a/code/carlx_export/carlx_export.jar and b/code/carlx_export/carlx_export.jar differ diff --git a/code/cloud_library_export/cloud_library_export.jar b/code/cloud_library_export/cloud_library_export.jar index 009eac1b87..b499046b52 100644 Binary files a/code/cloud_library_export/cloud_library_export.jar and b/code/cloud_library_export/cloud_library_export.jar differ diff --git a/code/course_reserves_indexer/course_reserves_indexer.jar b/code/course_reserves_indexer/course_reserves_indexer.jar index adb4c6427b..2767ca97f8 100644 Binary files a/code/course_reserves_indexer/course_reserves_indexer.jar and b/code/course_reserves_indexer/course_reserves_indexer.jar differ diff --git a/code/cron/cron.jar b/code/cron/cron.jar index 4d9c959a20..736c591140 100644 Binary files a/code/cron/cron.jar and b/code/cron/cron.jar differ diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar index cb47f73d7a..fd8f3d39fb 100644 Binary files a/code/events_indexer/events_indexer.jar and b/code/events_indexer/events_indexer.jar differ diff --git a/code/evergreen_export/evergreen_export.jar b/code/evergreen_export/evergreen_export.jar index 170e781f86..772bc37e24 100644 Binary files a/code/evergreen_export/evergreen_export.jar and b/code/evergreen_export/evergreen_export.jar differ diff --git a/code/evolve_export/evolve_export.jar b/code/evolve_export/evolve_export.jar index be05eb9fe6..c982b8c32a 100644 Binary files a/code/evolve_export/evolve_export.jar and b/code/evolve_export/evolve_export.jar differ diff --git a/code/hoopla_export/hoopla_export.jar b/code/hoopla_export/hoopla_export.jar index 1161e66727..be41c9ca5a 100644 Binary files a/code/hoopla_export/hoopla_export.jar and b/code/hoopla_export/hoopla_export.jar differ diff --git a/code/koha_export/koha_export.jar b/code/koha_export/koha_export.jar index 8176e06497..2724b424d1 100644 Binary files a/code/koha_export/koha_export.jar and b/code/koha_export/koha_export.jar differ diff --git a/code/oai_indexer/oai_indexer.jar b/code/oai_indexer/oai_indexer.jar index aa7d603399..e9b05dd372 100644 Binary files a/code/oai_indexer/oai_indexer.jar and b/code/oai_indexer/oai_indexer.jar differ diff --git a/code/overdrive_extract/overdrive_extract.jar b/code/overdrive_extract/overdrive_extract.jar index 3e4d006746..c5ef04d8b8 100644 Binary files a/code/overdrive_extract/overdrive_extract.jar and b/code/overdrive_extract/overdrive_extract.jar differ diff --git a/code/palace_project_export/palace_project_export.jar b/code/palace_project_export/palace_project_export.jar index b15358e308..fbd3210162 100644 Binary files a/code/palace_project_export/palace_project_export.jar and b/code/palace_project_export/palace_project_export.jar differ diff --git a/code/polaris_export/polaris_export.jar b/code/polaris_export/polaris_export.jar index 8df7ca2b8d..31051ee533 100644 Binary files a/code/polaris_export/polaris_export.jar and b/code/polaris_export/polaris_export.jar differ diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar index 7c64c6c15a..58a288e2e0 100644 Binary files a/code/reindexer/reindexer.jar and b/code/reindexer/reindexer.jar differ diff --git a/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java b/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java index 664bb41b6f..b32e336998 100644 --- a/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java +++ b/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java @@ -207,7 +207,7 @@ private String normalizeNumericTitleText(String groupingTitle) { return groupingTitle; } - private static final Pattern commonSubtitlesSimplePattern = Pattern.compile("\\b(by\\s\\w+\\s\\w+|a novel of .*|stories|an autobiography|a biography|a memoir in books|poems|the movie|large print|graphic novel|magazine|audio cd|book club kit|with illustrations|book \\d+|the original classic edition|classic edition|a novel|large type edition|novel)$"); + private static final Pattern commonSubtitlesSimplePattern = Pattern.compile("\\b(by\\s\\w+\\s\\w+|a novel of .*|stories|an autobiography|a biography|a memoir in books|poems|the movie|large print|the graphic novel|graphic novel|magazine|audio cd|book club kit|with illustrations|book \\d+|the original classic edition|classic edition|a novel|large type edition|novel)$"); private static final Pattern commonSubtitlesComplexPattern = Pattern.compile("\\b((a|una|an)\\s(.*)novel(a|la)?|a(.*)memoir|a(.*)mystery|a(.*)thriller|by\\s\\w+\\s\\w+|an? .* story|a .*\\s?book|[\\w\\s]+series book \\d+|[\\w\\s]+serie libro \\d+|the[\\w\\s]+chronicles book \\d+|[\\w\\s]+trilogy book \\d+|^novel|[\\w\\s]+series|.+\\sbook\\s\\d+)$"); private String removeCommonSubtitles(String groupingTitle) { boolean changeMade = true; diff --git a/code/sideload_processing/sideload_processing.jar b/code/sideload_processing/sideload_processing.jar index 468162f931..5336ed885f 100644 Binary files a/code/sideload_processing/sideload_processing.jar and b/code/sideload_processing/sideload_processing.jar differ diff --git a/code/sierra_export_api/sierra_export_api.jar b/code/sierra_export_api/sierra_export_api.jar index 17eb551c7f..f9b4876e6d 100644 Binary files a/code/sierra_export_api/sierra_export_api.jar and b/code/sierra_export_api/sierra_export_api.jar differ diff --git a/code/symphony_export/symphony_export.jar b/code/symphony_export/symphony_export.jar index 6b9896d9cc..9420a841e8 100644 Binary files a/code/symphony_export/symphony_export.jar and b/code/symphony_export/symphony_export.jar differ diff --git a/code/user_list_indexer/user_list_indexer.jar b/code/user_list_indexer/user_list_indexer.jar index e72209afd3..4a66f41b32 100644 Binary files a/code/user_list_indexer/user_list_indexer.jar and b/code/user_list_indexer/user_list_indexer.jar differ diff --git a/code/web/Drivers/Koha.php b/code/web/Drivers/Koha.php index 2fc28addb6..0956e83d20 100644 --- a/code/web/Drivers/Koha.php +++ b/code/web/Drivers/Koha.php @@ -6829,7 +6829,7 @@ protected function getUsersExtendedAttributesFromKoha($borrowerNumber): array { ], true); $response = $this->apiCurlWrapper->curlSendPage($apiUrl, 'GET', null); - ExternalRequestLogEntry::logRequest('koha.getUserExtendedAttributes', 'PUT', $apiUrl, $this->apiCurlWrapper->getHeaders(), '', $this->apiCurlWrapper->getResponseCode(), $response, []); + ExternalRequestLogEntry::logRequest('koha.getUserExtendedAttributes', 'GET', $apiUrl, $this->apiCurlWrapper->getHeaders(), '', $this->apiCurlWrapper->getResponseCode(), $response, []); if ($this->apiCurlWrapper->getResponseCode() == 200) { $jsonResponse = json_decode($response, true); diff --git a/code/web/release_notes/24.06.00.MD b/code/web/release_notes/24.06.00.MD index a7b5135a1c..6fe5c9cacc 100644 --- a/code/web/release_notes/24.06.00.MD +++ b/code/web/release_notes/24.06.00.MD @@ -12,6 +12,10 @@ ### Events Updates - Correct multi-select facets so multiple values can be selected when searching events. (*KL, MDN*) +### Indexing and Grouping Updates +- When normalizing subtitles, remove "The Graphic Novel" in addition to just "Graphic Novel" (Ticket 132354) (*MDN*) +- Default format category of Wonderbook to Audio Books. (*MDN*) + ### Koha Updates - When a user has opted out of auto-renewal, do not show auto-renewal message even if the title is otherwise eligible for auto-renewal. (Ticket 131789) (*MDN*) @@ -53,7 +57,7 @@ ### Other Updates - Update escaping of facet values so that translatable facet values can be translated in translation mode. (Tickets 130428, 130798) (*MDN*) -- Fix translation mode for Export to CSV buttons in the Admin interface. +- Fix translation mode for Export to CSV buttons in the Admin interface. (*MDN*) //kirstien ### Accessibility Updates diff --git a/code/web_indexer/web_indexer.jar b/code/web_indexer/web_indexer.jar index 8175f31a38..d2fabb5e08 100644 Binary files a/code/web_indexer/web_indexer.jar and b/code/web_indexer/web_indexer.jar differ diff --git a/sites/default/translation_maps/format_category_map.properties b/sites/default/translation_maps/format_category_map.properties index 0d9daeab41..7766cc7a17 100644 --- a/sites/default/translation_maps/format_category_map.properties +++ b/sites/default/translation_maps/format_category_map.properties @@ -123,7 +123,7 @@ Web_Content = Other Wii = Other WiiU = Other WindowsGame = Other -Wonderbook = Other +Wonderbook = Audio Books Xbox360 = Other XboxOne = Other XboxSeriesX = Other