From e6e5bb73e27207e3e36041f3fe2ed54273fdf17c Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Tue, 15 Nov 2022 15:11:49 -0800 Subject: [PATCH] LP#1996651: treat empty string as null for preferred name/alias in wide_hold_data This prevents the patron name from appearing blank in the hold shelf "User Display Name" or "User Alias or Display Name" columns when the alias or preferred name fields are empty strings. Signed-off-by: Jeff Davis --- .../Application/Storage/Publisher/action.pm | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm index 9a6c302904..6d3640fe70 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm @@ -2260,32 +2260,32 @@ SELECT h.id, h.request_time, h.capture_time, h.fulfillment_time, h.checkin_time u.expire_date AS usr_expire_date, u.claims_never_checked_out_count AS usr_claims_never_checked_out_count, u.last_update_time AS usr_last_update_time, - CASE WHEN u.alias IS NOT NULL THEN + CASE WHEN NULLIF(u.alias,'') IS NOT NULL THEN u.alias ELSE u.first_given_name END AS usr_alias_or_first_given_name, - CASE WHEN u.alias IS NOT NULL THEN + CASE WHEN NULLIF(u.alias,'') IS NOT NULL THEN u.alias ELSE REGEXP_REPLACE(ARRAY_TO_STRING(ARRAY[ - COALESCE(u.pref_family_name, u.family_name, ''), - COALESCE(u.pref_suffix, u.suffix, ''), + COALESCE(NULLIF(u.pref_family_name,''), u.family_name, ''), + COALESCE(NULLIF(u.pref_suffix,''), u.suffix, ''), ', ', - COALESCE(u.pref_prefix, u.prefix, ''), - COALESCE(u.pref_first_given_name, u.first_given_name, ''), - COALESCE(u.pref_second_given_name, u.second_given_name, '') + COALESCE(NULLIF(u.pref_prefix,''), u.prefix, ''), + COALESCE(NULLIF(u.pref_first_given_name,''), u.first_given_name, ''), + COALESCE(NULLIF(u.pref_second_given_name,''), u.second_given_name, '') ], ' '), E'\\s+,', ',') END AS usr_alias_or_display_name, REGEXP_REPLACE(ARRAY_TO_STRING(ARRAY[ - COALESCE(u.pref_family_name, u.family_name, ''), - COALESCE(u.pref_suffix, u.suffix, ''), + COALESCE(NULLIF(u.pref_family_name,''), u.family_name, ''), + COALESCE(NULLIF(u.pref_suffix,''), u.suffix, ''), ', ', - COALESCE(u.pref_prefix, u.prefix, ''), - COALESCE(u.pref_first_given_name, u.first_given_name, ''), - COALESCE(u.pref_second_given_name, u.second_given_name, '') + COALESCE(NULLIF(u.pref_prefix,''), u.prefix, ''), + COALESCE(NULLIF(u.pref_first_given_name,''), u.first_given_name, ''), + COALESCE(NULLIF(u.pref_second_given_name,''), u.second_given_name, '') ], ' '), E'\\s+,', ',') AS usr_display_name, uc.id AS ucard_id, uc.barcode AS ucard_barcode, uc.usr AS ucard_usr, uc.active AS ucard_active, -- 2.11.0