Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Open-ILS/src/sql/Pg/005.schema.actors.sql
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ BEGIN
COALESCE(NEW.pref_family_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.pref_family_name), '') || ' ' ||
COALESCE(NEW.pref_suffix, '') || ' ' ||
COALESCE(NEW.name_keywords, '')
COALESCE(NEW.name_keywords, '') || ' ' ||
COALESCE(NEW.guardian, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.guardian), '')
);
RETURN NEW;
END;
Expand Down
36 changes: 36 additions & 0 deletions Open-ILS/src/sql/Pg/upgrade/XXX.function.guardian_name_search.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
BEGIN;

-- SELECT evergreen.upgrade_deps_block_check('XXX', :eg_version);

CREATE OR REPLACE FUNCTION actor.user_ingest_name_keywords()
RETURNS TRIGGER AS $func$
BEGIN
NEW.name_kw_tsvector := TO_TSVECTOR(
COALESCE(NEW.prefix, '') || ' ' ||
COALESCE(NEW.first_given_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.first_given_name), '') || ' ' ||
COALESCE(NEW.second_given_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.second_given_name), '') || ' ' ||
COALESCE(NEW.family_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.family_name), '') || ' ' ||
COALESCE(NEW.suffix, '') || ' ' ||
COALESCE(NEW.pref_prefix, '') || ' ' ||
COALESCE(NEW.pref_first_given_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.pref_first_given_name), '') || ' ' ||
COALESCE(NEW.pref_second_given_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.pref_second_given_name), '') || ' ' ||
COALESCE(NEW.pref_family_name, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.pref_family_name), '') || ' ' ||
COALESCE(NEW.pref_suffix, '') || ' ' ||
COALESCE(NEW.name_keywords, '') || ' ' ||
COALESCE(NEW.guardian, '') || ' ' ||
COALESCE(evergreen.unaccent_and_squash(NEW.guardian), '')
);
RETURN NEW;
END;
$func$ LANGUAGE PLPGSQL;

-- to trigger user_ingest_name_keywords_tgr
UPDATE actor.usr SET id = id WHERE NOT DELETED;

COMMIT;