Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade'
authorMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:25 +0000 (12:15 -0500)
committerMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:46 +0000 (12:15 -0500)
One merge conflict in 2.0-2.1-upgrade-db.sql silenced with -X theirs.  See
LP#894052 for details.

Signed-off-by: Mike Rylander <mrylander@gmail.com>

22 files changed:
Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.2.2.0-1.2.2.1-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.2.2.1-1.2.2.2-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql [deleted file]
Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.4-shadow_full_rec-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql [deleted file]
Open-ILS/src/sql/Pg/version-upgrade/1.6.1-2.0-upgrade-db.sql [moved from Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql with 100% similarity]
Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql [moved from Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql with 71% similarity]
Open-ILS/src/sql/Pg/version-upgrade/2.0.0-2.0.1-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.1-2.0.2-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.2-2.0.3-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.3-2.0.4-upgrade-db.sql [moved from Open-ILS/src/sql/Pg/2.0.3-2.0.4-upgrade-db.sql with 94% similarity]
Open-ILS/src/sql/Pg/version-upgrade/2.0.4-2.0.5-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.5-2.0.6-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.6-2.0.7-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.7-2.0.8-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.8-2.0.9-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.0.9-2.0.10-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/version-upgrade/2.1.0-2.1.1-upgrade-db.sql [new file with mode: 0644]

diff --git a/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql
deleted file mode 100644 (file)
index 8c44a09..0000000
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-BEGIN;
-
--------------------------------------------------------------------
-/* new materialized view for reporting schema -- ok if it fails  */
--------------------------------------------------------------------
-
-CREATE TABLE reporter.materialized_simple_record AS SELECT * FROM reporter.super_simple_record WHERE 1=0;
-
-INSERT INTO reporter.materialized_simple_record
-    (id,fingerprint,quality,tcn_source,tcn_value,title,author,publisher,pubdate,isbn,issn)
-    SELECT DISTINCT ON (id) * FROM reporter.super_simple_record;
-
-ALTER TABLE reporter.materialized_simple_record ADD PRIMARY KEY (id);
-
-CREATE OR REPLACE VIEW reporter.super_simple_record AS SELECT * FROM reporter.materialized_simple_record;
-
-CREATE OR REPLACE VIEW reporter.old_super_simple_record AS
-SELECT  r.id,
-    r.fingerprint,
-    r.quality,
-    r.tcn_source,
-    r.tcn_value,
-    title.value AS title,
-    FIRST(author.value) AS author,
-    publisher.value AS publisher,
-    SUBSTRING(pubdate.value FROM $$\d+$$) AS pubdate,
-    ARRAY_ACCUM( SUBSTRING(isbn.value FROM $$^\S+$$) ) AS isbn,
-    ARRAY_ACCUM( SUBSTRING(issn.value FROM $$^\S+$$) ) AS issn
-  FROM  biblio.record_entry r
-    LEFT JOIN metabib.full_rec title ON (r.id = title.record AND title.tag = '245' AND title.subfield = 'a')
-    LEFT JOIN metabib.full_rec author ON (r.id = author.record AND author.tag IN ('100','110','111') AND author.subfield = 'a')
-    LEFT JOIN metabib.full_rec publisher ON (r.id = publisher.record AND publisher.tag = '260' AND publisher.subfield = 'b')
-    LEFT JOIN metabib.full_rec pubdate ON (r.id = pubdate.record AND pubdate.tag = '260' AND pubdate.subfield = 'c')
-    LEFT JOIN metabib.full_rec isbn ON (r.id = isbn.record AND isbn.tag IN ('024', '020') AND isbn.subfield IN ('a','z'))
-    LEFT JOIN metabib.full_rec issn ON (r.id = issn.record AND issn.tag = '022' AND issn.subfield = 'a')
-  GROUP BY 1,2,3,4,5,6,8,9;
-
-CREATE OR REPLACE FUNCTION reporter.simple_rec_sync () RETURNS TRIGGER AS $$
-DECLARE
-    r_id        BIGINT;
-    new_data    RECORD;
-BEGIN
-    IF TG_OP IN ('DELETE') THEN
-        r_id := OLD.record;
-    ELSE
-        r_id := NEW.record;
-    END IF;
-
-    SELECT * INTO new_data FROM reporter.materialized_simple_record WHERE id = r_id FOR UPDATE;
-    DELETE FROM reporter.materialized_simple_record WHERE id = r_id;
-
-    IF TG_OP IN ('DELETE') THEN
-        RETURN OLD;
-    ELSE
-        INSERT INTO reporter.materialized_simple_record SELECT DISTINCT ON (id) * FROM reporter.old_super_simple_record WHERE id = NEW.record;
-        RETURN NEW;
-    END IF;
-
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER zzz_update_materialized_simple_record_tgr
-    AFTER INSERT OR UPDATE OR DELETE ON metabib.full_rec
-    FOR EACH ROW EXECUTE PROCEDURE reporter.simple_rec_sync();
-
-COMMIT;
-
-
-DROP VIEW reporter.overdue_reports;
-DROP VIEW reporter.pending_reports;
-DROP VIEW reporter.currently_running;
-
-BEGIN;
-
--------------------------------------------------------------------
-/* convenience views for report management                       */
--------------------------------------------------------------------
-
-CREATE OR REPLACE VIEW reporter.overdue_reports AS
- SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
-   FROM reporter.schedule s
-   JOIN reporter.report r ON r.id = s.report
-   JOIN actor.usr u ON s.runner = u.id
-   JOIN actor.card c ON c.id = u.card
-  WHERE s.start_time IS NULL AND s.run_time < now();
-
-CREATE OR REPLACE VIEW reporter.pending_reports AS
- SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
-   FROM reporter.schedule s
-   JOIN reporter.report r ON r.id = s.report
-   JOIN actor.usr u ON s.runner = u.id
-   JOIN actor.card c ON c.id = u.card
-  WHERE s.start_time IS NULL;
-
-CREATE OR REPLACE VIEW reporter.currently_running AS
- SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
-   FROM reporter.schedule s
-   JOIN reporter.report r ON r.id = s.report
-   JOIN actor.usr u ON s.runner = u.id
-   JOIN actor.card c ON c.id = u.card
-  WHERE s.start_time IS NOT NULL AND s.complete_time IS NULL;
-
-
--------------------------------------------------------------------
-/* view for restricting circ counts by circ_mod                  */
--------------------------------------------------------------------
-
-CREATE OR REPLACE VIEW action.open_circ_count_by_circ_mod AS
-    SELECT  circ.usr,
-            cp.circ_modifier,
-            count(circ.id)
-      FROM  action.circulation circ
-            JOIN asset.copy cp ON (circ.target_copy = cp.id)
-      WHERE circ.checkin_time IS NULL
-            AND ( circ.stop_fines IN ('LOST','LONGOVERDUE','CLAIMSRETURNED') OR circ.stop_fines IS NULL )
-      GROUP BY 1,2;
-
-
--------------------------------------------------------------------
-/* reporting functions for new (and fixed) transforms            */
--------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION public.first_word ( TEXT ) RETURNS TEXT AS $$
-        SELECT SUBSTRING( $1 FROM $_$^\S+$_$);
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION public.first5 ( TEXT ) RETURNS TEXT AS $$
-       SELECT SUBSTRING( $1, 1, 5);
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION public.call_number_dewey( TEXT ) RETURNS TEXT AS $$
-        my $txt = shift;
-        $txt =~ s/^\s+//o;
-        $txt =~ s/[\[\]\{\}\(\)`'"#<>\*\?\-\+\$\\]+//o; #' To help vim in SQL mode
-        $txt =~ s/\s+$//o;
-        if ($txt =~ /(\d{3}(?:\.\d+)?)/o) {
-                return $1;
-        } else {
-                return (split /\s+/, $txt)[0];
-        }
-$$ LANGUAGE 'plperlu' STRICT IMMUTABLE;
-
-COMMIT;
-
-DROP SCHEMA IF EXISTS search CASCADE;
-BEGIN;
-
--------------------------------------------------------------------
-/* staged search -- also applied by 300.schema.staged_search.sql */
--------------------------------------------------------------------
-
-CREATE SCHEMA search;
-
-CREATE TABLE search.relevance_adjustment (
-    id          SERIAL  PRIMARY KEY,
-    active      BOOL    NOT NULL DEFAULT TRUE,
-    field       INT     NOT NULL REFERENCES config.metabib_field (id) DEFERRABLE INITIALLY DEFERRED,
-    bump_type   TEXT    NOT NULL CHECK (bump_type IN ('word_order','first_word','full_match')),
-    multiplier  NUMERIC NOT NULL DEFAULT 1.0
-);
-CREATE UNIQUE INDEX bump_once_per_field_idx ON search.relevance_adjustment ( field, bump_type );
-
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(1, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(1, 'full_match', 20);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(2, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(2, 'word_order', 10);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(2, 'full_match', 20);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(3, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(3, 'word_order', 10);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(3, 'full_match', 20);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(4, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(4, 'word_order', 10);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(4, 'full_match', 20);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(5, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(5, 'word_order', 10);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(5, 'full_match', 20);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(6, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(7, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(8, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(9, 'first_word', 1.5);
-INSERT INTO search.relevance_adjustment (field, bump_type, multiplier) VALUES(14, 'word_order', 10);
-
-CREATE OR REPLACE FUNCTION search.pick_table (TEXT) RETURNS TEXT AS $$
-    SELECT  CASE
-                WHEN $1 = 'author'  THEN 'metabib.author_field_entry'
-                WHEN $1 = 'title'   THEN 'metabib.title_field_entry'
-                WHEN $1 = 'subject' THEN 'metabib.subject_field_entry'
-                WHEN $1 = 'keyword' THEN 'metabib.keyword_field_entry'
-                WHEN $1 = 'series'  THEN 'metabib.series_field_entry'
-            END;
-$$ LANGUAGE SQL;
-
-CREATE TYPE search.search_result AS ( id BIGINT, rel NUMERIC, record INT, total INT, checked INT, visible INT, deleted INT, excluded INT );
-CREATE TYPE search.search_args AS ( id INT, field_class TEXT, field_name TEXT, table_alias TEXT, term TEXT, term_type TEXT );
-
-CREATE OR REPLACE FUNCTION search.staged_fts (
-
-    param_search_ou INT,
-    param_depth     INT,
-    param_searches  TEXT, -- JSON hash, to be turned into a resultset via search.parse_search_args
-    param_statuses  INT[],
-    param_audience  TEXT[],
-    param_language  TEXT[],
-    param_lit_form  TEXT[],
-    param_types     TEXT[],
-    param_forms     TEXT[],
-    param_vformats  TEXT[],
-    param_pref_lang TEXT,
-    param_pref_lang_multiplier REAL,
-    param_sort      TEXT,
-    param_sort_desc BOOL,
-    metarecord      BOOL,
-    staff           BOOL,
-    param_rel_limit INT,
-    param_chk_limit INT,
-    param_skip_chk  INT
-
-) RETURNS SETOF search.search_result AS $func$
-DECLARE
-
-    current_res         search.search_result%ROWTYPE;
-    query_part          search.search_args%ROWTYPE;
-    phrase_query_part   search.search_args%ROWTYPE;
-    rank_adjust_id      INT;
-    core_rel_limit      INT;
-    core_chk_limit      INT;
-    core_skip_chk       INT;
-    rank_adjust         search.relevance_adjustment%ROWTYPE;
-    query_table         TEXT;
-    tmp_text            TEXT;
-    tmp_int             INT;
-    current_rank        TEXT;
-    ranks               TEXT[] := '{}';
-    query_table_alias   TEXT;
-    from_alias_array    TEXT[] := '{}';
-    used_ranks          TEXT[] := '{}';
-    mb_field            INT;
-    mb_field_list       INT[];
-    search_org_list     INT[];
-    select_clause       TEXT := 'SELECT';
-    from_clause         TEXT := ' FROM  metabib.metarecord_source_map m JOIN metabib.rec_descriptor mrd ON (m.source = mrd.record) ';
-    where_clause        TEXT := ' WHERE 1=1 ';
-    mrd_used            BOOL := FALSE;
-    sort_desc           BOOL := FALSE;
-
-    core_result         RECORD;
-    core_cursor         REFCURSOR;
-    core_rel_query      TEXT;
-    vis_limit_query     TEXT;
-    inner_where_clause  TEXT;
-
-    total_count         INT := 0;
-    check_count         INT := 0;
-    deleted_count       INT := 0;
-    visible_count       INT := 0;
-    excluded_count      INT := 0;
-
-BEGIN
-
-    core_rel_limit := COALESCE( param_rel_limit, 25000 );
-    core_chk_limit := COALESCE( param_chk_limit, 1000 );
-    core_skip_chk := COALESCE( param_skip_chk, 1 );
-
-    IF metarecord THEN
-        select_clause := select_clause || ' m.metarecord as id, array_accum(distinct m.source) as records,';
-    ELSE
-        select_clause := select_clause || ' m.source as id, array_accum(distinct m.source) as records,';
-    END IF;
-
-    -- first we need to construct the base query
-    FOR query_part IN SELECT * FROM search.parse_search_args(param_searches) WHERE term_type = 'fts_query' LOOP
-
-        inner_where_clause := 'index_vector @@ ' || query_part.term;
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  id INTO mb_field
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-            IF FOUND THEN
-                inner_where_clause := inner_where_clause ||
-                    ' AND ' || 'field = ' || mb_field;
-            END IF;
-
-        END IF;
-
-        -- moving on to the rank ...
-        SELECT  * INTO query_part
-          FROM  search.parse_search_args(param_searches)
-          WHERE term_type = 'fts_rank'
-                AND table_alias = query_part.table_alias;
-
-        current_rank := query_part.term || ' * ' || query_part.table_alias || '_weight.weight';
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-        ELSE
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class;
-
-        END IF;
-
-        FOR rank_adjust IN SELECT * FROM search.relevance_adjustment WHERE active AND field IN ( SELECT * FROM search.explode_array( mb_field_list ) ) LOOP
-
-            IF NOT rank_adjust.bump_type = ANY (used_ranks) THEN
-
-                IF rank_adjust.bump_type = 'first_word' THEN
-                    SELECT  term INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word'
-                      ORDER BY id
-                      LIMIT 1;
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'word_order' THEN
-                    SELECT  array_to_string( array_accum( term ), '%' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( '%' || tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'full_match' THEN
-                    SELECT  array_to_string( array_accum( term ), E'\\s+' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value  ~ ' || quote_literal( '^' || tmp_text || E'\\W*$' );
-
-                END IF;
-
-                current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                    ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
-
-                used_ranks := array_append( used_ranks, rank_adjust.bump_type );
-
-            END IF;
-
-        END LOOP;
-
-        ranks := array_append( ranks, current_rank );
-        used_ranks := '{}';
-
-        FOR phrase_query_part IN
-            SELECT  *
-              FROM  search.parse_search_args(param_searches)
-              WHERE term_type = 'phrase'
-                    AND table_alias = query_part.table_alias LOOP
-
-            tmp_text := replace( phrase_query_part.term, '*', E'\\*' );
-            tmp_text := replace( tmp_text, '?', E'\\?' );
-            tmp_text := replace( tmp_text, '+', E'\\+' );
-            tmp_text := replace( tmp_text, '|', E'\\|' );
-            tmp_text := replace( tmp_text, '(', E'\\(' );
-            tmp_text := replace( tmp_text, ')', E'\\)' );
-            tmp_text := replace( tmp_text, '[', E'\\[' );
-            tmp_text := replace( tmp_text, ']', E'\\]' );
-
-            inner_where_clause := inner_where_clause || ' AND ' || 'value  ~* ' || quote_literal( E'(^|\\W+)' || regexp_replace(tmp_text, E'\\s+',E'\\\\s+','g') || E'(\\W+|\$)' );
-
-        END LOOP;
-
-        query_table := search.pick_table(query_part.field_class);
-
-        from_clause := from_clause ||
-            ' JOIN ( SELECT * FROM ' || query_table || ' WHERE ' || inner_where_clause ||
-                    CASE WHEN core_rel_limit > 0 THEN ' LIMIT ' || core_rel_limit::TEXT ELSE '' END || ' ) AS ' || query_part.table_alias ||
-                ' ON ( m.source = ' || query_part.table_alias || '.source )' ||
-            ' JOIN config.metabib_field AS ' || query_part.table_alias || '_weight' ||
-                ' ON ( ' || query_part.table_alias || '.field = ' || query_part.table_alias || '_weight.id  AND  ' || query_part.table_alias || '_weight.search_field)';
-
-        from_alias_array := array_append(from_alias_array, query_part.table_alias);
-
-    END LOOP;
-
-    IF param_pref_lang IS NOT NULL AND param_pref_lang_multiplier IS NOT NULL THEN
-        current_rank := ' CASE WHEN mrd.item_lang = ' || quote_literal( param_pref_lang ) ||
-            ' THEN ' || param_pref_lang_multiplier || '::REAL ELSE 1.0 END ';
-
-        --ranks := array_append( ranks, current_rank );
-    END IF;
-
-    current_rank := ' AVG( ( (' || array_to_string( ranks, ') + (' ) || ') ) * ' || current_rank || ' ) ';
-    select_clause := select_clause || current_rank || ' AS rel,';
-
-    sort_desc = param_sort_desc;
-
-    IF param_sort = 'pubdate' THEN
-
-        tmp_text := '999999';
-        IF param_sort_desc THEN tmp_text := '0'; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  SUBSTRING(frp.value FROM E'\\d{4}')
-                  FROM  metabib.full_rec frp
-                  WHERE frp.record = m.source
-                    AND frp.tag = '260'
-                    AND frp.subfield = 'c'
-                  LIMIT 1
-            )), $$ || quote_literal(tmp_text) || $$ )::INT )
-        $$;
-
-    ELSIF param_sort = 'title' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(SUBSTR( frt.value, COALESCE(SUBSTRING(frt.ind2 FROM E'\\d+'),'0')::INT + 1 ))
-                  FROM  metabib.full_rec frt
-                  WHERE frt.record = m.source
-                    AND frt.tag = '245'
-                    AND frt.subfield = 'a'
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'author' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(fra.value)
-                  FROM  metabib.full_rec fra
-                  WHERE fra.record = m.source
-                    AND fra.tag LIKE '1%'
-                    AND fra.subfield = 'a'
-                  ORDER BY fra.tag::text::int
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'create_date' THEN
-            current_rank := $$( FIRST (( SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSIF param_sort = 'edit_date' THEN
-            current_rank := $$( FIRST (( SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSE
-        sort_desc := NOT COALESCE(param_sort_desc, FALSE);
-    END IF;
-
-    select_clause := select_clause || current_rank || ' AS rank';
-
-    -- now add the other qualifiers
-    IF param_audience IS NOT NULL AND array_upper(param_audience, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.audience IN ('$$ || array_to_string(param_audience, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_language IS NOT NULL AND array_upper(param_language, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_lang IN ('$$ || array_to_string(param_language, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_lit_form IS NOT NULL AND array_upper(param_lit_form, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.lit_form IN ('$$ || array_to_string(param_lit_form, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_types IS NOT NULL AND array_upper(param_types, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_type IN ('$$ || array_to_string(param_types, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_forms IS NOT NULL AND array_upper(param_forms, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_form IN ('$$ || array_to_string(param_forms, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_vformats IS NOT NULL AND array_upper(param_vformats, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.vr_format IN ('$$ || array_to_string(param_vformats, $$','$$) || $$') $$;
-    END IF;
-
-    core_rel_query := select_clause || from_clause || where_clause ||
-                        ' GROUP BY 1 ORDER BY 4' || CASE WHEN sort_desc THEN ' DESC' ELSE ' ASC' END || ';';
-    --RAISE NOTICE 'Base Query:  %', core_rel_query;
-
-    IF param_depth IS NOT NULL THEN
-        SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
-    ELSE
-        SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
-    END IF;
-
-    OPEN core_cursor FOR EXECUTE core_rel_query;
-
-    LOOP
-
-        FETCH core_cursor INTO core_result;
-        EXIT WHEN NOT FOUND;
-
-        IF total_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % total, % checked so far ... ', total_count, check_count;
-        END IF;
-
-        IF core_chk_limit > 0 AND total_count - core_skip_chk + 1 >= core_chk_limit THEN
-            total_count := total_count + 1;
-            CONTINUE;
-        END IF;
-
-        total_count := total_count + 1;
-
-        CONTINUE WHEN param_skip_chk IS NOT NULL and total_count < param_skip_chk;
-
-        check_count := check_count + 1;
-
-        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-        IF NOT FOUND THEN
-            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
-            deleted_count := deleted_count + 1;
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  biblio.record_entry b
-                JOIN config.bib_source s ON (b.source = s.id)
-          WHERE s.transcendant
-                AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
-
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
-
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
-
-            RETURN NEXT current_res;
-
-            CONTINUE;
-        END IF;
-
-        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.status IN ( SELECT * FROM search.explode_array( param_statuses ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF staff IS NULL OR NOT staff THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cs.holdable
-                    AND cl.opac_visible
-                    AND cp.opac_visible
-                    AND a.opac_visible
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        ELSE
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-
-                PERFORM 1
-                  FROM  asset.call_number cn
-                  WHERE cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                  LIMIT 1;
-
-                IF FOUND THEN
-                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-
-            END IF;
-
-        END IF;
-
-        visible_count := visible_count + 1;
-
-        current_res.id = core_result.id;
-        current_res.rel = core_result.rel;
-
-        tmp_int := 1;
-        IF metarecord THEN
-            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-        END IF;
-
-        IF tmp_int = 1 THEN
-            current_res.record = core_result.records[1];
-        ELSE
-            current_res.record = NULL;
-        END IF;
-
-        RETURN NEXT current_res;
-
-        IF visible_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % visible so far ... ', visible_count;
-        END IF;
-
-    END LOOP;
-
-    current_res.id = NULL;
-    current_res.rel = NULL;
-    current_res.record = NULL;
-    current_res.total = total_count;
-    current_res.checked = check_count;
-    current_res.deleted = deleted_count;
-    current_res.visible = visible_count;
-    current_res.excluded = excluded_count;
-
-    CLOSE core_cursor;
-
-    RETURN NEXT current_res;
-
-END;
-$func$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION search.explode_array(anyarray) RETURNS SETOF anyelement AS $BODY$
-    SELECT ($1)[s] FROM generate_series(1, array_upper($1, 1)) AS s;
-$BODY$
-LANGUAGE 'sql' IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION search.parse_search_args (TEXT) RETURNS SETOF search.search_args AS $perlcode$
-    use JSON::XS;
-    my $json = shift;
-
-    my $args = decode_json( $json );
-
-    my $id = 1;
-
-    for my $k ( keys %$args ) {
-        (my $alias = $k) =~ s/\|/_/gso;
-        my ($class, $field) = split /\|/, $k;
-        my $part = $args->{$k};
-        for my $p ( keys %$part ) {
-            my $data = $part->{$p};
-            $data = [$data] if (!ref($data));
-            for my $datum ( @$data ) {
-                return_next(
-                    {   field_class => $class,
-                        field_name  => $field,
-                        term        => $datum,
-                        table_alias => $alias,
-                        term_type   => $p,
-                        id          => $id,
-                    }
-                );
-                $id++;
-            }
-        }
-    }
-
-    return undef;
-
-$perlcode$ LANGUAGE PLPERLU;
-
-COMMIT;
diff --git a/Open-ILS/src/sql/Pg/1.2.2.0-1.2.2.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.2.0-1.2.2.1-upgrade-db.sql
deleted file mode 100644 (file)
index 1f9f4c1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-BEGIN;
-
--- Handy management functions for the new materialized reporting view
-
-CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
-    DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.full_rec;
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$
-
-    TRUNCATE TABLE reporter.materialized_simple_record;
-
-    INSERT INTO reporter.materialized_simple_record
-        (id,fingerprint,quality,tcn_source,tcn_value,title,author,publisher,pubdate,isbn,issn)
-        SELECT DISTINCT ON (id) * FROM reporter.old_super_simple_record;
-
-    CREATE TRIGGER zzz_update_materialized_simple_record_tgr
-        AFTER INSERT OR UPDATE OR DELETE ON metabib.full_rec
-        FOR EACH ROW EXECUTE PROCEDURE reporter.simple_rec_sync();
-
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION reporter.refresh_materialized_simple_record () RETURNS VOID AS $$
-    SELECT reporter.disable_materialized_simple_record_trigger();
-    SELECT reporter.enable_materialized_simple_record_trigger();
-$$ LANGUAGE SQL;
-
-COMMIT;
diff --git a/Open-ILS/src/sql/Pg/1.2.2.1-1.2.2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.2.1-1.2.2.2-upgrade-db.sql
deleted file mode 100644 (file)
index 49ec817..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-BEGIN;
-
-CREATE SCHEMA extend_reporter;
-
-CREATE TABLE extend_reporter.legacy_circ_count (
-    id          BIGSERIAL   PRIMARY KEY REFERENCES asset.copy (id) DEFERRABLE INITIALLY DEFERRED,
-    circ_count  INT         NOT NULL DEFAULT 0
-);
-
-CREATE VIEW extend_reporter.full_circ_count AS
- SELECT cp.id, COALESCE(sum(c.circ_count), 0::bigint) + COALESCE(count(circ.id), 0::bigint) AS circ_count
-   FROM asset."copy" cp
-   LEFT JOIN extend_reporter.legacy_circ_count c USING (id)
-   LEFT JOIN "action".circulation circ ON circ.target_copy = c.id
-  GROUP BY cp.id;
-
-UPDATE  metabib.title_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.author_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.keyword_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.subject_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.series_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.full_rec
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-COMMIT;
-
diff --git a/Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql
deleted file mode 100644 (file)
index 92066c6..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-
--- It's OK if any of the following, before the transaction, fails ...
-
-CREATE SCHEMA extend_reporter;
-
-CREATE TABLE extend_reporter.legacy_circ_count (
-    id          BIGSERIAL   PRIMARY KEY REFERENCES asset.copy (id) DEFERRABLE INITIALLY DEFERRED,
-    circ_count  INT         NOT NULL DEFAULT 0
-);
-
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_RECORD', 'Allow a staff member to directly remove a bibliographic record');
-SELECT SETVAL('permission.perm_list_id_seq'::TEXT, (SELECT MAX(id) FROM permission.perm_list));
-
-BEGIN;
-
-CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
- SELECT cp.id, COALESCE(sum(c.circ_count), 0::bigint) + COALESCE(count(circ.id), 0::bigint) AS circ_count
-   FROM asset."copy" cp
-   LEFT JOIN extend_reporter.legacy_circ_count c USING (id)
-   LEFT JOIN "action".circulation circ ON circ.target_copy = c.id
-  GROUP BY cp.id;
-
-UPDATE  metabib.title_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.author_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.keyword_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.subject_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.series_field_entry
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-UPDATE  metabib.full_rec
-  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
-  WHERE value ~ E'(\\d{4})-(\\d{4})';
-
-COMMIT;
-
diff --git a/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql b/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
deleted file mode 100644 (file)
index 1d06a44..0000000
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright (C) 2007-2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com> 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-
-
-BEGIN;
-
-ALTER TABLE config.rule_max_fine ADD COLUMN is_percent BOOL NOT NULL DEFAULT FALSE;
-
-CREATE OR REPLACE FUNCTION biblio.next_autogen_tcn_value () RETURNS TEXT AS $$
-    BEGIN RETURN 'AUTOGENERATED-' || nextval('biblio.autogen_tcn_value_seq'::TEXT); END;
-$$ LANGUAGE PLPGSQL;
-
-
-CREATE OR REPLACE FUNCTION search.staged_fts (
-
-    param_search_ou INT,
-    param_depth     INT,
-    param_searches  TEXT, -- JSON hash, to be turned into a resultset via search.parse_search_args
-    param_statuses  INT[],
-    param_locations INT[],
-    param_audience  TEXT[],
-    param_language  TEXT[],
-    param_lit_form  TEXT[],
-    param_types     TEXT[],
-    param_forms     TEXT[],
-    param_vformats  TEXT[],
-    param_pref_lang TEXT,
-    param_pref_lang_multiplier REAL,
-    param_sort      TEXT,
-    param_sort_desc BOOL,
-    metarecord      BOOL,
-    staff           BOOL,
-    param_rel_limit INT,
-    param_chk_limit INT,
-    param_skip_chk  INT
-) RETURNS SETOF search.search_result AS $func$
-DECLARE
-
-    current_res         search.search_result%ROWTYPE;
-    query_part          search.search_args%ROWTYPE;
-    phrase_query_part   search.search_args%ROWTYPE;
-    rank_adjust_id      INT;
-    core_rel_limit      INT;
-    core_chk_limit      INT;
-    core_skip_chk       INT;
-    rank_adjust         search.relevance_adjustment%ROWTYPE;
-    query_table         TEXT;
-    tmp_text            TEXT;
-    tmp_int             INT;
-    current_rank        TEXT;
-    ranks               TEXT[] := '{}';
-    query_table_alias   TEXT;
-    from_alias_array    TEXT[] := '{}';
-    used_ranks          TEXT[] := '{}';
-    mb_field            INT;
-    mb_field_list       INT[];
-    search_org_list     INT[];
-    select_clause       TEXT := 'SELECT';
-    from_clause         TEXT := ' FROM  metabib.metarecord_source_map m JOIN metabib.rec_descriptor mrd ON (m.source = mrd.record) ';
-    where_clause        TEXT := ' WHERE 1=1 ';
-    mrd_used            BOOL := FALSE;
-    sort_desc           BOOL := FALSE;
-
-    core_result         RECORD;
-    core_cursor         REFCURSOR;
-    core_rel_query      TEXT;
-    vis_limit_query     TEXT;
-    inner_where_clause  TEXT;
-
-    total_count         INT := 0;
-    check_count         INT := 0;
-    deleted_count       INT := 0;
-    visible_count       INT := 0;
-    excluded_count      INT := 0;
-
-BEGIN
-
-    core_rel_limit := COALESCE( param_rel_limit, 25000 );
-    core_chk_limit := COALESCE( param_chk_limit, 1000 );
-    core_skip_chk := COALESCE( param_skip_chk, 1 );
-
-    IF metarecord THEN
-        select_clause := select_clause || ' m.metarecord as id, array_accum(distinct m.source) as records,';
-    ELSE
-        select_clause := select_clause || ' m.source as id, array_accum(distinct m.source) as records,';
-    END IF;
-
-    -- first we need to construct the base query
-    FOR query_part IN SELECT * FROM search.parse_search_args(param_searches) WHERE term_type = 'fts_query' LOOP
-
-        inner_where_clause := 'index_vector @@ ' || query_part.term;
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  id INTO mb_field
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-            IF FOUND THEN
-                inner_where_clause := inner_where_clause ||
-                    ' AND ' || 'field = ' || mb_field;
-            END IF;
-
-        END IF;
-
-        -- moving on to the rank ...
-        SELECT  * INTO query_part
-          FROM  search.parse_search_args(param_searches)
-          WHERE term_type = 'fts_rank'
-                AND table_alias = query_part.table_alias;
-
-        current_rank := query_part.term || ' * ' || query_part.table_alias || '_weight.weight';
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-        ELSE
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class;
-
-        END IF;
-
-        FOR rank_adjust IN SELECT * FROM search.relevance_adjustment WHERE active AND field IN ( SELECT * FROM search.explode_array( mb_field_list ) ) LOOP
-
-            IF NOT rank_adjust.bump_type = ANY (used_ranks) THEN
-
-                IF rank_adjust.bump_type = 'first_word' THEN
-                    SELECT  term INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word'
-                      ORDER BY id
-                      LIMIT 1;
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'word_order' THEN
-                    SELECT  array_to_string( array_accum( term ), '%' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( '%' || tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'full_match' THEN
-                    SELECT  array_to_string( array_accum( term ), E'\\s+' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value  ~ ' || quote_literal( '^' || tmp_text || E'\\W*$' );
-
-                END IF;
-
-
-                IF tmp_text IS NOT NULL THEN
-                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
-                END IF;
-
-                used_ranks := array_append( used_ranks, rank_adjust.bump_type );
-
-            END IF;
-
-        END LOOP;
-
-        ranks := array_append( ranks, current_rank );
-        used_ranks := '{}';
-
-        FOR phrase_query_part IN
-            SELECT  * 
-              FROM  search.parse_search_args(param_searches)
-              WHERE term_type = 'phrase'
-                    AND table_alias = query_part.table_alias LOOP
-
-            tmp_text := replace( phrase_query_part.term, '*', E'\\*' );
-            tmp_text := replace( tmp_text, '?', E'\\?' );
-            tmp_text := replace( tmp_text, '+', E'\\+' );
-            tmp_text := replace( tmp_text, '|', E'\\|' );
-            tmp_text := replace( tmp_text, '(', E'\\(' );
-            tmp_text := replace( tmp_text, ')', E'\\)' );
-            tmp_text := replace( tmp_text, '[', E'\\[' );
-            tmp_text := replace( tmp_text, ']', E'\\]' );
-
-            inner_where_clause := inner_where_clause || ' AND ' || 'value  ~* ' || quote_literal( E'(^|\\W+)' || regexp_replace(tmp_text, E'\\s+',E'\\\\s+','g') || E'(\\W+|\$)' );
-
-        END LOOP;
-
-        query_table := search.pick_table(query_part.field_class);
-
-        from_clause := from_clause ||
-            ' JOIN ( SELECT * FROM ' || query_table || ' WHERE ' || inner_where_clause ||
-                    CASE WHEN core_rel_limit > 0 THEN ' LIMIT ' || core_rel_limit::TEXT ELSE '' END || ' ) AS ' || query_part.table_alias ||
-                ' ON ( m.source = ' || query_part.table_alias || '.source )' ||
-            ' JOIN config.metabib_field AS ' || query_part.table_alias || '_weight' ||
-                ' ON ( ' || query_part.table_alias || '.field = ' || query_part.table_alias || '_weight.id  AND  ' || query_part.table_alias || '_weight.search_field)';
-
-        from_alias_array := array_append(from_alias_array, query_part.table_alias);
-
-    END LOOP;
-
-    IF param_pref_lang IS NOT NULL AND param_pref_lang_multiplier IS NOT NULL THEN
-        current_rank := ' CASE WHEN mrd.item_lang = ' || quote_literal( param_pref_lang ) ||
-            ' THEN ' || param_pref_lang_multiplier || '::REAL ELSE 1.0 END ';
-
-        --ranks := array_append( ranks, current_rank );
-    END IF;
-
-    current_rank := ' AVG( ( (' || array_to_string( ranks, ') + (' ) || ') ) * ' || current_rank || ' ) ';
-    select_clause := select_clause || current_rank || ' AS rel,';
-
-    sort_desc = param_sort_desc;
-
-    IF param_sort = 'pubdate' THEN
-
-        tmp_text := '999999';
-        IF param_sort_desc THEN tmp_text := '0'; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  SUBSTRING(frp.value FROM E'\\d{4}')
-                  FROM  metabib.full_rec frp
-                  WHERE frp.record = m.source
-                    AND frp.tag = '260'
-                    AND frp.subfield = 'c'
-                  LIMIT 1
-            )), $$ || quote_literal(tmp_text) || $$ )::INT )
-        $$;
-
-    ELSIF param_sort = 'title' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(SUBSTR( frt.value, COALESCE(SUBSTRING(frt.ind2 FROM E'\\d+'),'0')::INT + 1 ))
-                  FROM  metabib.full_rec frt
-                  WHERE frt.record = m.source
-                    AND frt.tag = '245'
-                    AND frt.subfield = 'a'
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'author' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(fra.value)
-                  FROM  metabib.full_rec fra
-                  WHERE fra.record = m.source
-                    AND fra.tag LIKE '1%'
-                    AND fra.subfield = 'a'
-                  ORDER BY fra.tag::text::int
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'create_date' THEN
-            current_rank := $$( FIRST (( SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSIF param_sort = 'edit_date' THEN
-            current_rank := $$( FIRST (( SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSE
-        sort_desc := NOT COALESCE(param_sort_desc, FALSE);
-    END IF;
-
-    select_clause := select_clause || current_rank || ' AS rank';
-
-    -- now add the other qualifiers
-    IF param_audience IS NOT NULL AND array_upper(param_audience, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.audience IN ('$$ || array_to_string(param_audience, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_language IS NOT NULL AND array_upper(param_language, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_lang IN ('$$ || array_to_string(param_language, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_lit_form IS NOT NULL AND array_upper(param_lit_form, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.lit_form IN ('$$ || array_to_string(param_lit_form, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_types IS NOT NULL AND array_upper(param_types, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_type IN ('$$ || array_to_string(param_types, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_forms IS NOT NULL AND array_upper(param_forms, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_form IN ('$$ || array_to_string(param_forms, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_vformats IS NOT NULL AND array_upper(param_vformats, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.vr_format IN ('$$ || array_to_string(param_vformats, $$','$$) || $$') $$;
-    END IF;
-
-    core_rel_query := select_clause || from_clause || where_clause ||
-                        ' GROUP BY 1 ORDER BY 4' || CASE WHEN sort_desc THEN ' DESC' ELSE ' ASC' END || ';';
-    --RAISE NOTICE 'Base Query:  %', core_rel_query;
-
-    IF param_depth IS NOT NULL THEN
-        SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
-    ELSE
-        SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
-    END IF;
-
-    OPEN core_cursor FOR EXECUTE core_rel_query;
-
-    LOOP
-
-        FETCH core_cursor INTO core_result;
-        EXIT WHEN NOT FOUND;
-
-
-        IF total_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % total, % checked so far ... ', total_count, check_count;
-        END IF;
-
-        IF core_chk_limit > 0 AND total_count - core_skip_chk + 1 >= core_chk_limit THEN
-            total_count := total_count + 1;
-            CONTINUE;
-        END IF;
-
-        total_count := total_count + 1;
-
-        CONTINUE WHEN param_skip_chk IS NOT NULL and total_count < param_skip_chk;
-
-        check_count := check_count + 1;
-
-        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-        IF NOT FOUND THEN
-            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
-            deleted_count := deleted_count + 1;
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  biblio.record_entry b
-                JOIN config.bib_source s ON (b.source = s.id)
-          WHERE s.transcendant
-                AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
-
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
-
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
-
-            RETURN NEXT current_res;
-
-            CONTINUE;
-        END IF;
-
-        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.status IN ( SELECT * FROM search.explode_array( param_statuses ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.location IN ( SELECT * FROM search.explode_array( param_locations ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all copy_location-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF staff IS NULL OR NOT staff THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cs.holdable
-                    AND cl.opac_visible
-                    AND cp.opac_visible
-                    AND a.opac_visible
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        ELSE
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-
-                PERFORM 1
-                  FROM  asset.call_number cn
-                  WHERE cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                  LIMIT 1;
-
-                IF FOUND THEN
-                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-
-            END IF;
-
-        END IF;
-
-        visible_count := visible_count + 1;
-
-        current_res.id = core_result.id;
-        current_res.rel = core_result.rel;
-
-        tmp_int := 1;
-        IF metarecord THEN
-            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-        END IF;
-
-        IF tmp_int = 1 THEN
-            current_res.record = core_result.records[1];
-        ELSE
-            current_res.record = NULL;
-        END IF;
-
-        RETURN NEXT current_res;
-
-        IF visible_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % visible so far ... ', visible_count;
-        END IF;
-
-    END LOOP;
-
-    current_res.id = NULL;
-    current_res.rel = NULL;
-    current_res.record = NULL;
-    current_res.total = total_count;
-    current_res.checked = check_count;
-    current_res.deleted = deleted_count;
-    current_res.visible = visible_count;
-    current_res.excluded = excluded_count;
-
-    CLOSE core_cursor;
-
-    RETURN NEXT current_res;
-
-END;
-$func$ LANGUAGE PLPGSQL;
-
-COMMIT;
-
diff --git a/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql
deleted file mode 100644 (file)
index 869dce8..0000000
+++ /dev/null
@@ -1,5735 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-
-ALTER TABLE auditor.asset_copy_history ALTER COLUMN price DROP NOT NULL; -- Price is nullable in 1.4+, auditor triggers complain when it's not informed of this
-
--- Get rid of embedded slashes from old ingest
-UPDATE metabib.title_field_entry
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-UPDATE metabib.author_field_entry
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-UPDATE metabib.subject_field_entry
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-UPDATE metabib.series_field_entry
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-UPDATE metabib.keyword_field_entry
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-UPDATE metabib.full_rec
-SET value = REGEXP_REPLACE(value, E'(\\w+)\\/(\\w+)', E'\\1 \\2','g')
-WHERE value ~ E'(\\w+)\\/(\\w+)';
-
-\set ON_ERROR_STOP 1
-
-BEGIN;
-
--- To avoid any updates while we're doin' our thing...
-SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
-CREATE TABLE config.upgrade_log (
-    version         TEXT    PRIMARY KEY,
-    install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
-);
-INSERT INTO config.upgrade_log (version) VALUES ('1.4.0.0');
-
-SELECT set_curcfg('default');
-
-CREATE OR REPLACE FUNCTION public.extract_marc_field ( TEXT, BIGINT, TEXT, TEXT ) RETURNS TEXT AS $$
-    SELECT regexp_replace(array_to_string( array_accum( output ),' ' ),$4,'','g') FROM xpath_table('id', 'marc', $1, $3, 'id='||$2)x(id INT, output TEXT);
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION public.extract_marc_field ( TEXT, BIGINT, TEXT ) RETURNS TEXT AS $$
-       SELECT public.extract_marc_field($1,$2,$3,'');
-$$ LANGUAGE SQL;
-
-CREATE TABLE config.i18n_locale (
-    code        TEXT    PRIMARY KEY,
-    marc_code   TEXT    NOT NULL REFERENCES config.language_map (code) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    name        TEXT    UNIQUE NOT NULL,
-    description TEXT
-);
-INSERT INTO config.i18n_locale (code,marc_code,name,description) VALUES ('en-US', 'eng', 'English (US)', 'American English');
-INSERT INTO config.i18n_locale (code,marc_code,name,description) VALUES ('en-CA', 'eng', 'English (Canada)', 'Canadian English');
-INSERT INTO config.i18n_locale (code,marc_code,name,description) VALUES ('fr-CA', 'fre', 'French (Canada)', 'Canadian French');
-INSERT INTO config.i18n_locale (code,marc_code,name,description) VALUES ('hy-AM', 'arm', 'Armenian', 'Armenian');
-
-
-CREATE TABLE config.i18n_core (
-    id              BIGSERIAL   PRIMARY KEY,
-    fq_field        TEXT        NOT NULL,
-    identity_value  TEXT        NOT NULL,
-    translation     TEXT        NOT NULL    REFERENCES config.i18n_locale (code) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    string          TEXT        NOT NULL
-);
-CREATE UNIQUE INDEX i18n_identity ON config.i18n_core (fq_field,identity_value,translation);
-CREATE OR REPLACE FUNCTION oils_i18n_xlate ( keytable TEXT, keyclass TEXT, keycol TEXT, identcol TEXT, keyvalue TEXT, raw_locale TEXT ) RETURNS TEXT AS $func$
-DECLARE
-    locale      TEXT := REGEXP_REPLACE( REGEXP_REPLACE( raw_locale, E'[;, ].+$', '' ), E'_', '-', 'g' );
-    language    TEXT := REGEXP_REPLACE( locale, E'-.+$', '' );
-    result      config.i18n_core%ROWTYPE;
-    fallback    TEXT;
-    keyfield    TEXT := keyclass || '.' || keycol;
-BEGIN
-
-    -- Try the full locale
-    SELECT  * INTO result
-      FROM  config.i18n_core
-      WHERE fq_field = keyfield
-            AND identity_value = keyvalue
-            AND translation = locale;
-
-    -- Try just the language
-    IF NOT FOUND THEN
-        SELECT  * INTO result
-          FROM  config.i18n_core
-          WHERE fq_field = keyfield
-                AND identity_value = keyvalue
-                AND translation = language;
-    END IF;
-
-    -- Fall back to the string we passed in in the first place
-    IF NOT FOUND THEN
-       EXECUTE
-            'SELECT ' ||
-                keycol ||
-            ' FROM ' || keytable ||
-            ' WHERE ' || identcol || ' = ' || quote_literal(keyvalue)
-                INTO fallback;
-        RETURN fallback;
-    END IF;
-
-    RETURN result.string;
-END;
-$func$ LANGUAGE PLPGSQL;
-
--- Functions for marking translatable strings in SQL statements
--- Parameters are: primary key, string, class hint, property
-CREATE OR REPLACE FUNCTION oils_i18n_gettext( INT, TEXT, TEXT, TEXT ) RETURNS TEXT AS $$
-    SELECT $2;
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION oils_i18n_gettext( TEXT, TEXT, TEXT, TEXT ) RETURNS TEXT AS $$
-    SELECT $2;
-$$ LANGUAGE SQL;
-
-ALTER TABLE config.xml_transform DROP CONSTRAINT xml_transform_namespace_uri_key;
-INSERT INTO config.xml_transform VALUES ( 'mods32', 'http://www.loc.gov/mods/', 'mods', '' );
-
-
-/* Upgrade to MODS32 for transforms */
-ALTER TABLE config.metabib_field ALTER COLUMN format SET DEFAULT 'mods32';
-UPDATE config.metabib_field SET format = 'mods32';
-
-/* Update index definitions to MODS32-compliant XPaths */
-UPDATE config.metabib_field
-        SET xpath = $$//mods:mods/mods:name[@type='corporate']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
-        WHERE field_class = 'author' AND name = 'corporate';
-UPDATE config.metabib_field
-        SET xpath = $$//mods:mods/mods:name[@type='personal']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
-        WHERE field_class = 'author' AND name = 'personal';
-UPDATE config.metabib_field
-        SET xpath = $$//mods:mods/mods:name[@type='conference']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
-        WHERE field_class = 'author' AND name = 'conference';
-
-/* And they all want mods32: as their prefix */
-UPDATE config.metabib_field SET xpath = regexp_replace(xpath, 'mods:', 'mods32:', 'g');
-
-
-ALTER TABLE config.copy_status ADD COLUMN opac_visible BOOL NOT NULL DEFAULT FALSE;
-UPDATE config.copy_status SET opac_visible = holdable;
-
-CREATE TABLE config.bib_level_map (
-        code    TEXT    PRIMARY KEY,
-        value   TEXT    NOT NULL
-);
-INSERT INTO config.bib_level_map (code, value) VALUES ('a', oils_i18n_gettext('a', 'Monographic component part', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('b', oils_i18n_gettext('b', 'Serial component part', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('c', oils_i18n_gettext('c', 'Collection', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('d', oils_i18n_gettext('d', 'Subunit', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('i', oils_i18n_gettext('i', 'Integrating resource', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('m', oils_i18n_gettext('m', 'Monograph/Item', 'cblvl', 'value'));
-INSERT INTO config.bib_level_map (code, value) VALUES ('s', oils_i18n_gettext('s', 'Serial', 'cblvl', 'value'));
-
-CREATE TABLE config.z3950_source (
-    name                TEXT    PRIMARY KEY,
-    label               TEXT    NOT NULL UNIQUE,
-    host                TEXT    NOT NULL,
-    port                INT     NOT NULL,
-    db                  TEXT    NOT NULL,
-    record_format       TEXT    NOT NULL DEFAULT 'FI',
-    transmission_format TEXT    NOT NULL DEFAULT 'usmarc',
-    auth                BOOL    NOT NULL DEFAULT TRUE
-);
-INSERT INTO config.z3950_source (name, label, host, port, db, auth)
-    VALUES ('loc', oils_i18n_gettext('loc', 'Library of Congress', 'czs', 'label'), 'z3950.loc.gov', 7090, 'Voyager', FALSE);
-INSERT INTO config.z3950_source (name, label, host, port, db, auth)
-    VALUES ('oclc', oils_i18n_gettext('loc', 'OCLC', 'czs', 'label'), 'zcat.oclc.org', 210, 'OLUCWorldCat', TRUE);
-
-
-CREATE TABLE config.z3950_attr (
-    id          SERIAL  PRIMARY KEY,
-    source      TEXT    NOT NULL REFERENCES config.z3950_source (name) DEFERRABLE INITIALLY DEFERRED,
-    name        TEXT    NOT NULL,
-    label       TEXT    NOT NULL,
-    code        INT     NOT NULL,
-    format      INT     NOT NULL,
-    truncation  INT     NOT NULL DEFAULT 0,
-    CONSTRAINT z_code_format_once_per_source UNIQUE (code,format,source)
-);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (1, 'loc','tcn', oils_i18n_gettext(1, 'Title Control Number', 'cza', 'label'), 12, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (2, 'loc', 'isbn', oils_i18n_gettext(2, 'ISBN', 'cza', 'label'), 7, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (3, 'loc', 'lccn', oils_i18n_gettext(3, 'LCCN', 'cza', 'label'), 9, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (4, 'loc', 'author', oils_i18n_gettext(4, 'Author', 'cza', 'label'), 1003, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (5, 'loc', 'title', oils_i18n_gettext(5, 'Title', 'cza', 'label'), 4, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (6, 'loc', 'issn', oils_i18n_gettext(6, 'ISSN', 'cza', 'label'), 8, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (7, 'loc', 'publisher', oils_i18n_gettext(7, 'Publisher', 'cza', 'label'), 1018, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (8, 'loc', 'pubdate', oils_i18n_gettext(8, 'Publication Date', 'cza', 'label'), 31, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (9, 'loc', 'item_type', oils_i18n_gettext(9, 'Item Type', 'cza', 'label'), 1001, 1);
-
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (10, 'oclc', 'tcn', oils_i18n_gettext(10, 'Title Control Number', 'cza', 'label'), 12, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (11, 'oclc', 'isbn', oils_i18n_gettext(11, 'ISBN', 'cza', 'label'), 7, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (12, 'oclc', 'lccn', oils_i18n_gettext(12, 'LCCN', 'cza', 'label'), 9, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (13, 'oclc', 'author', oils_i18n_gettext(13, 'Author', 'cza', 'label'), 1003, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (14, 'oclc', 'title', oils_i18n_gettext(14, 'Title', 'cza', 'label'), 4, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (15, 'oclc', 'issn', oils_i18n_gettext(15, 'ISSN', 'cza', 'label'), 8, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (16, 'oclc', 'publisher', oils_i18n_gettext(16, 'Publisher', 'cza', 'label'), 1018, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (17, 'oclc', 'pubdate', oils_i18n_gettext(17, 'Publication Date', 'cza', 'label'), 31, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-    VALUES (18, 'oclc', 'item_type', oils_i18n_gettext(18, 'Item Type', 'cza', 'label'), 1001, 1);
-SELECT SETVAL('config.z3950_attr_id_seq'::TEXT, 100);
-
-
-
-CREATE TABLE actor.org_lasso (
-    id      SERIAL  PRIMARY KEY,
-    name       TEXT    UNIQUE
-);
-
-CREATE TABLE actor.org_lasso_map (
-    id          SERIAL  PRIMARY KEY,
-    lasso       INT     NOT NULL REFERENCES actor.org_lasso (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    org_unit    INT     NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
-);
-CREATE UNIQUE INDEX ou_lasso_lasso_ou_idx ON actor.org_lasso_map (lasso, org_unit);
-CREATE INDEX ou_lasso_org_unit_idx ON actor.org_lasso_map (org_unit);
-
-CREATE TABLE permission.usr_object_perm_map (
-       id              SERIAL  PRIMARY KEY,
-       usr             INT     NOT NULL REFERENCES actor.usr (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       perm            INT     NOT NULL REFERENCES permission.perm_list (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       object_type TEXT NOT NULL,
-       object_id   TEXT NOT NULL,
-       grantable       BOOL    NOT NULL DEFAULT FALSE,
-               CONSTRAINT perm_usr_obj_once UNIQUE (usr,perm,object_type,object_id)
-);
-CREATE INDEX uopm_usr_idx ON permission.usr_object_perm_map (usr);
-
-
-CREATE OR REPLACE FUNCTION permission.grp_ancestors ( INT ) RETURNS SETOF permission.grp_tree AS $$
-        SELECT  a.*
-        FROM    connectby('permission.grp_tree'::text,'parent'::text,'id'::text,'name'::text,$1::text,100,'.'::text)
-                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-                JOIN permission.grp_tree a ON a.id::text = t.keyid::text
-        ORDER BY
-                CASE WHEN a.parent IS NULL
-                        THEN 0
-                        ELSE 1
-                END, a.name;
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION permission.usr_has_object_perm ( iuser INT, tperm TEXT, obj_type TEXT, obj_id TEXT, target_ou INT ) RETURNS BOOL AS $$
-DECLARE
-       r_usr   actor.usr%ROWTYPE;
-       res     BOOL;
-BEGIN
-
-       SELECT * INTO r_usr FROM actor.usr WHERE id = iuser;
-
-       IF r_usr.active = FALSE THEN
-               RETURN FALSE;
-       END IF;
-
-       IF r_usr.super_user = TRUE THEN
-               RETURN TRUE;
-       END IF;
-
-       SELECT TRUE INTO res FROM permission.usr_object_perm_map WHERE usr = r_usr.id AND object_type = obj_type AND object_id = obj_id;
-
-       IF FOUND THEN
-               RETURN TRUE;
-       END IF;
-
-       IF target_ou > -1 THEN
-               RETURN permission.usr_has_perm( iuser, tperm, target_ou);
-       END IF;
-
-       RETURN FALSE;
-
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION permission.usr_has_object_perm ( INT, TEXT, TEXT, TEXT ) RETURNS BOOL AS $$
-    SELECT permission.usr_has_object_perm( $1, $2, $3, $4, -1 );
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION permission.grp_descendants ( INT ) RETURNS SETOF permission.grp_tree AS $$
-    SELECT  a.*
-      FROM  connectby('permission.grp_tree'::text,'id'::text,'parent'::text,'name'::text,$1::text,100,'.'::text)
-            AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-        JOIN permission.grp_tree a ON a.id::text = t.keyid::text
-      ORDER BY  CASE WHEN a.parent IS NULL THEN 0 ELSE 1 END, a.name;
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION permission.grp_full_path ( INT ) RETURNS SETOF permission.grp_tree AS $$
-    SELECT  *
-      FROM  permission.grp_ancestors($1)
-            UNION
-    SELECT  *
-      FROM  permission.grp_descendants($1);
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION permission.grp_combined_ancestors ( INT, INT ) RETURNS SETOF permission.grp_tree AS $$
-    SELECT  *
-      FROM  permission.grp_ancestors($1)
-            UNION
-    SELECT  *
-      FROM  permission.grp_ancestors($2);
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION permission.grp_common_ancestors ( INT, INT ) RETURNS SETOF permission.grp_tree AS $$
-    SELECT  *
-      FROM  permission.grp_ancestors($1)
-            INTERSECT
-    SELECT  *
-      FROM  permission.grp_ancestors($2);
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION permission.grp_proximity ( INT, INT ) RETURNS INT AS $$
-    SELECT COUNT(id)::INT FROM (
-        SELECT id FROM permission.grp_combined_ancestors($1, $2)
-            EXCEPT
-        SELECT id FROM permission.grp_common_ancestors($1, $2)
-    ) z;
-$$ LANGUAGE SQL STABLE;
-
-INSERT INTO permission.usr_work_ou_map (usr, work_ou)
- SELECT DISTINCT u.id, u.home_ou
-  FROM  actor.usr u
-        JOIN permission.grp_tree g ON (u.profile = g.id)
-        LEFT JOIN permission.usr_work_ou_map m ON (u.id = m.usr AND u.home_ou = m.work_ou)
-  WHERE m.id IS NULL
-        AND g.id IN (
-            SELECT DISTINCT (permission.grp_descendants(grp)).id
-              FROM permission.grp_perm_map gpm JOIN permission.perm_list pl ON (pl.id = gpm.perm)
-             WHERE pl.code = 'STAFF_LOGIN'
-        );
-
-/* Enable LIKE to use an index for database clusters with locales other than C or POSIX */
-CREATE INDEX authority_full_rec_value_tpo_index ON authority.full_rec (value text_pattern_ops);
-
-CREATE OR REPLACE FUNCTION public.naco_normalize( TEXT, TEXT ) RETURNS TEXT AS $func$
-    use Unicode::Normalize;
-
-       my $txt = lc(shift);
-       my $sf = shift;
-
-    $txt = NFD($txt);
-       $txt =~ s/\pM+//go;     # Remove diacritics
-
-       $txt =~ s/\xE6/AE/go;   # Convert ae digraph
-       $txt =~ s/\x{153}/OE/go;# Convert oe digraph
-       $txt =~ s/\xFE/TH/go;   # Convert Icelandic thorn
-
-       $txt =~ tr/\x{2070}\x{2071}\x{2072}\x{2073}\x{2074}\x{2075}\x{2076}\x{2077}\x{2078}\x{2079}\x{207A}\x{207B}/0123456789+-/;# Convert superscript numbers
-       $txt =~ tr/\x{2080}\x{2081}\x{2082}\x{2083}\x{2084}\x{2085}\x{2086}\x{2087}\x{2088}\x{2089}\x{208A}\x{208B}/0123456889+-/;# Convert subscript numbers
-
-       $txt =~ tr/\x{0251}\x{03B1}\x{03B2}\x{0262}\x{03B3}/AABGG/;             # Convert Latin and Greek
-       $txt =~ tr/\x{2113}\xF0\!\"\(\)\-\{\}\<\>\;\:\.\?\xA1\xBF\/\\\@\*\%\=\xB1\+\xAE\xA9\x{2117}\$\xA3\x{FFE1}\xB0\^\_\~\`/LD /;     # Convert Misc
-       $txt =~ tr/\'\[\]\|//d;                                                 # Remove Misc
-
-       if ($sf && $sf =~ /^a/o) {
-               my $commapos = index($txt,',');
-               if ($commapos > -1) {
-                       if ($commapos != length($txt) - 1) {
-                               my @list = split /,/, $txt;
-                               my $first = shift @list;
-                               $txt = $first . ',' . join(' ', @list);
-                       } else {
-                               $txt =~ s/,/ /go;
-                       }
-               }
-       } else {
-               $txt =~ s/,/ /go;
-       }
-
-       $txt =~ s/\s+/ /go;     # Compress multiple spaces
-       $txt =~ s/^\s+//o;      # Remove leading space
-       $txt =~ s/\s+$//o;      # Remove trailing space
-
-       return $txt;
-$func$ LANGUAGE 'plperlu' STRICT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION public.naco_normalize( TEXT ) RETURNS TEXT AS $func$
-       SELECT public.naco_normalize($1,'');
-$func$ LANGUAGE 'sql' STRICT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION public.normalize_space( TEXT ) RETURNS TEXT AS $$
-    SELECT regexp_replace(regexp_replace(regexp_replace($1, E'\\n', ' ', 'g'), E'(?:^\\s+)|(\\s+$)', '', 'g'), E'\\s+', ' ', 'g');
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION public.lowercase( TEXT ) RETURNS TEXT AS $$
-    return lc(shift);
-$$ LANGUAGE PLPERLU;
-
-CREATE OR REPLACE FUNCTION public.uppercase( TEXT ) RETURNS TEXT AS $$
-    return uc(shift);
-$$ LANGUAGE PLPERLU;
-
-CREATE OR REPLACE FUNCTION public.remove_diacritics( TEXT ) RETURNS TEXT AS $$
-    use Unicode::Normalize;
-
-    my $x = NFD(shift);
-    $x =~ s/\pM+//go;
-    return $x;
-
-$$ LANGUAGE PLPERLU;
-
-CREATE OR REPLACE FUNCTION public.entityize( TEXT ) RETURNS TEXT AS $$
-    use Unicode::Normalize;
-
-    my $x = NFC(shift);
-    $x =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
-    return $x;
-
-$$ LANGUAGE PLPERLU;
-
-
-CREATE OR REPLACE FUNCTION public.call_number_dewey( TEXT ) RETURNS TEXT AS $$
-        my $txt = shift;
-        $txt =~ s/^\s+//o;
-        $txt =~ s/[\[\]\{\}\(\)`'"#<>\*\?\-\+\$\\]+//og;
-        $txt =~ s/\s+$//o;
-        if ($txt =~ /(\d{3}(?:\.\d+)?)/o) {
-                return $1;
-        } else {
-                return (split /\s+/, $txt)[0];
-        }
-$$ LANGUAGE 'plperlu' STRICT IMMUTABLE;
-
-
-CREATE OR REPLACE FUNCTION actor.org_unit_descendants ( INT ) RETURNS SETOF actor.org_unit AS $$
-       SELECT  a.*
-         FROM  connectby('actor.org_unit'::text,'id'::text,'parent_ou'::text,'name'::text,$1::text,100,'.'::text)
-                       AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id::text = t.keyid::text
-         ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
-$$ LANGUAGE SQL STABLE;
-CREATE OR REPLACE FUNCTION actor.org_unit_ancestors ( INT ) RETURNS SETOF actor.org_unit AS $$
-       SELECT  a.*
-         FROM  connectby('actor.org_unit'::text,'parent_ou'::text,'id'::text,'name'::text,$1::text,100,'.'::text)
-                       AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id::text = t.keyid::text
-         ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
-$$ LANGUAGE SQL STABLE;
-CREATE OR REPLACE FUNCTION actor.org_unit_descendants ( INT,INT ) RETURNS SETOF actor.org_unit AS $$
-       SELECT  a.*
-         FROM  connectby('actor.org_unit'::text,'id'::text,'parent_ou'::text,'name'::text,
-                               (SELECT x.id
-                                  FROM actor.org_unit_ancestors($1) x
-                                       JOIN actor.org_unit_type y ON x.ou_type = y.id
-                                 WHERE y.depth = $2)::text
-               ,100,'.'::text)
-                       AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id::text = t.keyid::text
-         ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
-$$ LANGUAGE SQL STABLE;
-ALTER TABLE metabib.rec_descriptor ADD COLUMN date1 TEXT;
-ALTER TABLE metabib.rec_descriptor ADD COLUMN date2 TEXT;
-
-UPDATE metabib.rec_descriptor
-  SET  date1 = regexp_replace(substring(metabib.full_rec.value,8,4),E'\\D','0','g'),
-       date2 = regexp_replace(substring(metabib.full_rec.value,12,4),E'\\D','9','g')
-  FROM metabib.full_rec
-  WHERE        metabib.full_rec.record = metabib.rec_descriptor.record AND metabib.full_rec.tag = '008';
-
-
-ALTER TABLE money.credit_card_payment ALTER cc_type DROP NOT NULL;
-ALTER TABLE money.credit_card_payment ALTER cc_number DROP NOT NULL;
-ALTER TABLE money.credit_card_payment ALTER expire_month DROP NOT NULL;
-ALTER TABLE money.credit_card_payment ALTER expire_year DROP NOT NULL;
-ALTER TABLE money.credit_card_payment ALTER approval_code DROP NOT NULL;
-
-
-ALTER TABLE asset.copy_location ADD CONSTRAINT acl_name_once_per_lib UNIQUE (name, owning_lib);
-ALTER TABLE asset.copy ALTER price DROP NOT NULL;
-ALTER TABLE asset.copy ALTER price DROP DEFAULT;
-
-CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$
-DECLARE
-       moved_cns INT := 0;
-       source_cn asset.call_number%ROWTYPE;
-       target_cn asset.call_number%ROWTYPE;
-BEGIN
-       FOR source_cn IN SELECT * FROM asset.call_number WHERE record = source_record LOOP
-
-               SELECT  INTO target_cn *
-                 FROM  asset.call_number
-                 WHERE label = source_cn.label
-                       AND owning_lib = source_cn.owning_lib
-                       AND record = target_record;
-
-               IF FOUND THEN
-                       UPDATE  asset.copy
-                         SET   call_number = target_cn.id
-                         WHERE call_number = source_cn.id;
-                       DELETE FROM asset.call_number
-                         WHERE id = target_cn.id;
-               ELSE
-                       UPDATE  asset.call_number
-                         SET   record = target_record
-                         WHERE id = source_cn.id;
-               END IF;
-
-               moved_cns := moved_cns + 1;
-       END LOOP;
-
-       RETURN moved_cns;
-END;
-$func$ LANGUAGE plpgsql;
-
-ALTER TABLE money.billable_xact ADD COLUMN unrecovered BOOL;
-
-CREATE OR REPLACE VIEW money.billable_xact_summary AS
-       SELECT  xact.id,
-               xact.usr,
-               xact.xact_start,
-               xact.xact_finish,
-               credit.amount AS total_paid,
-               credit.payment_ts AS last_payment_ts,
-               credit.note AS last_payment_note,
-               credit.payment_type AS last_payment_type,
-               debit.amount AS total_owed,
-               debit.billing_ts AS last_billing_ts,
-               debit.note AS last_billing_note,
-               debit.billing_type AS last_billing_type,
-               COALESCE(debit.amount, 0::numeric) - COALESCE(credit.amount, 0::numeric) AS balance_owed,
-               p.relname AS xact_type
-         FROM  money.billable_xact xact
-               JOIN pg_class p ON xact.tableoid = p.oid
-               LEFT JOIN (
-                       SELECT  billing.xact,
-                               sum(billing.amount) AS amount,
-                               max(billing.billing_ts) AS billing_ts,
-                               last(billing.note) AS note,
-                               last(billing.billing_type) AS billing_type
-                         FROM  money.billing
-                         WHERE billing.voided IS FALSE
-                         GROUP BY billing.xact
-                       ) debit ON xact.id = debit.xact
-               LEFT JOIN (
-                       SELECT  payment_view.xact,
-                               sum(payment_view.amount) AS amount,
-                               max(payment_view.payment_ts) AS payment_ts,
-                               last(payment_view.note) AS note,
-                               last(payment_view.payment_type) AS payment_type
-                         FROM  money.payment_view
-                         WHERE payment_view.voided IS FALSE
-                         GROUP BY payment_view.xact
-                       ) credit ON xact.id = credit.xact
-         ORDER BY debit.billing_ts, credit.payment_ts;
-ALTER TABLE action.circulation ADD COLUMN create_time TIMESTAMP WITH TIME ZONE DEFAULT NOW();
-
-
-CREATE TABLE action.aged_circulation (
-       usr_post_code           TEXT,
-       usr_home_ou             INT     NOT NULL,
-       usr_profile             INT     NOT NULL,
-       usr_birth_year          INT,
-       copy_call_number        INT     NOT NULL,
-       copy_location           INT     NOT NULL,
-       copy_owning_lib         INT     NOT NULL,
-       copy_circ_lib           INT     NOT NULL,
-       copy_bib_record         BIGINT  NOT NULL,
-       LIKE action.circulation
-
-);
-ALTER TABLE action.aged_circulation ADD PRIMARY KEY (id);
-ALTER TABLE action.aged_circulation DROP COLUMN usr;
-CREATE INDEX aged_circ_circ_lib_idx ON "action".aged_circulation (circ_lib);
-CREATE INDEX aged_circ_start_idx ON "action".aged_circulation (xact_start);
-CREATE INDEX aged_circ_copy_circ_lib_idx ON "action".aged_circulation (copy_circ_lib);
-CREATE INDEX aged_circ_copy_owning_lib_idx ON "action".aged_circulation (copy_owning_lib);
-CREATE INDEX aged_circ_copy_location_idx ON "action".aged_circulation (copy_location);
-
-CREATE OR REPLACE VIEW action.all_circulation AS
-       SELECT  id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
-               copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
-               circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
-               stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
-               max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
-               max_fine_rule, stop_fines
-         FROM  action.aged_circulation
-                       UNION ALL
-       SELECT  circ.id,COALESCE(a.post_code,b.post_code) AS usr_post_code, p.home_ou AS usr_home_ou, p.profile AS usr_profile, EXTRACT(YEAR FROM p.dob)::INT AS usr_birth_year,
-               cp.call_number AS copy_call_number, cp.location AS copy_location, cn.owning_lib AS copy_owning_lib, cp.circ_lib AS copy_circ_lib,
-               cn.record AS copy_bib_record, circ.xact_start, circ.xact_finish, circ.target_copy, circ.circ_lib, circ.circ_staff, circ.checkin_staff,
-               circ.checkin_lib, circ.renewal_remaining, circ.due_date, circ.stop_fines_time, circ.checkin_time, circ.create_time, circ.duration,
-               circ.fine_interval, circ.recuring_fine, circ.max_fine, circ.phone_renewal, circ.desk_renewal, circ.opac_renewal, circ.duration_rule,
-               circ.recuring_fine_rule, circ.max_fine_rule, circ.stop_fines
-       FROM  action.circulation circ
-             JOIN asset.copy cp ON (circ.target_copy = cp.id)
-               JOIN asset.call_number cn ON (cp.call_number = cn.id)
-               JOIN actor.usr p ON (circ.usr = p.id)
-               LEFT JOIN actor.usr_address a ON (p.mailing_address = a.id)
-               LEFT JOIN actor.usr_address b ON (p.billing_address = a.id);
-
-CREATE OR REPLACE FUNCTION action.age_circ_on_delete () RETURNS TRIGGER AS $$
-BEGIN
-       INSERT INTO action.aged_circulation
-               (id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
-               copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
-               circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
-               stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
-               max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
-               max_fine_rule, stop_fines)
-         SELECT
-               id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
-               copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
-               circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
-               stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
-               max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
-               max_fine_rule, stop_fines
-           FROM action.all_circulation WHERE id = OLD.id;
-
-       RETURN OLD;
-END;
-$$ LANGUAGE 'plpgsql';
-
-CREATE TRIGGER action_circulation_aging_tgr
-       BEFORE DELETE ON action.circulation
-       FOR EACH ROW
-       EXECUTE PROCEDURE action.age_circ_on_delete ();
-
-CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
- SELECT cp.id, COALESCE(sum(c.circ_count), 0::bigint) + COALESCE(count(circ.id), 0::bigint) AS circ_count
-   FROM asset."copy" cp
-   LEFT JOIN extend_reporter.legacy_circ_count c USING (id)
-   LEFT JOIN "action".all_circulation circ ON circ.target_copy = cp.id
-  GROUP BY cp.id;
-
-
-
-CREATE OR REPLACE FUNCTION search.staged_fts (
-
-    param_search_ou INT,
-    param_depth     INT,
-    param_searches  TEXT, -- JSON hash, to be turned into a resultset via search.parse_search_args
-    param_statuses  INT[],
-    param_locations INT[],
-    param_audience  TEXT[],
-    param_language  TEXT[],
-    param_lit_form  TEXT[],
-    param_types     TEXT[],
-    param_forms     TEXT[],
-    param_vformats  TEXT[],
-    param_bib_level TEXT[],
-    param_before    TEXT,
-    param_after     TEXT,
-    param_during    TEXT,
-    param_between   TEXT[],
-    param_pref_lang TEXT,
-    param_pref_lang_multiplier REAL,
-    param_sort      TEXT,
-    param_sort_desc BOOL,
-    metarecord      BOOL,
-    staff           BOOL,
-    param_rel_limit INT,
-    param_chk_limit INT,
-    param_skip_chk  INT
-) RETURNS SETOF search.search_result AS $func$
-DECLARE
-
-    current_res         search.search_result%ROWTYPE;
-    query_part          search.search_args%ROWTYPE;
-    phrase_query_part   search.search_args%ROWTYPE;
-    rank_adjust_id      INT;
-    core_rel_limit      INT;
-    core_chk_limit      INT;
-    core_skip_chk       INT;
-    rank_adjust         search.relevance_adjustment%ROWTYPE;
-    query_table         TEXT;
-    tmp_text            TEXT;
-    tmp_int             INT;
-    current_rank        TEXT;
-    ranks               TEXT[] := '{}';
-    query_table_alias   TEXT;
-    from_alias_array    TEXT[] := '{}';
-    used_ranks          TEXT[] := '{}';
-    mb_field            INT;
-    mb_field_list       INT[];
-    search_org_list     INT[];
-    select_clause       TEXT := 'SELECT';
-    from_clause         TEXT := ' FROM  metabib.metarecord_source_map m JOIN metabib.rec_descriptor mrd ON (m.source = mrd.record) ';
-    where_clause        TEXT := ' WHERE 1=1 ';
-    mrd_used            BOOL := FALSE;
-    sort_desc           BOOL := FALSE;
-
-    core_result         RECORD;
-    core_cursor         REFCURSOR;
-    core_rel_query      TEXT;
-    vis_limit_query     TEXT;
-    inner_where_clause  TEXT;
-
-    total_count         INT := 0;
-    check_count         INT := 0;
-    deleted_count       INT := 0;
-    visible_count       INT := 0;
-    excluded_count      INT := 0;
-
-BEGIN
-
-    core_rel_limit := COALESCE( param_rel_limit, 25000 );
-    core_chk_limit := COALESCE( param_chk_limit, 1000 );
-    core_skip_chk := COALESCE( param_skip_chk, 1 );
-
-    IF metarecord THEN
-        select_clause := select_clause || ' m.metarecord as id, array_accum(distinct m.source) as records,';
-    ELSE
-        select_clause := select_clause || ' m.source as id, array_accum(distinct m.source) as records,';
-    END IF;
-
-    -- first we need to construct the base query
-    FOR query_part IN SELECT * FROM search.parse_search_args(param_searches) WHERE term_type = 'fts_query' LOOP
-
-        inner_where_clause := 'index_vector @@ ' || query_part.term;
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  id INTO mb_field
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-            IF FOUND THEN
-                inner_where_clause := inner_where_clause ||
-                    ' AND ' || 'field = ' || mb_field;
-            END IF;
-
-        END IF;
-
-        -- moving on to the rank ...
-        SELECT  * INTO query_part
-          FROM  search.parse_search_args(param_searches)
-          WHERE term_type = 'fts_rank'
-                AND table_alias = query_part.table_alias;
-
-        current_rank := query_part.term || ' * ' || query_part.table_alias || '_weight.weight';
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-        ELSE
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class;
-
-        END IF;
-
-        FOR rank_adjust IN SELECT * FROM search.relevance_adjustment WHERE active AND field IN ( SELECT * FROM search.explode_array( mb_field_list ) ) LOOP
-
-            IF NOT rank_adjust.bump_type = ANY (used_ranks) THEN
-
-                IF rank_adjust.bump_type = 'first_word' THEN
-                    SELECT  term INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word'
-                      ORDER BY id
-                      LIMIT 1;
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'word_order' THEN
-                    SELECT  array_to_string( array_accum( term ), '%' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( '%' || tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'full_match' THEN
-                    SELECT  array_to_string( array_accum( term ), E'\\s+' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value  ~ ' || quote_literal( '^' || tmp_text || E'\\W*$' );
-
-                END IF;
-
-
-                IF tmp_text IS NOT NULL THEN
-                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
-                END IF;
-
-                used_ranks := array_append( used_ranks, rank_adjust.bump_type );
-
-            END IF;
-
-        END LOOP;
-
-        ranks := array_append( ranks, current_rank );
-        used_ranks := '{}';
-
-        FOR phrase_query_part IN
-            SELECT  * 
-              FROM  search.parse_search_args(param_searches)
-              WHERE term_type = 'phrase'
-                    AND table_alias = query_part.table_alias LOOP
-
-            tmp_text := replace( phrase_query_part.term, '*', E'\\*' );
-            tmp_text := replace( tmp_text, '?', E'\\?' );
-            tmp_text := replace( tmp_text, '+', E'\\+' );
-            tmp_text := replace( tmp_text, '|', E'\\|' );
-            tmp_text := replace( tmp_text, '(', E'\\(' );
-            tmp_text := replace( tmp_text, ')', E'\\)' );
-            tmp_text := replace( tmp_text, '[', E'\\[' );
-            tmp_text := replace( tmp_text, ']', E'\\]' );
-
-            inner_where_clause := inner_where_clause || ' AND ' || 'value  ~* ' || quote_literal( E'(^|\\W+)' || regexp_replace(tmp_text, E'\\s+',E'\\\\s+','g') || E'(\\W+|\$)' );
-
-        END LOOP;
-
-        query_table := search.pick_table(query_part.field_class);
-
-        from_clause := from_clause ||
-            ' JOIN ( SELECT * FROM ' || query_table || ' WHERE ' || inner_where_clause ||
-                    CASE WHEN core_rel_limit > 0 THEN ' LIMIT ' || core_rel_limit::TEXT ELSE '' END || ' ) AS ' || query_part.table_alias ||
-                ' ON ( m.source = ' || query_part.table_alias || '.source )' ||
-            ' JOIN config.metabib_field AS ' || query_part.table_alias || '_weight' ||
-                ' ON ( ' || query_part.table_alias || '.field = ' || query_part.table_alias || '_weight.id  AND  ' || query_part.table_alias || '_weight.search_field)';
-
-        from_alias_array := array_append(from_alias_array, query_part.table_alias);
-
-    END LOOP;
-
-    IF param_pref_lang IS NOT NULL AND param_pref_lang_multiplier IS NOT NULL THEN
-        current_rank := ' CASE WHEN mrd.item_lang = ' || quote_literal( param_pref_lang ) ||
-            ' THEN ' || param_pref_lang_multiplier || '::REAL ELSE 1.0 END ';
-
-        -- ranks := array_append( ranks, current_rank );
-    END IF;
-
-    current_rank := ' AVG( ( (' || array_to_string( ranks, ') + (' ) || ') ) * ' || current_rank || ' ) ';
-    select_clause := select_clause || current_rank || ' AS rel,';
-
-    sort_desc = param_sort_desc;
-
-    IF param_sort = 'pubdate' THEN
-
-        tmp_text := '999999';
-        IF param_sort_desc THEN tmp_text := '0'; END IF;
-
-        current_rank := $$ COALESCE( FIRST(NULLIF(REGEXP_REPLACE(mrd.date1, E'\\D+', '9', 'g'),'')), $$ || quote_literal(tmp_text) || $$ )::INT $$;
-
-    ELSIF param_sort = 'title' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(SUBSTR( frt.value, COALESCE(SUBSTRING(frt.ind2 FROM E'\\d+'),'0')::INT + 1 ))
-                  FROM  metabib.full_rec frt
-                  WHERE frt.record = m.source
-                    AND frt.tag = '245'
-                    AND frt.subfield = 'a'
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'author' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(fra.value)
-                  FROM  metabib.full_rec fra
-                  WHERE fra.record = m.source
-                    AND fra.tag LIKE '1%'
-                    AND fra.subfield = 'a'
-                  ORDER BY fra.tag::text::int
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'create_date' THEN
-            current_rank := $$( FIRST (( SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSIF param_sort = 'edit_date' THEN
-            current_rank := $$( FIRST (( SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSE
-        sort_desc := NOT COALESCE(param_sort_desc, FALSE);
-    END IF;
-
-    select_clause := select_clause || current_rank || ' AS rank';
-
-    -- now add the other qualifiers
-    IF param_audience IS NOT NULL AND array_upper(param_audience, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.audience IN ('$$ || array_to_string(param_audience, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_language IS NOT NULL AND array_upper(param_language, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_lang IN ('$$ || array_to_string(param_language, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_lit_form IS NOT NULL AND array_upper(param_lit_form, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.lit_form IN ('$$ || array_to_string(param_lit_form, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_types IS NOT NULL AND array_upper(param_types, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_type IN ('$$ || array_to_string(param_types, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_forms IS NOT NULL AND array_upper(param_forms, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_form IN ('$$ || array_to_string(param_forms, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_vformats IS NOT NULL AND array_upper(param_vformats, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.vr_format IN ('$$ || array_to_string(param_vformats, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_bib_level IS NOT NULL AND array_upper(param_bib_level, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.bib_level IN ('$$ || array_to_string(param_bib_level, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_before IS NOT NULL AND param_before <> '' THEN
-        where_clause = where_clause || $$ AND mrd.date1 <= $$ || quote_literal(param_before) || ' ';
-    END IF;
-
-    IF param_after IS NOT NULL AND param_after <> '' THEN
-        where_clause = where_clause || $$ AND mrd.date1 >= $$ || quote_literal(param_after) || ' ';
-    END IF;
-
-    IF param_during IS NOT NULL AND param_during <> '' THEN
-        where_clause = where_clause || $$ AND $$ || quote_literal(param_during) || $$ BETWEEN mrd.date1 AND mrd.date2 $$;
-    END IF;
-
-    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 1 THEN
-        where_clause = where_clause || $$ AND mrd.date1 BETWEEN '$$ || array_to_string(param_between, $$' AND '$$) || $$' $$;
-    END IF;
-
-    core_rel_query := select_clause || from_clause || where_clause ||
-                        ' GROUP BY 1 ORDER BY 4' || CASE WHEN sort_desc THEN ' DESC' ELSE ' ASC' END || ';';
-    --RAISE NOTICE 'Base Query:  %', core_rel_query;
-
-    IF param_search_ou > 0 THEN
-        IF param_depth IS NOT NULL THEN
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
-        ELSE
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
-        END IF;
-    ELSIF param_search_ou < 0 THEN
-        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
-    ELSIF param_search_ou = 0 THEN
-        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
-    END IF;
-
-    OPEN core_cursor FOR EXECUTE core_rel_query;
-
-    LOOP
-
-        FETCH core_cursor INTO core_result;
-        EXIT WHEN NOT FOUND;
-
-
-        IF total_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % total, % checked so far ... ', total_count, check_count;
-        END IF;
-
-        IF core_chk_limit > 0 AND total_count - core_skip_chk + 1 >= core_chk_limit THEN
-            total_count := total_count + 1;
-            CONTINUE;
-        END IF;
-
-        total_count := total_count + 1;
-
-        CONTINUE WHEN param_skip_chk IS NOT NULL and total_count < param_skip_chk;
-
-        check_count := check_count + 1;
-
-        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-        IF NOT FOUND THEN
-            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
-            deleted_count := deleted_count + 1;
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  biblio.record_entry b
-                JOIN config.bib_source s ON (b.source = s.id)
-          WHERE s.transcendant
-                AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
-
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
-
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
-
-            RETURN NEXT current_res;
-
-            CONTINUE;
-        END IF;
-
-        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.status IN ( SELECT * FROM search.explode_array( param_statuses ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.location IN ( SELECT * FROM search.explode_array( param_locations ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all copy_location-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF staff IS NULL OR NOT staff THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cs.opac_visible
-                    AND cl.opac_visible
-                    AND cp.opac_visible
-                    AND a.opac_visible
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        ELSE
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-
-                PERFORM 1
-                  FROM  asset.call_number cn
-                  WHERE cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                  LIMIT 1;
-
-                IF FOUND THEN
-                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-
-            END IF;
-
-        END IF;
-
-        visible_count := visible_count + 1;
-
-        current_res.id = core_result.id;
-        current_res.rel = core_result.rel;
-
-        tmp_int := 1;
-        IF metarecord THEN
-            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-        END IF;
-
-        IF tmp_int = 1 THEN
-            current_res.record = core_result.records[1];
-        ELSE
-            current_res.record = NULL;
-        END IF;
-
-        RETURN NEXT current_res;
-
-        IF visible_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % visible so far ... ', visible_count;
-        END IF;
-
-    END LOOP;
-
-    current_res.id = NULL;
-    current_res.rel = NULL;
-    current_res.record = NULL;
-    current_res.total = total_count;
-    current_res.checked = check_count;
-    current_res.deleted = deleted_count;
-    current_res.visible = visible_count;
-    current_res.excluded = excluded_count;
-
-    CLOSE core_cursor;
-
-    RETURN NEXT current_res;
-
-END;
-$func$ LANGUAGE PLPGSQL;
-
--- This index, right here, is the reason for this change.
-DROP INDEX IF EXISTS metabib.metabib_full_rec_value_idx;
-
--- So, on to it.
--- Move the table out of the way ...
-ALTER TABLE metabib.full_rec RENAME TO real_full_rec;
-
--- ... and let the trigger management functions know about the change ...
-CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
-    DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$
-
-    TRUNCATE TABLE reporter.materialized_simple_record;
-
-    INSERT INTO reporter.materialized_simple_record
-        (id,fingerprint,quality,tcn_source,tcn_value,title,author,publisher,pubdate,isbn,issn)
-        SELECT DISTINCT ON (id) * FROM reporter.old_super_simple_record;
-
-    CREATE TRIGGER zzz_update_materialized_simple_record_tgr
-        AFTER INSERT OR UPDATE OR DELETE ON metabib.real_full_rec
-        FOR EACH ROW EXECUTE PROCEDURE reporter.simple_rec_sync();
-
-$$ LANGUAGE SQL;
-
--- ... replace the table with a suitable view, which applies the index contstraint we'll use ...
-CREATE OR REPLACE VIEW metabib.full_rec AS
-    SELECT  id,
-            record,
-            tag,
-            ind1,
-            ind2,
-            subfield,
-            SUBSTRING(value,1,1024) AS value,
-            index_vector
-      FROM  metabib.real_full_rec;
-
--- ... now some rules to transform DML against the view into DML against the underlying table ...
-CREATE OR REPLACE RULE metabib_full_rec_insert_rule
-    AS ON INSERT TO metabib.full_rec
-    DO INSTEAD
-    INSERT INTO metabib.real_full_rec VALUES (
-        COALESCE(NEW.id, NEXTVAL('metabib.full_rec_id_seq'::REGCLASS)),
-        NEW.record,
-        NEW.tag,
-        NEW.ind1,
-        NEW.ind2,
-        NEW.subfield,
-        NEW.value,
-        NEW.index_vector
-    );
-
-CREATE OR REPLACE RULE metabib_full_rec_update_rule
-    AS ON UPDATE TO metabib.full_rec
-    DO INSTEAD
-    UPDATE  metabib.real_full_rec SET
-        id = NEW.id,
-        record = NEW.record,
-        tag = NEW.tag,
-        ind1 = NEW.ind1,
-        ind2 = NEW.ind2,
-        subfield = NEW.subfield,
-        value = NEW.value,
-        index_vector = NEW.index_vector
-      WHERE id = OLD.id;
-
-CREATE OR REPLACE RULE metabib_full_rec_delete_rule
-    AS ON DELETE TO metabib.full_rec
-    DO INSTEAD
-    DELETE FROM metabib.real_full_rec WHERE id = OLD.id;
-
--- ... and last, but not least, create a fore-shortened index on the value column.
-CREATE INDEX metabib_full_rec_value_idx ON metabib.real_full_rec (substring(value,1,1024));
-
-
-CREATE OR REPLACE FUNCTION explode_array(anyarray) RETURNS SETOF anyelement AS $BODY$
-    SELECT ($1)[s] FROM generate_series(1, array_upper($1, 1)) AS s;
-$BODY$
-LANGUAGE 'sql' IMMUTABLE;
-
--- NOTE: current config.item_type should get sip2_media_type and magnetic_media columns
-
--- New table needed to handle circ modifiers inside the DB.  Will still require
--- central admin.  The circ_modifier column on asset.copy will become an fkey to this table.
-CREATE TABLE config.circ_modifier (
-       code                    TEXT    PRIMARY KEY,
-       name            TEXT    UNIQUE NOT NULL,
-       description         TEXT        NOT NULL,
-       sip2_media_type TEXT    NOT NULL,
-       magnetic_media  BOOL    NOT NULL DEFAULT TRUE
-);
-
-UPDATE asset.copy SET circ_modifier = UPPER(circ_modifier) WHERE circ_modifier IS NOT NULL AND circ_modifier <> '';
-UPDATE asset.copy SET circ_modifier = NULL WHERE circ_modifier = '';
-
-INSERT INTO config.circ_modifier (code, name, description, sip2_media_type )
-    SELECT DISTINCT
-            UPPER(circ_modifier),
-            UPPER(circ_modifier),
-            LOWER(circ_modifier),
-            '001'
-      FROM  asset.copy
-      WHERE circ_modifier IS NOT NULL;
-
--- add an fkey pointing to the new circ mod table
-ALTER TABLE asset.copy ADD CONSTRAINT circ_mod_fkey FOREIGN KEY (circ_modifier) REFERENCES config.circ_modifier (code) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
-
--- config table to hold the vr_format names
-CREATE TABLE config.videorecording_format_map (
-       code    TEXT    PRIMARY KEY,
-       value   TEXT    NOT NULL
-);
-
-INSERT INTO config.videorecording_format_map VALUES ('a','Beta');
-INSERT INTO config.videorecording_format_map VALUES ('b','VHS');
-INSERT INTO config.videorecording_format_map VALUES ('c','U-matic');
-INSERT INTO config.videorecording_format_map VALUES ('d','EIAJ');
-INSERT INTO config.videorecording_format_map VALUES ('e','Type C');
-INSERT INTO config.videorecording_format_map VALUES ('f','Quadruplex');
-INSERT INTO config.videorecording_format_map VALUES ('g','Laserdisc');
-INSERT INTO config.videorecording_format_map VALUES ('h','CED');
-INSERT INTO config.videorecording_format_map VALUES ('i','Betacam');
-INSERT INTO config.videorecording_format_map VALUES ('j','Betacam SP');
-INSERT INTO config.videorecording_format_map VALUES ('k','Super-VHS');
-INSERT INTO config.videorecording_format_map VALUES ('m','M-II');
-INSERT INTO config.videorecording_format_map VALUES ('o','D-2');
-INSERT INTO config.videorecording_format_map VALUES ('p','8 mm.');
-INSERT INTO config.videorecording_format_map VALUES ('q','Hi-8 mm.');
-INSERT INTO config.videorecording_format_map VALUES ('u','Unknown');
-INSERT INTO config.videorecording_format_map VALUES ('v','DVD');
-INSERT INTO config.videorecording_format_map VALUES ('z','Other');
-
-CREATE TABLE config.circ_matrix_matchpoint (
-       id                      SERIAL  PRIMARY KEY,
-       active                  BOOL    NOT NULL DEFAULT TRUE,
-       org_unit                INT     NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,  -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       grp                     INT     NOT NULL REFERENCES permission.grp_tree (id) DEFERRABLE INITIALLY DEFERRED,     -- Set to the top applicable group from the group tree; will need descendents and prox functions for filtering
-       circ_modifier   TEXT    REFERENCES config.circ_modifier (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_type               TEXT    REFERENCES config.item_type_map (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_form               TEXT    REFERENCES config.item_form_map (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_vr_format  TEXT    REFERENCES config.videorecording_format_map (code) DEFERRABLE INITIALLY DEFERRED,
-       ref_flag                BOOL,
-       is_renewal      BOOL,
-       usr_age_lower_bound     INTERVAL,
-       usr_age_upper_bound     INTERVAL,
-       CONSTRAINT ep_once_per_grp_loc_mod_marc UNIQUE (grp, org_unit, circ_modifier, marc_type, marc_form, marc_vr_format, ref_flag, usr_age_lower_bound, usr_age_upper_bound, is_renewal)
-);
-INSERT INTO config.circ_matrix_matchpoint (org_unit,grp) VALUES (1,1);
-
-
--- Tests to determine if circ can occur for this item at this location for this patron
-CREATE TABLE config.circ_matrix_test (
-       matchpoint      INT     PRIMARY KEY NOT NULL REFERENCES config.circ_matrix_matchpoint (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       circulate       BOOL    NOT NULL DEFAULT TRUE,  -- Hard "can't circ" flag requiring an override
-       max_items_out   INT,                            -- Total current active circulations must be less than this, NULL means skip (always pass)
-       max_overdue     INT,                            -- Total overdue active circulations must be less than this, NULL means skip (always pass)
-       max_fines       NUMERIC(8,2),                   -- Total fines owed must be less than this, NULL means skip (always pass)
-       org_depth       INT,                            -- Set to the top OU for the max-out applicability range
-       script_test     TEXT                            -- filename or javascript source ??
-);
-
--- Tests for max items out by circ_modifier
-CREATE TABLE config.circ_matrix_circ_mod_test (
-       id          SERIAL     PRIMARY KEY,
-       matchpoint  INT     NOT NULL REFERENCES config.circ_matrix_matchpoint (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       items_out   INT     NOT NULL,                           -- Total current active circulations must be less than this, NULL means skip (always pass)
-       circ_mod    TEXT    NOT NULL REFERENCES config.circ_modifier (code) ON DELETE CASCADE ON UPDATE CASCADE  DEFERRABLE INITIALLY DEFERRED-- circ_modifier type that the max out applies to
-);
-
-
--- How to circ, assuming tests pass
-CREATE TABLE config.circ_matrix_ruleset (
-       matchpoint              INT     PRIMARY KEY REFERENCES config.circ_matrix_matchpoint (id) DEFERRABLE INITIALLY DEFERRED,
-       duration_rule           INT     NOT NULL REFERENCES config.rule_circ_duration (id) DEFERRABLE INITIALLY DEFERRED,
-       recurring_fine_rule     INT     NOT NULL REFERENCES config.rule_recuring_fine (id) DEFERRABLE INITIALLY DEFERRED,
-       max_fine_rule           INT     NOT NULL REFERENCES config.rule_max_fine (id) DEFERRABLE INITIALLY DEFERRED
-);
-
-CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS INT AS $func$
-DECLARE
-       current_group   permission.grp_tree%ROWTYPE;
-       user_object     actor.usr%ROWTYPE;
-       item_object     asset.copy%ROWTYPE;
-       rec_descriptor  metabib.rec_descriptor%ROWTYPE;
-       current_mp      config.circ_matrix_matchpoint%ROWTYPE;
-       matchpoint      config.circ_matrix_matchpoint%ROWTYPE;
-BEGIN
-       SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-       SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-       SELECT INTO rec_descriptor r.* FROM metabib.rec_descriptor r JOIN asset.call_number c USING (record) WHERE c.id = item_object.call_number;
-       SELECT INTO current_group * FROM permission.grp_tree WHERE id = user_object.profile;
-
-       LOOP 
-               -- for each potential matchpoint for this ou and group ...
-               FOR current_mp IN
-                       SELECT  m.*
-                         FROM  config.circ_matrix_matchpoint m
-                               JOIN actor.org_unit_ancestors( context_ou ) d ON (m.org_unit = d.id)
-                               LEFT JOIN actor.org_unit_proximity p ON (p.from_org = context_ou AND p.to_org = d.id)
-                         WHERE m.grp = current_group.id AND m.active
-                         ORDER BY      CASE WHEN p.prox                IS NULL THEN 999 ELSE p.prox END,
-                                       CASE WHEN m.is_renewal = renewal        THEN 64 ELSE 0 END +
-                                       CASE WHEN m.circ_modifier       IS NOT NULL THEN 32 ELSE 0 END +
-                                       CASE WHEN m.marc_type           IS NOT NULL THEN 16 ELSE 0 END +
-                                       CASE WHEN m.marc_form           IS NOT NULL THEN 8 ELSE 0 END +
-                                       CASE WHEN m.marc_vr_format      IS NOT NULL THEN 4 ELSE 0 END +
-                                       CASE WHEN m.ref_flag            IS NOT NULL THEN 2 ELSE 0 END +
-                                       CASE WHEN m.usr_age_lower_bound IS NOT NULL THEN 0.5 ELSE 0 END +
-                                       CASE WHEN m.usr_age_upper_bound IS NOT NULL THEN 0.5 ELSE 0 END DESC LOOP
-
-                       IF current_mp.circ_modifier IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
-                       END IF;
-
-                       IF current_mp.marc_type IS NOT NULL THEN
-                               IF item_object.circ_as_type IS NOT NULL THEN
-                                       CONTINUE WHEN current_mp.marc_type <> item_object.circ_as_type;
-                               ELSE
-                                       CONTINUE WHEN current_mp.marc_type <> rec_descriptor.item_type;
-                               END IF;
-                       END IF;
-
-                       IF current_mp.marc_form IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.marc_form <> rec_descriptor.item_form;
-                       END IF;
-
-                       IF current_mp.marc_vr_format IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.marc_vr_format <> rec_descriptor.vr_format;
-                       END IF;
-
-                       IF current_mp.ref_flag IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.ref_flag <> item_object.ref;
-                       END IF;
-
-                       IF current_mp.usr_age_lower_bound IS NOT NULL THEN
-                               CONTINUE WHEN user_object.dob IS NULL OR current_mp.usr_age_lower_bound < age(user_object.dob);
-                       END IF;
-
-                       IF current_mp.usr_age_upper_bound IS NOT NULL THEN
-                               CONTINUE WHEN user_object.dob IS NULL OR current_mp.usr_age_upper_bound > age(user_object.dob);
-                       END IF;
-
-
-                       -- everything was undefined or matched
-                       matchpoint = current_mp;
-
-                       EXIT WHEN matchpoint.id IS NOT NULL;
-               END LOOP;
-
-               EXIT WHEN current_group.parent IS NULL OR matchpoint.id IS NOT NULL;
-
-               SELECT INTO current_group * FROM permission.grp_tree WHERE id = current_group.parent;
-       END LOOP;
-
-       RETURN matchpoint.id;
-END;
-$func$ LANGUAGE plpgsql;
-
-
-CREATE TYPE action.matrix_test_result AS ( success BOOL, matchpoint INT, fail_part TEXT );
-CREATE OR REPLACE FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
-DECLARE
-       matchpoint_id           INT;
-       user_object             actor.usr%ROWTYPE;
-       item_object             asset.copy%ROWTYPE;
-       item_status_object      config.copy_status%ROWTYPE;
-       item_location_object    asset.copy_location%ROWTYPE;
-       result                  action.matrix_test_result;
-       circ_test               config.circ_matrix_test%ROWTYPE;
-       out_by_circ_mod         config.circ_matrix_circ_mod_test%ROWTYPE;
-       items_out               INT;
-       items_overdue           INT;
-       overdue_orgs            INT[];
-       current_fines           NUMERIC(8,2) := 0.0;
-       tmp_fines               NUMERIC(8,2);
-       tmp_groc                RECORD;
-       tmp_circ                RECORD;
-       done                    BOOL := FALSE;
-BEGIN
-       result.success := TRUE;
-
-       -- Fail if the user is BARRED
-       SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-
-       -- Fail if we couldn't find a user
-       IF user_object.id IS NULL THEN
-               result.fail_part := 'no_user';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-               RETURN;
-       END IF;
-
-       IF user_object.barred IS TRUE THEN
-               result.fail_part := 'actor.usr.barred';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       -- Fail if the item can't circulate
-       SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-       IF item_object.circulate IS FALSE THEN
-               result.fail_part := 'asset.copy.circulate';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       -- Fail if the item isn't in a circulateable status on a non-renewal
-       IF NOT renewal AND item_object.status NOT IN ( 0, 7, 8 ) THEN 
-               result.fail_part := 'asset.copy.status';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       ELSIF renewal AND item_object.status <> 1 THEN
-               result.fail_part := 'asset.copy.status';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       -- Fail if the item can't circulate because of the shelving location
-       SELECT INTO item_location_object * FROM asset.copy_location WHERE id = item_object.location;
-       IF item_location_object.circulate IS FALSE THEN
-               result.fail_part := 'asset.copy_location.circulate';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       SELECT INTO matchpoint_id action.find_circ_matrix_matchpoint(circ_ou, match_item, match_user, renewal);
-       result.matchpoint := matchpoint_id;
-
-       SELECT INTO circ_test * from config.circ_matrix_test WHERE matchpoint = result.matchpoint;
-
-       IF circ_test.org_depth IS NOT NULL THEN
-               SELECT INTO overdue_orgs ARRAY_ACCUM(id) FROM actor.org_unit_descendants( circ_ou, circ_test.org_depth );
-       END IF; 
-
-       -- Fail if we couldn't find a set of tests
-       IF result.matchpoint IS NULL THEN
-               result.fail_part := 'no_matchpoint';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       -- Fail if the test is set to hard non-circulating
-       IF circ_test.circulate IS FALSE THEN
-               result.fail_part := 'config.circ_matrix_test.circulate';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       -- Fail if the user has too many items checked out
-       IF circ_test.max_items_out IS NOT NULL THEN
-       SELECT  INTO items_out COUNT(*)
-          FROM  action.circulation
-          WHERE usr = match_user
-                AND (circ_test.org_depth IS NULL OR (circ_test.org_depth IS NOT NULL AND circ_lib IN ( SELECT * FROM explode_array(overdue_orgs) )))
-                AND checkin_time IS NULL
-                AND (stop_fines IN ('MAXFINES','LONGOVERDUE') OR stop_fines IS NULL);
-               IF items_out >= circ_test.max_items_out THEN
-                       result.fail_part := 'config.circ_matrix_test.max_items_out';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END IF;
-
-       -- Fail if the user has too many items with specific circ_modifiers checked out
-       FOR out_by_circ_mod IN SELECT * FROM config.circ_matrix_circ_mod_test WHERE matchpoint = matchpoint_id LOOP
-               SELECT  INTO items_out COUNT(*)
-                 FROM  action.circulation circ
-                       JOIN asset.copy cp ON (cp.id = circ.target_copy)
-                 WHERE circ.usr = match_user
-                       AND (circ_test.org_depth IS NULL OR (circ_test.org_depth IS NOT NULL AND circ_lib IN ( SELECT * FROM explode_array(overdue_orgs) )))
-                       AND circ.checkin_time IS NULL
-                       AND (circ.stop_fines IN ('MAXFINES','LONGOVERDUE') OR circ.stop_fines IS NULL)
-                       AND cp.circ_modifier = out_by_circ_mod.circ_mod;
-               IF items_out >= out_by_circ_mod.items_out THEN
-                       result.fail_part := 'config.circ_matrix_circ_mod_test';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END LOOP;
-
-       -- Fail if the user has too many overdue items
-       IF circ_test.max_overdue IS NOT NULL THEN
-               SELECT  INTO items_overdue COUNT(*)
-                 FROM  action.circulation
-                 WHERE usr = match_user
-                       AND (circ_test.org_depth IS NULL OR (circ_test.org_depth IS NOT NULL AND circ_lib IN ( SELECT * FROM explode_array(overdue_orgs) )))
-                       AND checkin_time IS NULL
-                       AND due_date < NOW()
-                        AND (stop_fines IN ('MAXFINES','LONGOVERDUE') OR stop_fines IS NULL);
-               IF items_overdue >= circ_test.max_overdue THEN
-                       result.fail_part := 'config.circ_matrix_test.max_overdue';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END IF;
-
-       -- Fail if the user has a high fine balance
-       IF circ_test.max_fines IS NOT NULL THEN
-               FOR tmp_groc IN SELECT * FROM money.grocery WHERE usr = match_usr AND xact_finish IS NULL AND (circ_test.org_depth IS NULL OR (circ_test.org_depth IS NOT NULL AND billing_location IN ( SELECT * FROM explode_array(overdue_orgs) ))) LOOP
-                       SELECT INTO tmp_fines SUM( amount ) FROM money.billing WHERE xact = tmp_groc.id AND NOT voided;
-                       current_fines = current_fines + COALESCE(tmp_fines, 0.0);
-                       SELECT INTO tmp_fines SUM( amount ) FROM money.payment WHERE xact = tmp_groc.id AND NOT voided;
-                       current_fines = current_fines - COALESCE(tmp_fines, 0.0);
-               END LOOP;
-
-               FOR tmp_circ IN SELECT * FROM action.circulation WHERE usr = match_usr AND xact_finish IS NULL AND (circ_test.org_depth IS NULL OR (circ_test.org_depth IS NOT NULL AND circ_lib IN ( SELECT * FROM explode_array(overdue_orgs) ))) LOOP
-                       SELECT INTO tmp_fines SUM( amount ) FROM money.billing WHERE xact = tmp_circ.id AND NOT voided;
-                       current_fines = current_fines + COALESCE(tmp_fines, 0.0);
-                       SELECT INTO tmp_fines SUM( amount ) FROM money.payment WHERE xact = tmp_circ.id AND NOT voided;
-                       current_fines = current_fines - COALESCE(tmp_fines, 0.0);
-               END LOOP;
-
-               IF current_fines >= circ_test.max_fines THEN
-                       result.fail_part := 'config.circ_matrix_test.max_fines';
-                       result.success := FALSE;
-                       RETURN NEXT result;
-                       done := TRUE;
-               END IF;
-       END IF;
-
-       -- If we passed everything, return the successful matchpoint id
-       IF NOT done THEN
-               RETURN NEXT result;
-       END IF;
-
-       RETURN;
-END;
-$func$ LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION action.item_user_circ_test( INT, BIGINT, INT ) RETURNS SETOF action.matrix_test_result AS $func$
-       SELECT * FROM action.item_user_circ_test( $1, $2, $3, FALSE );
-$func$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION action.item_user_renew_test( INT, BIGINT, INT ) RETURNS SETOF action.matrix_test_result AS $func$
-       SELECT * FROM action.item_user_circ_test( $1, $2, $3, TRUE );
-$func$ LANGUAGE SQL;
-
-
-CREATE TABLE config.hold_matrix_matchpoint (
-       id                      SERIAL      PRIMARY KEY,
-       active                  BOOL    NOT NULL DEFAULT TRUE,
-       user_home_ou    INT         REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,       -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       request_ou              INT         REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,       -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       pickup_ou               INT         REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,       -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       item_owning_ou  INT         REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,       -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       item_circ_ou    INT         REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,       -- Set to the top OU for the matchpoint applicability range; we can use org_unit_prox to choose the "best"
-       usr_grp                 INT         REFERENCES permission.grp_tree (id) DEFERRABLE INITIALLY DEFERRED,  -- Set to the top applicable group from the group tree; will need descendents and prox functions for filtering
-       requestor_grp   INT         NOT NULL REFERENCES permission.grp_tree (id) DEFERRABLE INITIALLY DEFERRED, -- Set to the top applicable group from the group tree; will need descendents and prox functions for filtering
-       circ_modifier   TEXT    REFERENCES config.circ_modifier (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_type               TEXT    REFERENCES config.item_type_map (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_form               TEXT    REFERENCES config.item_form_map (code) DEFERRABLE INITIALLY DEFERRED,
-       marc_vr_format  TEXT    REFERENCES config.videorecording_format_map (code) DEFERRABLE INITIALLY DEFERRED,
-       ref_flag                BOOL,
-       CONSTRAINT hous_once_per_grp_loc_mod_marc UNIQUE (user_home_ou, request_ou, pickup_ou, item_owning_ou, item_circ_ou, requestor_grp, usr_grp, circ_modifier, marc_type, marc_form, marc_vr_format)
-);
-INSERT INTO config.hold_matrix_matchpoint (requestor_grp) VALUES (1);
-
-
--- Tests to determine if hold against a specific copy is possible for a user at (and from) a location
-CREATE TABLE config.hold_matrix_test (
-       matchpoint                      INT     PRIMARY KEY REFERENCES config.hold_matrix_matchpoint (id) DEFERRABLE INITIALLY DEFERRED,
-       holdable                        BOOL    NOT NULL DEFAULT TRUE,                          -- Hard "can't hold" flag requiring an override
-       distance_is_from_owner  BOOL    NOT NULL DEFAULT FALSE,                         -- How to calculate transit_range.  True means owning lib, false means copy circ lib
-       transit_range               INT REFERENCES actor.org_unit_type (id) DEFERRABLE INITIALLY DEFERRED,              -- Can circ inside range of cn.owner/cp.circ_lib at depth of the org_unit_type specified here
-       max_holds                       INT,                                                    -- Total hold requests must be less than this, NULL means skip (always pass)
-       include_frozen_holds    BOOL    NOT NULL DEFAULT TRUE,                          -- Include frozen hold requests in the count for max_holds test
-       stop_blocked_user       BOOL    NOT NULL DEFAULT FALSE,                         -- Stop users who cannot check out items from placing holds
-       age_hold_protect_rule   INT     REFERENCES config.rule_age_hold_protect (id) DEFERRABLE INITIALLY DEFERRED      -- still not sure we want to move this off the copy
-);
-
-CREATE OR REPLACE FUNCTION action.find_hold_matrix_matchpoint( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS INT AS $func$
-DECLARE
-       current_requestor_group permission.grp_tree%ROWTYPE;
-       root_ou                 actor.org_unit%ROWTYPE;
-       requestor_object        actor.usr%ROWTYPE;
-       user_object             actor.usr%ROWTYPE;
-       item_object             asset.copy%ROWTYPE;
-       item_cn_object          asset.call_number%ROWTYPE;
-       rec_descriptor          metabib.rec_descriptor%ROWTYPE;
-       current_mp_weight       FLOAT;
-       matchpoint_weight       FLOAT;
-       tmp_weight              FLOAT;
-       current_mp              config.hold_matrix_matchpoint%ROWTYPE;
-       matchpoint              config.hold_matrix_matchpoint%ROWTYPE;
-BEGIN
-       SELECT INTO root_ou * FROM actor.org_unit WHERE parent_ou IS NULL;
-       SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-       SELECT INTO requestor_object * FROM actor.usr WHERE id = match_requestor;
-       SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-       SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
-       SELECT INTO rec_descriptor r.* FROM metabib.rec_descriptor r WHERE r.record = item_cn_object.record;
-       SELECT INTO current_requestor_group * FROM permission.grp_tree WHERE id = requestor_object.profile;
-
-       LOOP 
-               -- for each potential matchpoint for this ou and group ...
-               FOR current_mp IN
-                       SELECT  m.*
-                         FROM  config.hold_matrix_matchpoint m
-                         WHERE m.requestor_grp = current_requestor_group.id AND m.active
-                         ORDER BY      CASE WHEN m.circ_modifier       IS NOT NULL THEN 16 ELSE 0 END +
-                                       CASE WHEN m.marc_type           IS NOT NULL THEN 8 ELSE 0 END +
-                                       CASE WHEN m.marc_form           IS NOT NULL THEN 4 ELSE 0 END +
-                                       CASE WHEN m.marc_vr_format      IS NOT NULL THEN 2 ELSE 0 END +
-                                       CASE WHEN m.ref_flag            IS NOT NULL THEN 1 ELSE 0 END DESC LOOP
-
-                       current_mp_weight := 5.0;
-
-                       IF current_mp.circ_modifier IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
-                       END IF;
-
-                       IF current_mp.marc_type IS NOT NULL THEN
-                               IF item_object.circ_as_type IS NOT NULL THEN
-                                       CONTINUE WHEN current_mp.marc_type <> item_object.circ_as_type;
-                               ELSE
-                                       CONTINUE WHEN current_mp.marc_type <> rec_descriptor.item_type;
-                               END IF;
-                       END IF;
-
-                       IF current_mp.marc_form IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.marc_form <> rec_descriptor.item_form;
-                       END IF;
-
-                       IF current_mp.marc_vr_format IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.marc_vr_format <> rec_descriptor.vr_format;
-                       END IF;
-
-                       IF current_mp.ref_flag IS NOT NULL THEN
-                               CONTINUE WHEN current_mp.ref_flag <> item_object.ref;
-                       END IF;
-
-
-                       -- caclulate the rule match weight
-                       IF current_mp.item_owning_ou IS NOT NULL AND current_mp.item_owning_ou <> root_ou.id THEN
-                               SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.item_owning_ou, item_cn_object.owning_lib)::FLOAT + 1.0)::FLOAT;
-                               current_mp_weight := current_mp_weight - tmp_weight;
-                       END IF; 
-
-                       IF current_mp.item_circ_ou IS NOT NULL AND current_mp.item_circ_ou <> root_ou.id THEN
-                               SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.item_circ_ou, item_object.circ_lib)::FLOAT + 1.0)::FLOAT;
-                               current_mp_weight := current_mp_weight - tmp_weight;
-                       END IF; 
-
-                       IF current_mp.pickup_ou IS NOT NULL AND current_mp.pickup_ou <> root_ou.id THEN
-                               SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.pickup_ou, pickup_ou)::FLOAT + 1.0)::FLOAT;
-                               current_mp_weight := current_mp_weight - tmp_weight;
-                       END IF; 
-
-                       IF current_mp.request_ou IS NOT NULL AND current_mp.request_ou <> root_ou.id THEN
-                               SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.request_ou, request_ou)::FLOAT + 1.0)::FLOAT;
-                               current_mp_weight := current_mp_weight - tmp_weight;
-                       END IF; 
-
-                       IF current_mp.user_home_ou IS NOT NULL AND current_mp.user_home_ou <> root_ou.id THEN
-                               SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.user_home_ou, user_object.home_ou)::FLOAT + 1.0)::FLOAT;
-                               current_mp_weight := current_mp_weight - tmp_weight;
-                       END IF; 
-
-                       -- set the matchpoint if we found the best one
-                       IF matchpoint_weight IS NULL OR matchpoint_weight > current_mp_weight THEN
-                               matchpoint = current_mp;
-                               matchpoint_weight = current_mp_weight;
-                       END IF;
-
-               END LOOP;
-
-               EXIT WHEN current_requestor_group.parent IS NULL OR matchpoint.id IS NOT NULL;
-
-               SELECT INTO current_requestor_group * FROM permission.grp_tree WHERE id = current_requestor_group.parent;
-       END LOOP;
-
-       RETURN matchpoint.id;
-END;
-$func$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS $func$
-DECLARE
-       matchpoint_id           INT;
-       user_object             actor.usr%ROWTYPE;
-       age_protect_object      config.rule_age_hold_protect%ROWTYPE;
-       transit_range_ou_type   actor.org_unit_type%ROWTYPE;
-       transit_source          actor.org_unit%ROWTYPE;
-       item_object             asset.copy%ROWTYPE;
-       result                  action.matrix_test_result;
-       hold_test               config.hold_matrix_test%ROWTYPE;
-       hold_count              INT;
-       hold_transit_prox       INT;
-       frozen_hold_count       INT;
-       patron_penalties        INT;
-       done                    BOOL := FALSE;
-BEGIN
-       SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-
-       -- Fail if we couldn't find a user
-       IF user_object.id IS NULL THEN
-               result.fail_part := 'no_user';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-               RETURN;
-       END IF;
-
-       -- Fail if user is barred
-       IF user_object.barred IS TRUE THEN
-               result.fail_part := 'actor.usr.barred';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-               RETURN;
-       END IF;
-
-       SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-
-       -- Fail if we couldn't find a copy
-       IF item_object.id IS NULL THEN
-               result.fail_part := 'no_item';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-               RETURN;
-       END IF;
-
-       SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
-
-       -- Fail if we couldn't find any matchpoint (requires a default)
-       IF matchpoint_id IS NULL THEN
-               result.fail_part := 'no_matchpoint';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-               RETURN;
-       END IF;
-
-       SELECT INTO hold_test * FROM config.hold_matrix_test WHERE matchpoint = matchpoint_id;
-
-       result.matchpoint := matchpoint_id;
-       result.success := TRUE;
-
-       IF hold_test.holdable IS FALSE THEN
-               result.fail_part := 'config.hold_matrix_test.holdable';
-               result.success := FALSE;
-               done := TRUE;
-               RETURN NEXT result;
-       END IF;
-
-       IF hold_test.transit_range IS NOT NULL THEN
-               SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
-               IF hold_test.distance_is_from_owner THEN
-                       SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
-               ELSE
-                       SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
-               END IF;
-
-               PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
-
-               IF NOT FOUND THEN
-                       result.fail_part := 'transit_range';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END IF;
-
-       IF hold_test.stop_blocked_user IS TRUE THEN
-               SELECT  INTO patron_penalties COUNT(*)
-                 FROM  actor.usr_standing_penalty
-                 WHERE usr = match_user;
-
-               IF items_out > 0 THEN
-                       result.fail_part := 'config.hold_matrix_test.stop_blocked_user';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END IF;
-
-       IF hold_test.max_holds IS NOT NULL THEN
-               SELECT  INTO hold_count COUNT(*)
-                 FROM  action.hold_request
-                 WHERE usr = match_user
-                       AND fulfillment_time IS NULL
-                       AND cancel_time IS NULL
-                       AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
-
-               IF items_out >= hold_test.max_holds THEN
-                       result.fail_part := 'config.hold_matrix_test.max_holds';
-                       result.success := FALSE;
-                       done := TRUE;
-                       RETURN NEXT result;
-               END IF;
-       END IF;
-
-       IF item_object.age_protect IS NOT NULL THEN
-               SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
-
-               IF item_object.create_date + age_protect_object.age > NOW() THEN
-                       IF hold_test.distance_is_from_owner THEN
-                               SELECT INTO hold_transit_prox prox FROM actor.org_unit_prox WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
-                       ELSE
-                               SELECT INTO hold_transit_prox prox FROM actor.org_unit_prox WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
-                       END IF;
-
-                       IF hold_transit_prox > age_protect_object.prox THEN
-                               result.fail_part := 'config.rule_age_hold_protect.prox';
-                               result.success := FALSE;
-                               done := TRUE;
-                               RETURN NEXT result;
-                       END IF;
-               END IF;
-       END IF;
-
-       IF NOT done THEN
-               RETURN NEXT result;
-       END IF;
-
-       RETURN;
-END;
-$func$ LANGUAGE plpgsql;
-
-CREATE SCHEMA vandelay;
-
-CREATE TABLE vandelay.queue (
-       id                              BIGSERIAL       PRIMARY KEY,
-       owner                   INT                     NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-       name                    TEXT            NOT NULL,
-       complete                BOOL            NOT NULL DEFAULT FALSE,
-       queue_type              TEXT            NOT NULL DEFAULT 'bib' CHECK (queue_type IN ('bib','authority')),
-       CONSTRAINT vand_queue_name_once_per_owner_const UNIQUE (owner,name,queue_type)
-);
-
-CREATE TABLE vandelay.queued_record (
-    id                 BIGSERIAL                   PRIMARY KEY,
-    create_time        TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    import_time        TIMESTAMP WITH TIME ZONE,
-       purpose         TEXT                                            NOT NULL DEFAULT 'import' CHECK (purpose IN ('import','overlay')),
-    marc               TEXT                        NOT NULL
-);
-
-
-
-/* Bib stuff at the top */
-----------------------------------------------------
-
-CREATE TABLE vandelay.bib_attr_definition (
-       id                      SERIAL  PRIMARY KEY,
-       code            TEXT    UNIQUE NOT NULL,
-       description     TEXT,
-       xpath           TEXT    NOT NULL,
-       remove          TEXT    NOT NULL DEFAULT '',
-       ident           BOOL    NOT NULL DEFAULT FALSE
-);
-
--- Each TEXT field (other than 'name') should hold an XPath predicate for pulling the data needed
--- DROP TABLE vandelay.import_item_attr_definition CASCADE;
-CREATE TABLE vandelay.import_item_attr_definition (
-    id              BIGSERIAL   PRIMARY KEY,
-    owner           INT         NOT NULL REFERENCES actor.org_unit (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    name            TEXT        NOT NULL,
-    tag             TEXT        NOT NULL,
-    keep            BOOL        NOT NULL DEFAULT FALSE,
-    owning_lib      TEXT,
-    circ_lib        TEXT,
-    call_number     TEXT,
-    copy_number     TEXT,
-    status          TEXT,
-    location        TEXT,
-    circulate       TEXT,
-    deposit         TEXT,
-    deposit_amount  TEXT,
-    ref             TEXT,
-    holdable        TEXT,
-    price           TEXT,
-    barcode         TEXT,
-    circ_modifier   TEXT,
-    circ_as_type    TEXT,
-    alert_message   TEXT,
-    opac_visible    TEXT,
-    pub_note_title  TEXT,
-    pub_note        TEXT,
-    priv_note_title TEXT,
-    priv_note       TEXT,
-       CONSTRAINT vand_import_item_attr_def_idx UNIQUE (owner,name)
-);
-
-CREATE TABLE vandelay.bib_queue (
-       queue_type          TEXT        NOT NULL DEFAULT 'bib' CHECK (queue_type = 'bib'),
-       item_attr_def   BIGINT  REFERENCES vandelay.import_item_attr_definition (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-       CONSTRAINT vand_bib_queue_name_once_per_owner_const UNIQUE (owner,name,queue_type)
-) INHERITS (vandelay.queue);
-ALTER TABLE vandelay.bib_queue ADD PRIMARY KEY (id);
-
-CREATE TABLE vandelay.queued_bib_record (
-       queue           INT             NOT NULL REFERENCES vandelay.bib_queue (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       bib_source      INT             REFERENCES config.bib_source (id) DEFERRABLE INITIALLY DEFERRED,
-       imported_as     INT             REFERENCES biblio.record_entry (id) DEFERRABLE INITIALLY DEFERRED
-) INHERITS (vandelay.queued_record);
-ALTER TABLE vandelay.queued_bib_record ADD PRIMARY KEY (id);
-
-CREATE TABLE vandelay.queued_bib_record_attr (
-       id                      BIGSERIAL       PRIMARY KEY,
-       record          BIGINT          NOT NULL REFERENCES vandelay.queued_bib_record (id) DEFERRABLE INITIALLY DEFERRED,
-       field           INT                     NOT NULL REFERENCES vandelay.bib_attr_definition (id) DEFERRABLE INITIALLY DEFERRED,
-       attr_value      TEXT            NOT NULL
-);
-
-CREATE TABLE vandelay.bib_match (
-       id                              BIGSERIAL       PRIMARY KEY,
-       field_type              TEXT            NOT NULL CHECK (field_type in ('isbn','tcn_value','id')),
-       matched_attr    INT                     REFERENCES vandelay.queued_bib_record_attr (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       queued_record   BIGINT          REFERENCES vandelay.queued_bib_record (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       eg_record               BIGINT          REFERENCES biblio.record_entry (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
-);
-
--- DROP TABLE vandelay.import_item CASCADE;
-CREATE TABLE vandelay.import_item (
-    id              BIGSERIAL   PRIMARY KEY,
-    record          BIGINT      NOT NULL REFERENCES vandelay.queued_bib_record (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    definition      BIGINT      NOT NULL REFERENCES vandelay.import_item_attr_definition (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    owning_lib      INT,
-    circ_lib        INT,
-    call_number     TEXT,
-    copy_number     INT,
-    status          INT,
-    location        INT,
-    circulate       BOOL,
-    deposit         BOOL,
-    deposit_amount  NUMERIC(8,2),
-    ref             BOOL,
-    holdable        BOOL,
-    price           NUMERIC(8,2),
-    barcode         TEXT,
-    circ_modifier   TEXT,
-    circ_as_type    TEXT,
-    alert_message   TEXT,
-    pub_note        TEXT,
-    priv_note       TEXT,
-    opac_visible    BOOL
-);
-CREATE TABLE vandelay.import_bib_trash_fields (
-    id              BIGSERIAL   PRIMARY KEY,
-    owner           INT         NOT NULL REFERENCES actor.org_unit (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    field           TEXT        NOT NULL,
-       CONSTRAINT vand_import_bib_trash_fields_idx UNIQUE (owner,field)
-);
-
-CREATE OR REPLACE FUNCTION vandelay.strip_field ( xml TEXT, field TEXT ) RETURNS TEXT AS $_$
-
-    use MARC::Record;
-    use MARC::File::XML (BinaryEncoding => 'UTF-8');
-
-    my $xml = shift;
-    my $field_spec = shift;
-
-    my $r = MARC::Record->new_from_xml( $xml );
-    $r->delete_field( $_ ) for ( $r->field( $field_spec ) );
-
-    $xml = $r->as_xml_record;
-    $xml =~ s/^<\?.+?\?>$//mo;
-    $xml =~ s/\n//sgo;
-    $xml =~ s/>\s+</></sgo;
-
-    return $xml;
-
-$_$ LANGUAGE PLPERLU;
-
-
-CREATE OR REPLACE FUNCTION vandelay.ingest_items ( import_id BIGINT, attr_def_id BIGINT ) RETURNS SETOF vandelay.import_item AS $$
-DECLARE
-
-    owning_lib      TEXT;
-    circ_lib        TEXT;
-    call_number     TEXT;
-    copy_number     TEXT;
-    status          TEXT;
-    location        TEXT;
-    circulate       TEXT;
-    deposit         TEXT;
-    deposit_amount  TEXT;
-    ref             TEXT;
-    holdable        TEXT;
-    price           TEXT;
-    barcode         TEXT;
-    circ_modifier   TEXT;
-    circ_as_type    TEXT;
-    alert_message   TEXT;
-    opac_visible    TEXT;
-    pub_note        TEXT;
-    priv_note       TEXT;
-
-    attr_def        RECORD;
-    tmp_attr_set    RECORD;
-    attr_set        vandelay.import_item%ROWTYPE;
-
-    xpath           TEXT;
-
-BEGIN
-
-    SELECT * INTO attr_def FROM vandelay.import_item_attr_definition WHERE id = attr_def_id;
-
-    IF FOUND THEN
-
-        attr_set.definition := attr_def.id; 
-    
-        -- Build the combined XPath
-    
-        owning_lib :=
-            CASE
-                WHEN attr_def.owning_lib IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.owning_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.owning_lib || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.owning_lib
-            END;
-    
-        circ_lib :=
-            CASE
-                WHEN attr_def.circ_lib IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_lib || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_lib
-            END;
-    
-        call_number :=
-            CASE
-                WHEN attr_def.call_number IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.call_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.call_number || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.call_number
-            END;
-    
-        copy_number :=
-            CASE
-                WHEN attr_def.copy_number IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.copy_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.copy_number || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.copy_number
-            END;
-    
-        status :=
-            CASE
-                WHEN attr_def.status IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.status ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.status || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.status
-            END;
-    
-        location :=
-            CASE
-                WHEN attr_def.location IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.location ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.location || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.location
-            END;
-    
-        circulate :=
-            CASE
-                WHEN attr_def.circulate IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circulate ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circulate || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circulate
-            END;
-    
-        deposit :=
-            CASE
-                WHEN attr_def.deposit IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.deposit ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit
-            END;
-    
-        deposit_amount :=
-            CASE
-                WHEN attr_def.deposit_amount IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.deposit_amount ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit_amount || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit_amount
-            END;
-    
-        ref :=
-            CASE
-                WHEN attr_def.ref IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.ref ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.ref || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.ref
-            END;
-    
-        holdable :=
-            CASE
-                WHEN attr_def.holdable IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.holdable ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.holdable || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.holdable
-            END;
-    
-        price :=
-            CASE
-                WHEN attr_def.price IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.price ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.price || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.price
-            END;
-    
-        barcode :=
-            CASE
-                WHEN attr_def.barcode IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.barcode ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.barcode || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.barcode
-            END;
-    
-        circ_modifier :=
-            CASE
-                WHEN attr_def.circ_modifier IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_modifier ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_modifier || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_modifier
-            END;
-    
-        circ_as_type :=
-            CASE
-                WHEN attr_def.circ_as_type IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_as_type ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_as_type || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_as_type
-            END;
-    
-        alert_message :=
-            CASE
-                WHEN attr_def.alert_message IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.alert_message ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.alert_message || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.alert_message
-            END;
-    
-        opac_visible :=
-            CASE
-                WHEN attr_def.opac_visible IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.opac_visible ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.opac_visible || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.opac_visible
-            END;
-
-        pub_note :=
-            CASE
-                WHEN attr_def.pub_note IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.pub_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.pub_note || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.pub_note
-            END;
-        priv_note :=
-            CASE
-                WHEN attr_def.priv_note IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.priv_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.priv_note || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.priv_note
-            END;
-    
-    
-        xpath := 
-            owning_lib      || '|' || 
-            circ_lib        || '|' || 
-            call_number     || '|' || 
-            copy_number     || '|' || 
-            status          || '|' || 
-            location        || '|' || 
-            circulate       || '|' || 
-            deposit         || '|' || 
-            deposit_amount  || '|' || 
-            ref             || '|' || 
-            holdable        || '|' || 
-            price           || '|' || 
-            barcode         || '|' || 
-            circ_modifier   || '|' || 
-            circ_as_type    || '|' || 
-            alert_message   || '|' || 
-            pub_note        || '|' || 
-            priv_note       || '|' || 
-            opac_visible;
-
-        -- RAISE NOTICE 'XPath: %', xpath;
-        
-        FOR tmp_attr_set IN
-                SELECT  *
-                  FROM  xpath_table( 'id', 'marc', 'vandelay.queued_bib_record', xpath, 'id = ' || import_id )
-                            AS t( id BIGINT, ol TEXT, clib TEXT, cn TEXT, cnum TEXT, cs TEXT, cl TEXT, circ TEXT,
-                                  dep TEXT, dep_amount TEXT, r TEXT, hold TEXT, pr TEXT, bc TEXT, circ_mod TEXT,
-                                  circ_as TEXT, amessage TEXT, note TEXT, pnote TEXT, opac_vis TEXT )
-        LOOP
-    
-            tmp_attr_set.pr = REGEXP_REPLACE(tmp_attr_set.pr, E'[^0-9\\.]', '', 'g');
-            tmp_attr_set.dep_amount = REGEXP_REPLACE(tmp_attr_set.dep_amount, E'[^0-9\\.]', '', 'g');
-
-            tmp_attr_set.pr := NULLIF( tmp_attr_set.pr, '' );
-            tmp_attr_set.dep_amount := NULLIF( tmp_attr_set.dep_amount, '' );
-    
-            SELECT id INTO attr_set.owning_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.ol); -- INT
-            SELECT id INTO attr_set.circ_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.clib); -- INT
-            SELECT id INTO attr_set.status FROM config.copy_status WHERE LOWER(name) = LOWER(tmp_attr_set.cs); -- INT
-    
-            SELECT  id INTO attr_set.location
-              FROM  asset.copy_location
-              WHERE LOWER(name) = LOWER(tmp_attr_set.cl)
-                    AND owning_lib = COALESCE(attr_set.owning_lib, attr_set.circ_lib); -- INT
-    
-            attr_set.circulate      :=
-                LOWER( SUBSTRING( tmp_attr_set.circ, 1, 1)) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.circ) = 'circulating'; -- BOOL
-
-            attr_set.deposit        :=
-                LOWER( SUBSTRING( tmp_attr_set.dep, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.dep) = 'deposit'; -- BOOL
-
-            attr_set.holdable       :=
-                LOWER( SUBSTRING( tmp_attr_set.hold, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.hold) = 'holdable'; -- BOOL
-
-            attr_set.opac_visible   :=
-                LOWER( SUBSTRING( tmp_attr_set.opac_vis, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.opac_vis) = 'visible'; -- BOOL
-
-            attr_set.ref            :=
-                LOWER( SUBSTRING( tmp_attr_set.r, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.r) = 'reference'; -- BOOL
-    
-            attr_set.copy_number    := tmp_attr_set.cnum::INT; -- INT,
-            attr_set.deposit_amount := tmp_attr_set.dep_amount::NUMERIC(6,2); -- NUMERIC(6,2),
-            attr_set.price          := tmp_attr_set.pr::NUMERIC(8,2); -- NUMERIC(8,2),
-    
-            attr_set.call_number    := tmp_attr_set.cn; -- TEXT
-            attr_set.barcode        := tmp_attr_set.bc; -- TEXT,
-            attr_set.circ_modifier  := tmp_attr_set.circ_mod; -- TEXT,
-            attr_set.circ_as_type   := tmp_attr_set.circ_as; -- TEXT,
-            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
-            attr_set.pub_note       := tmp_attr_set.note; -- TEXT,
-            attr_set.priv_note      := tmp_attr_set.pnote; -- TEXT,
-            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
-    
-            RETURN NEXT attr_set;
-    
-        END LOOP;
-    
-    END IF;
-
-END;
-$$ LANGUAGE PLPGSQL;
-
-
-CREATE OR REPLACE FUNCTION vandelay.ingest_bib_marc ( ) RETURNS TRIGGER AS $$
-DECLARE
-    value   TEXT;
-    atype   TEXT;
-    adef    RECORD;
-BEGIN
-    FOR adef IN SELECT * FROM vandelay.bib_attr_definition LOOP
-
-        SELECT extract_marc_field('vandelay.queued_bib_record', id, adef.xpath, adef.remove) INTO value FROM vandelay.queued_bib_record WHERE id = NEW.id;
-        IF (value IS NOT NULL AND value <> '') THEN
-            INSERT INTO vandelay.queued_bib_record_attr (record, field, attr_value) VALUES (NEW.id, adef.id, value);
-        END IF;
-
-    END LOOP;
-
-    RETURN NULL;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION vandelay.ingest_bib_items ( ) RETURNS TRIGGER AS $func$
-DECLARE
-    queue_rec   RECORD;
-    item_rule   RECORD;
-    item_data   vandelay.import_item%ROWTYPE;
-BEGIN
-
-    SELECT * INTO queue_rec FROM vandelay.bib_queue WHERE id = NEW.queue;
-
-    FOR item_rule IN SELECT r.* FROM actor.org_unit_ancestors( queue_rec.owner ) o JOIN vandelay.import_item_attr_definition r ON ( r.owner = o.id ) LOOP
-        FOR item_data IN SELECT * FROM vandelay.ingest_items( NEW.id::BIGINT, item_rule.id::BIGINT ) LOOP
-            INSERT INTO vandelay.import_item (
-               record,
-                definition,
-                owning_lib,
-                circ_lib,
-                call_number,
-                copy_number,
-                status,
-                location,
-                circulate,
-                deposit,
-                deposit_amount,
-                ref,
-                holdable,
-                price,
-                barcode,
-                circ_modifier,
-                circ_as_type,
-                alert_message,
-                pub_note,
-                priv_note,
-                opac_visible
-            ) VALUES (
-               NEW.id,
-                item_data.definition,
-                item_data.owning_lib,
-                item_data.circ_lib,
-                item_data.call_number,
-                item_data.copy_number,
-                item_data.status,
-                item_data.location,
-                item_data.circulate,
-                item_data.deposit,
-                item_data.deposit_amount,
-                item_data.ref,
-                item_data.holdable,
-                item_data.price,
-                item_data.barcode,
-                item_data.circ_modifier,
-                item_data.circ_as_type,
-                item_data.alert_message,
-                item_data.pub_note,
-                item_data.priv_note,
-                item_data.opac_visible
-            );
-        END LOOP;
-    END LOOP;
-
-    RETURN NULL;
-END;
-$func$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION vandelay.match_bib_record ( ) RETURNS TRIGGER AS $func$
-DECLARE
-    attr    RECORD;
-    eg_rec  RECORD;
-BEGIN
-    FOR attr IN SELECT a.* FROM vandelay.queued_bib_record_attr a JOIN vandelay.bib_attr_definition d ON (d.id = a.field) WHERE record = NEW.id AND d.ident IS TRUE LOOP
-
-               -- All numbers? check for an id match
-               IF (attr.attr_value ~ $r$^\d+$$r$) THEN
-               FOR eg_rec IN SELECT * FROM biblio.record_entry WHERE id = attr.attr_value::BIGINT AND deleted IS FALSE LOOP
-                       INSERT INTO vandelay.bib_match (field_type, matched_attr, queued_record, eg_record) VALUES ('id', attr.id, NEW.id, eg_rec.id);
-                       END LOOP;
-               END IF;
-
-               -- Looks like an ISBN? check for an isbn match
-               IF (attr.attr_value ~* $r$^[0-9x]+$$r$ AND character_length(attr.attr_value) IN (10,13)) THEN
-               FOR eg_rec IN EXECUTE $$SELECT * FROM metabib.full_rec fr WHERE fr.value LIKE LOWER('$$ || attr.attr_value || $$%') AND fr.tag = '020' AND fr.subfield = 'a'$$ LOOP
-                               PERFORM id FROM biblio.record_entry WHERE id = eg_rec.record AND deleted IS FALSE;
-                               IF FOUND THEN
-                               INSERT INTO vandelay.bib_match (field_type, matched_attr, queued_record, eg_record) VALUES ('isbn', attr.id, NEW.id, eg_rec.record);
-                               END IF;
-                       END LOOP;
-
-                       -- subcheck for isbn-as-tcn
-                   FOR eg_rec IN SELECT * FROM biblio.record_entry WHERE tcn_value = 'i' || attr.attr_value AND deleted IS FALSE LOOP
-                           INSERT INTO vandelay.bib_match (field_type, matched_attr, queued_record, eg_record) VALUES ('tcn_value', attr.id, NEW.id, eg_rec.id);
-               END LOOP;
-               END IF;
-
-               -- check for an OCLC tcn_value match
-               IF (attr.attr_value ~ $r$^o\d+$$r$) THEN
-                   FOR eg_rec IN SELECT * FROM biblio.record_entry WHERE tcn_value = regexp_replace(attr.attr_value,'^o','ocm') AND deleted IS FALSE LOOP
-                           INSERT INTO vandelay.bib_match (field_type, matched_attr, queued_record, eg_record) VALUES ('tcn_value', attr.id, NEW.id, eg_rec.id);
-               END LOOP;
-               END IF;
-
-               -- check for a direct tcn_value match
-        FOR eg_rec IN SELECT * FROM biblio.record_entry WHERE tcn_value = attr.attr_value AND deleted IS FALSE LOOP
-            INSERT INTO vandelay.bib_match (field_type, matched_attr, queued_record, eg_record) VALUES ('tcn_value', attr.id, NEW.id, eg_rec.id);
-        END LOOP;
-
-    END LOOP;
-
-    RETURN NULL;
-END;
-$func$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION vandelay.cleanup_bib_marc ( ) RETURNS TRIGGER AS $$
-BEGIN
-    DELETE FROM vandelay.queued_bib_record_attr WHERE record = OLD.id;
-    DELETE FROM vandelay.import_item WHERE record = OLD.id;
-
-    IF TG_OP = 'UPDATE' THEN
-        RETURN NEW;
-    END IF;
-    RETURN OLD;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER cleanup_bib_trigger
-    BEFORE UPDATE OR DELETE ON vandelay.queued_bib_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.cleanup_bib_marc();
-
-CREATE TRIGGER ingest_bib_trigger
-    AFTER INSERT OR UPDATE ON vandelay.queued_bib_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.ingest_bib_marc();
-
-CREATE TRIGGER ingest_item_trigger
-    AFTER INSERT OR UPDATE ON vandelay.queued_bib_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.ingest_bib_items();
-
-CREATE TRIGGER zz_match_bibs_trigger
-    AFTER INSERT OR UPDATE ON vandelay.queued_bib_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.match_bib_record();
-
-
-/* Authority stuff down here */
----------------------------------------
-CREATE TABLE vandelay.authority_attr_definition (
-       id                      SERIAL  PRIMARY KEY,
-       code            TEXT    UNIQUE NOT NULL,
-       description     TEXT,
-       xpath           TEXT    NOT NULL,
-       remove          TEXT    NOT NULL DEFAULT '',
-       ident           BOOL    NOT NULL DEFAULT FALSE
-);
-
-CREATE TABLE vandelay.authority_queue (
-       queue_type      TEXT            NOT NULL DEFAULT 'authority' CHECK (queue_type = 'authority'),
-       CONSTRAINT vand_authority_queue_name_once_per_owner_const UNIQUE (owner,name,queue_type)
-) INHERITS (vandelay.queue);
-ALTER TABLE vandelay.authority_queue ADD PRIMARY KEY (id);
-
-CREATE TABLE vandelay.queued_authority_record (
-       queue           INT     NOT NULL REFERENCES vandelay.authority_queue (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       imported_as     INT     REFERENCES authority.record_entry (id) DEFERRABLE INITIALLY DEFERRED
-) INHERITS (vandelay.queued_record);
-ALTER TABLE vandelay.queued_authority_record ADD PRIMARY KEY (id);
-
-CREATE TABLE vandelay.queued_authority_record_attr (
-       id                      BIGSERIAL       PRIMARY KEY,
-       record          BIGINT          NOT NULL REFERENCES vandelay.queued_authority_record (id) DEFERRABLE INITIALLY DEFERRED,
-       field           INT                     NOT NULL REFERENCES vandelay.authority_attr_definition (id) DEFERRABLE INITIALLY DEFERRED,
-       attr_value      TEXT            NOT NULL
-);
-
-CREATE TABLE vandelay.authority_match (
-       id                              BIGSERIAL       PRIMARY KEY,
-       matched_attr    INT                     REFERENCES vandelay.queued_authority_record_attr (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       queued_record   BIGINT          REFERENCES vandelay.queued_authority_record (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       eg_record               BIGINT          REFERENCES authority.record_entry (id) DEFERRABLE INITIALLY DEFERRED
-);
-
-CREATE OR REPLACE FUNCTION vandelay.ingest_authority_marc ( ) RETURNS TRIGGER AS $$
-DECLARE
-    value   TEXT;
-    atype   TEXT;
-    adef    RECORD;
-BEGIN
-    FOR adef IN SELECT * FROM vandelay.authority_attr_definition LOOP
-
-        SELECT extract_marc_field('vandelay.queued_authority_record', id, adef.xpath, adef.remove) INTO value FROM vandelay.queued_authority_record WHERE id = NEW.id;
-        IF (value IS NOT NULL AND value <> '') THEN
-            INSERT INTO vandelay.queued_authority_record_attr (record, field, attr_value) VALUES (NEW.id, adef.id, value);
-        END IF;
-
-    END LOOP;
-
-    RETURN NULL;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION vandelay.cleanup_authority_marc ( ) RETURNS TRIGGER AS $$
-BEGIN
-    DELETE FROM vandelay.queued_authority_record_attr WHERE record = OLD.id;
-    IF TG_OP = 'UPDATE' THEN
-        RETURN NEW;
-    END IF;
-    RETURN OLD;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER cleanup_authority_trigger
-    BEFORE UPDATE OR DELETE ON vandelay.queued_authority_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.cleanup_authority_marc();
-
-CREATE TRIGGER ingest_authority_trigger
-    AFTER INSERT OR UPDATE ON vandelay.queued_authority_record
-    FOR EACH ROW EXECUTE PROCEDURE vandelay.ingest_authority_marc();
-
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (1, 'title', oils_i18n_gettext(1, 'Title of work', 'vqbrad', 'description'),'//*[@tag="245"]/*[contains("abcmnopr",@code)]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (2, 'author', oils_i18n_gettext(2, 'Author of work', 'vqbrad', 'description'),'//*[@tag="100" or @tag="110" or @tag="113"]/*[contains("ad",@code)]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (3, 'language', oils_i18n_gettext(3, 'Language of work', 'vqbrad', 'description'),'//*[@tag="240"]/*[@code="l"][1]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (4, 'pagination', oils_i18n_gettext(4, 'Pagination', 'vqbrad', 'description'),'//*[@tag="300"]/*[@code="a"][1]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident, remove ) VALUES (5, 'isbn',oils_i18n_gettext(5, 'ISBN', 'vqbrad', 'description'),'//*[@tag="020"]/*[@code="a"]', TRUE, $r$(?:-|\s.+$)$r$);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident, remove ) VALUES (6, 'issn',oils_i18n_gettext(6, 'ISSN', 'vqbrad', 'description'),'//*[@tag="022"]/*[@code="a"]', TRUE, $r$(?:-|\s.+$)$r$);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (7, 'price',oils_i18n_gettext(7, 'Price', 'vqbrad', 'description'),'//*[@tag="020" or @tag="022"]/*[@code="c"][1]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident ) VALUES (8, 'rec_identifier',oils_i18n_gettext(8, 'Accession Number', 'vqbrad', 'description'),'//*[@tag="001"]', TRUE);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident ) VALUES (9, 'eg_tcn',oils_i18n_gettext(9, 'TCN Value', 'vqbrad', 'description'),'//*[@tag="901"]/*[@code="a"]', TRUE);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident ) VALUES (10, 'eg_tcn_source',oils_i18n_gettext(10, 'TCN Source', 'vqbrad', 'description'),'//*[@tag="901"]/*[@code="b"]', TRUE);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, ident ) VALUES (11, 'eg_identifier',oils_i18n_gettext(11, 'Internal ID', 'vqbrad', 'description'),'//*[@tag="901"]/*[@code="c"]', TRUE);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (12, 'publisher',oils_i18n_gettext(12, 'Publisher', 'vqbrad', 'description'),'//*[@tag="260"]/*[@code="b"][1]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath, remove ) VALUES (13, 'pubdate',oils_i18n_gettext(13, 'Publication Date', 'vqbrad', 'description'),'//*[@tag="260"]/*[@code="c"][1]',$r$\D$r$);
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (14, 'edition',oils_i18n_gettext(14, 'Edition', 'vqbrad', 'description'),'//*[@tag="250"]/*[@code="a"][1]');
-
-INSERT INTO vandelay.import_item_attr_definition (
-    owner, name, tag, owning_lib, circ_lib, location,
-    call_number, circ_modifier, barcode, price, copy_number,
-    circulate, ref, holdable, opac_visible, status
-) VALUES (
-    1,
-    'Evergreen 852 export format',
-    '852',
-    '[@code = "b"][1]',
-    '[@code = "b"][2]',
-    'c',
-    'j',
-    'g',
-    'p',
-    'y',
-    't',
-    '[@code = "x" and text() = "circulating"]',
-    '[@code = "x" and text() = "reference"]',
-    '[@code = "x" and text() = "holdable"]',
-    '[@code = "x" and text() = "visible"]',
-    'z'
-);
-
-INSERT INTO vandelay.import_item_attr_definition (
-    owner,
-    name,
-    tag,
-    owning_lib,
-    location,
-    call_number,
-    circ_modifier,
-    barcode,
-    price,
-    status
-) VALUES (
-    1,
-    'Unicorn Import format -- 999',
-    '999',
-    'm',
-    'l',
-    'a',
-    't',
-    'i',
-    'p',
-    'k'
-);
-
-CREATE OR REPLACE VIEW extend_reporter.global_bibs_by_holding_update AS
-  SELECT DISTINCT ON (id) id, holding_update, update_type
-    FROM (SELECT  b.id,
-                  LAST(cp.create_date) AS holding_update,
-                  'add' AS update_type
-            FROM  biblio.record_entry b
-                  JOIN asset.call_number cn ON (cn.record = b.id)
-                  JOIN asset.copy cp ON (cp.call_number = cn.id)
-            WHERE NOT cp.deleted
-                  AND b.id > 0
-            GROUP BY b.id
-              UNION
-          SELECT  b.id,
-                  LAST(cp.edit_date) AS holding_update,
-                  'delete' AS update_type
-            FROM  biblio.record_entry b
-                  JOIN asset.call_number cn ON (cn.record = b.id)
-                  JOIN asset.copy cp ON (cp.call_number = cn.id)
-            WHERE cp.deleted
-                  AND b.id > 0
-            GROUP BY b.id)x
-    ORDER BY id, holding_update;
-
-INSERT INTO vandelay.authority_attr_definition ( code, description, xpath, ident ) VALUES ('rec_identifier','Identifier','//*[@tag="001"]', TRUE);
-
-UPDATE config.xml_transform SET xslt=$$<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.loc.gov/mods/v3" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc" version="1.0">
-       <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
-<!--
-Revision 1.14 - Fixed template isValid and fields 010, 020, 022, 024, 028, and 037 to output additional identifier elements 
-  with corresponding @type and @invalid eq 'yes' when subfields z or y (in the case of 022) exist in the MARCXML ::: 2007/01/04 17:35:20 cred
-
-Revision 1.13 - Changed order of output under cartographics to reflect schema  2006/11/28 tmee
-       
-Revision 1.12 - Updated to reflect MODS 3.2 Mapping  2006/10/11 tmee
-               
-Revision 1.11 - The attribute objectPart moved from <languageTerm> to <language>
-      2006/04/08  jrad
-
-Revision 1.10 MODS 3.1 revisions to language and classification elements  
-                               (plus ability to find marc:collection embedded in wrapper elements such as SRU zs: wrappers)
-                               2006/02/06  ggar
-
-Revision 1.9 subfield $y was added to field 242 2004/09/02 10:57 jrad
-
-Revision 1.8 Subject chopPunctuation expanded and attribute fixes 2004/08/12 jrad
-
-Revision 1.7 2004/03/25 08:29 jrad
-
-Revision 1.6 various validation fixes 2004/02/20 ntra
-
-Revision 1.5  2003/10/02 16:18:58  ntra
-MODS2 to MODS3 updates, language unstacking and 
-de-duping, chopPunctuation expanded
-
-Revision 1.3  2003/04/03 00:07:19  ntra
-Revision 1.3 Additional Changes not related to MODS Version 2.0 by ntra
-
-Revision 1.2  2003/03/24 19:37:42  ckeith
-Added Log Comment
-
--->
-       <xsl:template match="/">
-               <xsl:choose>
-                       <xsl:when test="//marc:collection">
-                               <modsCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
-                                       <xsl:for-each select="//marc:collection/marc:record">
-                                               <mods version="3.2">
-                                                       <xsl:call-template name="marcRecord"/>
-                                               </mods>
-                                       </xsl:for-each>
-                               </modsCollection>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
-                                       <xsl:for-each select="//marc:record">
-                                               <xsl:call-template name="marcRecord"/>
-                                       </xsl:for-each>
-                               </mods>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="marcRecord">
-               <xsl:variable name="leader" select="marc:leader"/>
-               <xsl:variable name="leader6" select="substring($leader,7,1)"/>
-               <xsl:variable name="leader7" select="substring($leader,8,1)"/>
-               <xsl:variable name="controlField008" select="marc:controlfield[@tag='008']"/>
-               <xsl:variable name="typeOf008">
-                       <xsl:choose>
-                               <xsl:when test="$leader6='a'">
-                                       <xsl:choose>
-                                               <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
-                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">SE</xsl:when>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:when test="$leader6='t'">BK</xsl:when>
-                               <xsl:when test="$leader6='p'">MM</xsl:when>
-                               <xsl:when test="$leader6='m'">CF</xsl:when>
-                               <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                               <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
-                               <xsl:when test="$leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">MU</xsl:when>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:for-each select="marc:datafield[@tag='245']">
-                       <titleInfo>
-                               <xsl:variable name="title">
-                                       <xsl:choose>
-                                               <xsl:when test="marc:subfield[@code='b']">
-                                                       <xsl:call-template name="specialSubfieldSelect">
-                                                               <xsl:with-param name="axis">b</xsl:with-param>
-                                                               <xsl:with-param name="beforeCodes">afgk</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">abfgk</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:variable>
-                               <xsl:variable name="titleChop">
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="$title"/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </xsl:variable>
-                               <xsl:choose>
-                                       <xsl:when test="@ind2>0">
-                                               <nonSort>
-                                                       <xsl:value-of select="substring($titleChop,1,@ind2)"/>
-                                               </nonSort>
-                                               <title>
-                                                       <xsl:value-of select="substring($titleChop,@ind2+1)"/>
-                                               </title>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <title>
-                                                       <xsl:value-of select="$titleChop"/>
-                                               </title>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               <xsl:if test="marc:subfield[@code='b']">
-                                       <subTitle>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="axis">b</xsl:with-param>
-                                                                       <xsl:with-param name="anyCodes">b</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">afgk</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </subTitle>
-                               </xsl:if>
-                               <xsl:call-template name="part"></xsl:call-template>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='210']">
-                       <titleInfo type="abbreviated">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">a</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="subtitle"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='242']">
-                       <titleInfo type="translated">
-                               <!--09/01/04 Added subfield $y-->
-                               <xsl:for-each select="marc:subfield[@code='y']">
-                                       <xsl:attribute name="lang">
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:attribute>
-                               </xsl:for-each>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <!-- 1/04 removed $h, b -->
-                                                               <xsl:with-param name="codes">a</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <!-- 1/04 fix -->
-                               <xsl:call-template name="subtitle"/>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='246']">
-                       <titleInfo type="alternative">
-                               <xsl:for-each select="marc:subfield[@code='i']">
-                                       <xsl:attribute name="displayLabel">
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:attribute>
-                               </xsl:for-each>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <!-- 1/04 removed $h, $b -->
-                                                               <xsl:with-param name="codes">af</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="subtitle"/>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='130']|marc:datafield[@tag='240']|marc:datafield[@tag='730'][@ind2!='2']">
-                       <titleInfo type="uniform">
-                               <title>
-                                       <xsl:variable name="str">
-                                               <xsl:for-each select="marc:subfield">
-                                                       <xsl:if test="(contains('adfklmor',@code) and (not(../marc:subfield[@code='n' or @code='p']) or (following-sibling::marc:subfield[@code='n' or @code='p'])))">
-                                                               <xsl:value-of select="text()"/>
-                                                               <xsl:text> </xsl:text>
-                                                       </xsl:if>
-                                               </xsl:for-each>
-                                       </xsl:variable>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='740'][@ind2!='2']">
-                       <titleInfo type="alternative">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">ah</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='100']">
-                       <name type="personal">
-                               <xsl:call-template name="nameABCDQ"/>
-                               <xsl:call-template name="affiliation"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='110']">
-                       <name type="corporate">
-                               <xsl:call-template name="nameABCDN"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='111']">
-                       <name type="conference">
-                               <xsl:call-template name="nameACDEQ"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='700'][not(marc:subfield[@code='t'])]">
-                       <name type="personal">
-                               <xsl:call-template name="nameABCDQ"/>
-                               <xsl:call-template name="affiliation"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='710'][not(marc:subfield[@code='t'])]">
-                       <name type="corporate">
-                               <xsl:call-template name="nameABCDN"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='711'][not(marc:subfield[@code='t'])]">
-                       <name type="conference">
-                               <xsl:call-template name="nameACDEQ"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='720'][not(marc:subfield[@code='t'])]">
-                       <name>
-                               <xsl:if test="@ind1=1">
-                                       <xsl:attribute name="type">
-                                               <xsl:text>personal</xsl:text>
-                                       </xsl:attribute>
-                               </xsl:if>
-                               <namePart>
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </namePart>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <typeOfResource>
-                       <xsl:if test="$leader7='c'">
-                               <xsl:attribute name="collection">yes</xsl:attribute>
-                       </xsl:if>
-                       <xsl:if test="$leader6='d' or $leader6='f' or $leader6='p' or $leader6='t'">
-                               <xsl:attribute name="manuscript">yes</xsl:attribute>
-                       </xsl:if>
-                       <xsl:choose>
-                               <xsl:when test="$leader6='a' or $leader6='t'">text</xsl:when>
-                               <xsl:when test="$leader6='e' or $leader6='f'">cartographic</xsl:when>
-                               <xsl:when test="$leader6='c' or $leader6='d'">notated music</xsl:when>
-                               <xsl:when test="$leader6='i'">sound recording-nonmusical</xsl:when>
-                               <xsl:when test="$leader6='j'">sound recording-musical</xsl:when>
-                               <xsl:when test="$leader6='k'">still image</xsl:when>
-                               <xsl:when test="$leader6='g'">moving image</xsl:when>
-                               <xsl:when test="$leader6='r'">three dimensional object</xsl:when>
-                               <xsl:when test="$leader6='m'">software, multimedia</xsl:when>
-                               <xsl:when test="$leader6='p'">mixed material</xsl:when>
-                       </xsl:choose>
-               </typeOfResource>
-               <xsl:if test="substring($controlField008,26,1)='d'">
-                       <genre authority="marc">globe</genre>
-               </xsl:if>
-               <xsl:if test="marc:controlfield[@tag='007'][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                       <genre authority="marc">remote sensing image</genre>
-               </xsl:if>
-               <xsl:if test="$typeOf008='MP'">
-                       <xsl:variable name="controlField008-25" select="substring($controlField008,26,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-25='a' or $controlField008-25='b' or $controlField008-25='c' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                                       <genre authority="marc">map</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-25='e' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                                       <genre authority="marc">atlas</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='SE'">
-                       <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-21='d'">
-                                       <genre authority="marc">database</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='l'">
-                                       <genre authority="marc">loose-leaf</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='m'">
-                                       <genre authority="marc">series</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='n'">
-                                       <genre authority="marc">newspaper</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='p'">
-                                       <genre authority="marc">periodical</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='w'">
-                                       <genre authority="marc">web site</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='BK' or $typeOf008='SE'">
-                       <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="contains($controlField008-24,'a')">
-                                       <genre authority="marc">abstract or summary</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'b')">
-                                       <genre authority="marc">bibliography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'c')">
-                                       <genre authority="marc">catalog</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'d')">
-                                       <genre authority="marc">dictionary</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'e')">
-                                       <genre authority="marc">encyclopedia</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'f')">
-                                       <genre authority="marc">handbook</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'g')">
-                                       <genre authority="marc">legal article</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'i')">
-                                       <genre authority="marc">index</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'k')">
-                                       <genre authority="marc">discography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'l')">
-                                       <genre authority="marc">legislation</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'m')">
-                                       <genre authority="marc">theses</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'n')">
-                                       <genre authority="marc">survey of literature</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'o')">
-                                       <genre authority="marc">review</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'p')">
-                                       <genre authority="marc">programmed text</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'q')">
-                                       <genre authority="marc">filmography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'r')">
-                                       <genre authority="marc">directory</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'s')">
-                                       <genre authority="marc">statistics</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'t')">
-                                       <genre authority="marc">technical report</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'v')">
-                                       <genre authority="marc">legal case and case notes</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'w')">
-                                       <genre authority="marc">law report or digest</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'z')">
-                                       <genre authority="marc">treaty</genre>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-29='1'">
-                                       <genre authority="marc">conference publication</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='CF'">
-                       <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-26='a'">
-                                       <genre authority="marc">numeric data</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='e'">
-                                       <genre authority="marc">database</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='f'">
-                                       <genre authority="marc">font</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='g'">
-                                       <genre authority="marc">game</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='BK'">
-                       <xsl:if test="substring($controlField008,25,1)='j'">
-                               <genre authority="marc">patent</genre>
-                       </xsl:if>
-                       <xsl:if test="substring($controlField008,31,1)='1'">
-                               <genre authority="marc">festschrift</genre>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"></xsl:variable>
-                       <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
-                               <genre authority="marc">biography</genre>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-33='e'">
-                                       <genre authority="marc">essay</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='d'">
-                                       <genre authority="marc">drama</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='c'">
-                                       <genre authority="marc">comic strip</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='l'">
-                                       <genre authority="marc">fiction</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='h'">
-                                       <genre authority="marc">humor, satire</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='i'">
-                                       <genre authority="marc">letter</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='f'">
-                                       <genre authority="marc">novel</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='j'">
-                                       <genre authority="marc">short story</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='s'">
-                                       <genre authority="marc">speech</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='MU'">
-                       <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"></xsl:variable>
-                       <xsl:if test="contains($controlField008-30-31,'b')">
-                               <genre authority="marc">biography</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'c')">
-                               <genre authority="marc">conference publication</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'d')">
-                               <genre authority="marc">drama</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'e')">
-                               <genre authority="marc">essay</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'f')">
-                               <genre authority="marc">fiction</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'o')">
-                               <genre authority="marc">folktale</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'h')">
-                               <genre authority="marc">history</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'k')">
-                               <genre authority="marc">humor, satire</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'m')">
-                               <genre authority="marc">memoir</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'p')">
-                               <genre authority="marc">poetry</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'r')">
-                               <genre authority="marc">rehearsal</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'g')">
-                               <genre authority="marc">reporting</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'s')">
-                               <genre authority="marc">sound</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'l')">
-                               <genre authority="marc">speech</genre>
-                       </xsl:if>
-               </xsl:if>
-               <xsl:if test="$typeOf008='VM'">
-                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"></xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-33='a'">
-                                       <genre authority="marc">art original</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='b'">
-                                       <genre authority="marc">kit</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='c'">
-                                       <genre authority="marc">art reproduction</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='d'">
-                                       <genre authority="marc">diorama</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='f'">
-                                       <genre authority="marc">filmstrip</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='g'">
-                                       <genre authority="marc">legal article</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='i'">
-                                       <genre authority="marc">picture</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='k'">
-                                       <genre authority="marc">graphic</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='l'">
-                                       <genre authority="marc">technical drawing</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='m'">
-                                       <genre authority="marc">motion picture</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='n'">
-                                       <genre authority="marc">chart</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='o'">
-                                       <genre authority="marc">flash card</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='p'">
-                                       <genre authority="marc">microscope slide</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                                       <genre authority="marc">model</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='r'">
-                                       <genre authority="marc">realia</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='s'">
-                                       <genre authority="marc">slide</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='t'">
-                                       <genre authority="marc">transparency</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='v'">
-                                       <genre authority="marc">videorecording</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='w'">
-                                       <genre authority="marc">toy</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=655]">
-                       <genre authority="marc">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                               </xsl:attribute>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abvxyz</xsl:with-param>
-                                       <xsl:with-param name="delimeter">-</xsl:with-param>
-                               </xsl:call-template>
-                       </genre>
-               </xsl:for-each>
-               <originInfo>
-                       <xsl:variable name="MARCpublicationCode" select="normalize-space(substring($controlField008,16,3))"></xsl:variable>
-                       <xsl:if test="translate($MARCpublicationCode,'|','')">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">code</xsl:attribute>
-                                               <xsl:attribute name="authority">marccountry</xsl:attribute>
-                                               <xsl:value-of select="$MARCpublicationCode"/>
-                                       </placeTerm>
-                               </place>
-                       </xsl:if>
-                       <xsl:for-each select="marc:datafield[@tag=044]/marc:subfield[@code='c']">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">code</xsl:attribute>
-                                               <xsl:attribute name="authority">iso3166</xsl:attribute>
-                                               <xsl:value-of select="."/>
-                                       </placeTerm>
-                               </place>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='a']">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">text</xsl:attribute>
-                                               <xsl:call-template name="chopPunctuationFront">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="chopPunctuation">
-                                                                       <xsl:with-param name="chopString" select="."/>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </placeTerm>
-                               </place>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='m']">
-                               <dateValid point="start">
-                                       <xsl:value-of select="."/>
-                               </dateValid>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='n']">
-                               <dateValid point="end">
-                                       <xsl:value-of select="."/>
-                               </dateValid>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='j']">
-                               <dateModified>
-                                       <xsl:value-of select="."/>
-                               </dateModified>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='b' or @code='c' or @code='g']">
-                               <xsl:choose>
-                                       <xsl:when test="@code='b'">
-                                               <publisher>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                               <xsl:with-param name="punctuation">
-                                                                       <xsl:text>:,;/ </xsl:text>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </publisher>
-                                       </xsl:when>
-                                       <xsl:when test="@code='c'">
-                                               <dateIssued>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </dateIssued>
-                                       </xsl:when>
-                                       <xsl:when test="@code='g'">
-                                               <dateCreated>
-                                                       <xsl:value-of select="."/>
-                                               </dateCreated>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </xsl:for-each>
-                       <xsl:variable name="dataField260c">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="marc:datafield[@tag=260]/marc:subfield[@code='c']"></xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:variable>
-                       <xsl:variable name="controlField008-7-10" select="normalize-space(substring($controlField008, 8, 4))"></xsl:variable>
-                       <xsl:variable name="controlField008-11-14" select="normalize-space(substring($controlField008, 12, 4))"></xsl:variable>
-                       <xsl:variable name="controlField008-6" select="normalize-space(substring($controlField008, 7, 1))"></xsl:variable>
-                       <xsl:if test="$controlField008-6='e' or $controlField008-6='p' or $controlField008-6='r' or $controlField008-6='t' or $controlField008-6='s'">
-                               <xsl:if test="$controlField008-7-10 and ($controlField008-7-10 != $dataField260c)">
-                                       <dateIssued encoding="marc">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
-                               <xsl:if test="$controlField008-7-10">
-                                       <dateIssued encoding="marc" point="start">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <dateIssued encoding="marc" point="end">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='q'">
-                               <xsl:if test="$controlField008-7-10">
-                                       <dateIssued encoding="marc" point="start" qualifier="questionable">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='q'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <dateIssued encoding="marc" point="end" qualifier="questionable">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='t'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <copyrightDate encoding="marc">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </copyrightDate>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=0 or @ind1=1]/marc:subfield[@code='a']">
-                               <dateCaptured encoding="iso8601">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][1]">
-                               <dateCaptured encoding="iso8601" point="start">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][2]">
-                               <dateCaptured encoding="iso8601" point="end">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=250]/marc:subfield[@code='a']">
-                               <edition>
-                                       <xsl:value-of select="."/>
-                               </edition>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:leader">
-                               <issuance>
-                                       <xsl:choose>
-                                               <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">monographic</xsl:when>
-                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">continuing</xsl:when>
-                                       </xsl:choose>
-                               </issuance>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=310]|marc:datafield[@tag=321]">
-                               <frequency>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">ab</xsl:with-param>
-                                       </xsl:call-template>
-                               </frequency>
-                       </xsl:for-each>
-               </originInfo>
-               <xsl:variable name="controlField008-35-37" select="normalize-space(translate(substring($controlField008,36,3),'|#',''))"></xsl:variable>
-               <xsl:if test="$controlField008-35-37">
-                       <language>
-                               <languageTerm authority="iso639-2b" type="code">
-                                       <xsl:value-of select="substring($controlField008,36,3)"/>
-                               </languageTerm>
-                       </language>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=041]">
-                       <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='d' or @code='e' or @code='f' or @code='g' or @code='h']">
-                               <xsl:variable name="langCodes" select="."/>
-                               <xsl:choose>
-                                       <xsl:when test="../marc:subfield[@code='2']='rfc3066'">
-                                               <!-- not stacked but could be repeated -->
-                                               <xsl:call-template name="rfcLanguages">
-                                                       <xsl:with-param name="nodeNum">
-                                                               <xsl:value-of select="1"/>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="usedLanguages">
-                                                               <xsl:text></xsl:text>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="controlField008-35-37">
-                                                               <xsl:value-of select="$controlField008-35-37"></xsl:value-of>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <!-- iso -->
-                                               <xsl:variable name="allLanguages">
-                                                       <xsl:copy-of select="$langCodes"></xsl:copy-of>
-                                               </xsl:variable>
-                                               <xsl:variable name="currentLanguage">
-                                                       <xsl:value-of select="substring($allLanguages,1,3)"></xsl:value-of>
-                                               </xsl:variable>
-                                               <xsl:call-template name="isoLanguage">
-                                                       <xsl:with-param name="currentLanguage">
-                                                               <xsl:value-of select="substring($allLanguages,1,3)"></xsl:value-of>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="remainingLanguages">
-                                                               <xsl:value-of select="substring($allLanguages,4,string-length($allLanguages)-3)"></xsl:value-of>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="usedLanguages">
-                                                               <xsl:if test="$controlField008-35-37">
-                                                                       <xsl:value-of select="$controlField008-35-37"></xsl:value-of>
-                                                               </xsl:if>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </xsl:for-each>
-               </xsl:for-each>
-               <xsl:variable name="physicalDescription">
-                       <!--3.2 change tmee 007/11 -->
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
-                               <digitalOrigin>reformatted digital</digitalOrigin>
-                       </xsl:if>
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
-                               <digitalOrigin>digitized microfilm</digitalOrigin>
-                       </xsl:if>
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
-                               <digitalOrigin>digitized other analog</digitalOrigin>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"></xsl:variable>
-                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"></xsl:variable>
-                       <xsl:variable name="check008-23">
-                               <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='SE' or $typeOf008='MM'">
-                                       <xsl:value-of select="true()"></xsl:value-of>
-                               </xsl:if>
-                       </xsl:variable>
-                       <xsl:variable name="check008-29">
-                               <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
-                                       <xsl:value-of select="true()"></xsl:value-of>
-                               </xsl:if>
-                       </xsl:variable>
-                       <xsl:choose>
-                               <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
-                                       <form authority="marcform">braille</form>
-                               </xsl:when>
-                               <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='SE') and ($controlField008-23=' ' or $controlField008='r'))">
-                                       <form authority="marcform">print</form>
-                               </xsl:when>
-                               <xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
-                                       <form authority="marcform">electronic</form>
-                               </xsl:when>
-                               <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
-                                       <form authority="marcform">microfiche</form>
-                               </xsl:when>
-                               <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
-                                       <form authority="marcform">microfilm</form>
-                               </xsl:when>
-                       </xsl:choose>
-                       <!-- 1/04 fix -->
-                       <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
-                               <form>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </form>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
-                               <xsl:choose>
-                                       <xsl:when test="substring(text(),14,1)='a'">
-                                               <reformattingQuality>access</reformattingQuality>
-                                       </xsl:when>
-                                       <xsl:when test="substring(text(),14,1)='p'">
-                                               <reformattingQuality>preservation</reformattingQuality>
-                                       </xsl:when>
-                                       <xsl:when test="substring(text(),14,1)='r'">
-                                               <reformattingQuality>replacement</reformattingQuality>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </xsl:for-each>
-                       <!--3.2 change tmee 007/01 -->
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
-                               <form authority="smd">chip cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
-                               <form authority="smd">computer optical disc cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
-                               <form authority="smd">magnetic disc</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
-                               <form authority="smd">magneto-optical disc</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
-                               <form authority="smd">optical disc</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
-                               <form authority="smd">tape cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
-                               <form authority="smd">tape cassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
-                               <form authority="smd">tape reel</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
-                               <form authority="smd">celestial globe</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
-                               <form authority="smd">earth moon globe</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
-                               <form authority="smd">planetary or lunar globe</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
-                               <form authority="smd">terrestrial globe</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
-                               <form authority="smd">kit</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                               <form authority="smd">atlas</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
-                               <form authority="smd">diagram</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                               <form authority="smd">map</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                               <form authority="smd">model</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
-                               <form authority="smd">profile</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote-sensing image</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
-                               <form authority="smd">section</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
-                               <form authority="smd">view</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
-                               <form authority="smd">aperture card</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
-                               <form authority="smd">microfiche</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
-                               <form authority="smd">microfiche cassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
-                               <form authority="smd">microfilm cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
-                               <form authority="smd">microfilm cassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
-                               <form authority="smd">microfilm reel</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
-                               <form authority="smd">microopaque</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
-                               <form authority="smd">film cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
-                               <form authority="smd">film cassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
-                               <form authority="smd">film reel</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
-                               <form authority="smd">chart</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
-                               <form authority="smd">collage</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
-                               <form authority="smd">drawing</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
-                               <form authority="smd">flash card</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
-                               <form authority="smd">painting</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
-                               <form authority="smd">photomechanical print</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
-                               <form authority="smd">photonegative</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
-                               <form authority="smd">photoprint</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
-                               <form authority="smd">picture</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
-                               <form authority="smd">print</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
-                               <form authority="smd">technical drawing</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
-                               <form authority="smd">notated music</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
-                               <form authority="smd">filmslip</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
-                               <form authority="smd">filmstrip cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
-                               <form authority="smd">filmstrip roll</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
-                               <form authority="smd">other filmstrip type</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
-                               <form authority="smd">slide</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
-                               <form authority="smd">transparency</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote-sensing image</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
-                               <form authority="smd">cylinder</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
-                               <form authority="smd">roll</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
-                               <form authority="smd">sound cartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
-                               <form authority="smd">sound cassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
-                               <form authority="smd">sound disc</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
-                               <form authority="smd">sound-tape reel</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
-                               <form authority="smd">sound-track film</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
-                               <form authority="smd">wire recording</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
-                               <form authority="smd">braille</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
-                               <form authority="smd">combination</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
-                               <form authority="smd">moon</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
-                               <form authority="smd">tactile, with no writing system</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
-                               <form authority="smd">braille</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
-                               <form authority="smd">large print</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
-                               <form authority="smd">regular print</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
-                               <form authority="smd">text in looseleaf binder</form>
-                       </xsl:if>
-                       
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
-                               <form authority="smd">videocartridge</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
-                               <form authority="smd">videocassette</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
-                               <form authority="smd">videodisc</form>
-                       </xsl:if>
-                       <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
-                               <form authority="smd">videoreel</form>
-                       </xsl:if>
-                       
-                       <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)>1]">
-                               <internetMediaType>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </internetMediaType>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=300]">
-                               <extent>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abce</xsl:with-param>
-                                       </xsl:call-template>
-                               </extent>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($physicalDescription))">
-                       <physicalDescription>
-                               <xsl:copy-of select="$physicalDescription"></xsl:copy-of>
-                       </physicalDescription>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=520]">
-                       <abstract>
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </abstract>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=505]">
-                       <tableOfContents>
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">agrt</xsl:with-param>
-                               </xsl:call-template>
-                       </tableOfContents>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=521]">
-                       <targetAudience>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </targetAudience>
-               </xsl:for-each>
-               <xsl:if test="$typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM'">
-                       <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"></xsl:variable>
-                       <xsl:choose>
-                               <!-- 01/04 fix -->
-                               <xsl:when test="$controlField008-22='d'">
-                                       <targetAudience authority="marctarget">adolescent</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='e'">
-                                       <targetAudience authority="marctarget">adult</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='g'">
-                                       <targetAudience authority="marctarget">general</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='b' or $controlField008-22='c' or $controlField008-22='j'">
-                                       <targetAudience authority="marctarget">juvenile</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='a'">
-                                       <targetAudience authority="marctarget">preschool</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='f'">
-                                       <targetAudience authority="marctarget">specialized</targetAudience>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=245]/marc:subfield[@code='c']">
-                       <note type="statement of responsibility">
-                               <xsl:value-of select="."></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=500]">
-                       <note>
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                               <xsl:call-template name="uri"></xsl:call-template>
-                       </note>
-               </xsl:for-each>
-               
-               <!--3.2 change tmee additional note fields-->
-               
-               <xsl:for-each select="marc:datafield[@tag=506]">
-                       <note type="restrictions">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=510]">
-                       <note  type="citation/reference">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-                       
-               <xsl:for-each select="marc:datafield[@tag=511]">
-                       <note type="performers">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=518]">
-                       <note type="venue">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=530]">
-                       <note  type="additional physical form">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=533]">
-                       <note  type="reproduction">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=534]">
-                       <note  type="original version">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=538]">
-                       <note  type="system details">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-               <xsl:for-each select="marc:datafield[@tag=583]">
-                       <note type="action">
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               
-
-               
-               
-               
-               <xsl:for-each select="marc:datafield[@tag=501 or @tag=502 or @tag=504 or @tag=507 or @tag=508 or  @tag=513 or @tag=514 or @tag=515 or @tag=516 or @tag=522 or @tag=524 or @tag=525 or @tag=526 or @tag=535 or @tag=536 or @tag=540 or @tag=541 or @tag=544 or @tag=545 or @tag=546 or @tag=547 or @tag=550 or @tag=552 or @tag=555 or @tag=556 or @tag=561 or @tag=562 or @tag=565 or @tag=567 or @tag=580 or @tag=581 or @tag=584 or @tag=585 or @tag=586]">
-                       <note>
-                               <xsl:call-template name="uri"></xsl:call-template>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=034][marc:subfield[@code='d' or @code='e' or @code='f' or @code='g']]">
-                       <subject>
-                               <cartographics>
-                                       <coordinates>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">defg</xsl:with-param>
-                                               </xsl:call-template>
-                                       </coordinates>
-                               </cartographics>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=043]">
-                       <subject>
-                               <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='c']">
-                                       <geographicCode>
-                                               <xsl:attribute name="authority">
-                                                       <xsl:if test="@code='a'">
-                                                               <xsl:text>marcgac</xsl:text>
-                                                       </xsl:if>
-                                                       <xsl:if test="@code='b'">
-                                                               <xsl:value-of select="following-sibling::marc:subfield[@code=2]"></xsl:value-of>
-                                                       </xsl:if>
-                                                       <xsl:if test="@code='c'">
-                                                               <xsl:text>iso3166</xsl:text>
-                                                       </xsl:if>
-                                               </xsl:attribute>
-                                               <xsl:value-of select="self::marc:subfield"></xsl:value-of>
-                                       </geographicCode>
-                               </xsl:for-each>
-                       </subject>
-               </xsl:for-each>
-               <!-- tmee 2006/11/27 -->
-               <xsl:for-each select="marc:datafield[@tag=255]">
-                       <subject>
-                               <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='c']">
-                               <cartographics>
-                                       <xsl:if test="@code='a'">
-                                               <scale>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </scale>
-                                       </xsl:if>
-                                       <xsl:if test="@code='b'">
-                                               <projection>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </projection>
-                                       </xsl:if>
-                                       <xsl:if test="@code='c'">
-                                               <coordinates>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </coordinates>
-                                       </xsl:if>
-                               </cartographics>
-                               </xsl:for-each>
-                       </subject>
-               </xsl:for-each>
-                               
-               <xsl:apply-templates select="marc:datafield[653 >= @tag and @tag >= 600]"></xsl:apply-templates>
-               <xsl:apply-templates select="marc:datafield[@tag=656]"></xsl:apply-templates>
-               <xsl:for-each select="marc:datafield[@tag=752]">
-                       <subject>
-                               <hierarchicalGeographic>
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <country>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                                       </xsl:call-template>
-                                               </country>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <state>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                                       </xsl:call-template>
-                                               </state>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='c']">
-                                               <county>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                                       </xsl:call-template>
-                                               </county>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='d']">
-                                               <city>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                                       </xsl:call-template>
-                                               </city>
-                                       </xsl:for-each>
-                               </hierarchicalGeographic>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=045][marc:subfield[@code='b']]">
-                       <subject>
-                               <xsl:choose>
-                                       <xsl:when test="@ind1=2">
-                                               <temporal encoding="iso8601" point="start">
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString">
-                                                                       <xsl:value-of select="marc:subfield[@code='b'][1]"></xsl:value-of>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </temporal>
-                                               <temporal encoding="iso8601" point="end">
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString">
-                                                                       <xsl:value-of select="marc:subfield[@code='b'][2]"></xsl:value-of>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </temporal>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:for-each select="marc:subfield[@code='b']">
-                                                       <temporal encoding="iso8601">
-                                                               <xsl:call-template name="chopPunctuation">
-                                                                       <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </temporal>
-                                               </xsl:for-each>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=050]">
-                       <xsl:for-each select="marc:subfield[@code='b']">
-                               <classification authority="lcc">
-                                       <xsl:if test="../marc:subfield[@code='3']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:value-of select="../marc:subfield[@code='3']"></xsl:value-of>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="preceding-sibling::marc:subfield[@code='a'][1]"></xsl:value-of>
-                                       <xsl:text> </xsl:text>
-                                       <xsl:value-of select="text()"></xsl:value-of>
-                               </classification>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:subfield[@code='a'][not(following-sibling::marc:subfield[@code='b'])]">
-                               <classification authority="lcc">
-                                       <xsl:if test="../marc:subfield[@code='3']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:value-of select="../marc:subfield[@code='3']"></xsl:value-of>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="text()"></xsl:value-of>
-                               </classification>
-                       </xsl:for-each>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=082]">
-                       <classification authority="ddc">
-                               <xsl:if test="marc:subfield[@code='2']">
-                                       <xsl:attribute name="edition">
-                                               <xsl:value-of select="marc:subfield[@code='2']"></xsl:value-of>
-                                       </xsl:attribute>
-                               </xsl:if>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=080]">
-                       <classification authority="udc">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abx</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=060]">
-                       <classification authority="nlm">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086][@ind1=0]">
-                       <classification authority="sudocs">
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086][@ind1=1]">
-                       <classification authority="candoc">
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086]">
-                       <classification>
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"></xsl:value-of>
-                               </xsl:attribute>
-                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=084]">
-                       <classification>
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"></xsl:value-of>
-                               </xsl:attribute>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=440]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">av</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">av</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=510]">
-                       <relatedItem type="isReferencedBy">
-                               <note>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abcx3</xsl:with-param>
-                                       </xsl:call-template>
-                               </note>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=534]">
-                       <relatedItem type="original">
-                               <xsl:call-template name="relatedTitle"></xsl:call-template>
-                               <xsl:call-template name="relatedName"></xsl:call-template>
-                               <xsl:if test="marc:subfield[@code='b' or @code='c']">
-                                       <originInfo>
-                                               <xsl:for-each select="marc:subfield[@code='c']">
-                                                       <publisher>
-                                                               <xsl:value-of select="."></xsl:value-of>
-                                                       </publisher>
-                                               </xsl:for-each>
-                                               <xsl:for-each select="marc:subfield[@code='b']">
-                                                       <edition>
-                                                               <xsl:value-of select="."></xsl:value-of>
-                                                       </edition>
-                                               </xsl:for-each>
-                                       </originInfo>
-                               </xsl:if>
-                               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-                               <xsl:for-each select="marc:subfield[@code='z']">
-                                       <identifier type="isbn">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </identifier>
-                               </xsl:for-each>
-                               <xsl:call-template name="relatedNote"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"></xsl:call-template>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                               <name type="personal">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="termsOfAddress"></xsl:call-template>
-                                       <xsl:call-template name="nameDate"></xsl:call-template>
-                                       <xsl:call-template name="role"></xsl:call-template>
-                               </name>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=710][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"></xsl:call-template>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </titleInfo>
-                               <name type="corporate">
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <namePart>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <namePart>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:variable name="tempNamePart">
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:variable>
-                                       <xsl:if test="normalize-space($tempNamePart)">
-                                               <namePart>
-                                                       <xsl:value-of select="$tempNamePart"></xsl:value-of>
-                                               </namePart>
-                                       </xsl:if>
-                                       <xsl:call-template name="role"></xsl:call-template>
-                               </name>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=711][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"></xsl:call-template>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </titleInfo>
-                               <name type="conference">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                               </name>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=730][@ind2=2]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"></xsl:call-template>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=740][@ind2=2]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"></xsl:call-template>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=760]|marc:datafield[@tag=762]">
-                       <relatedItem type="series">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=765]|marc:datafield[@tag=767]|marc:datafield[@tag=777]|marc:datafield[@tag=787]">
-                       <relatedItem>
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=775]">
-                       <relatedItem type="otherVersion">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=770]|marc:datafield[@tag=774]">
-                       <relatedItem type="constituent">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=772]|marc:datafield[@tag=773]">
-                       <relatedItem type="host">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=776]">
-                       <relatedItem type="otherFormat">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=780]">
-                       <relatedItem type="preceding">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=785]">
-                       <relatedItem type="succeeding">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=786]">
-                       <relatedItem type="original">
-                               <xsl:call-template name="relatedItem76X-78X"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=800]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </titleInfo>
-                               <name type="personal">
-                                       <namePart>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="termsOfAddress"></xsl:call-template>
-                                       <xsl:call-template name="nameDate"></xsl:call-template>
-                                       <xsl:call-template name="role"></xsl:call-template>
-                               </name>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=810]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </titleInfo>
-                               <name type="corporate">
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <namePart>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <namePart>
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="role"></xsl:call-template>
-                               </name>
-                               <xsl:call-template name="relatedForm"></xsl:call-template>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=811]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </titleInfo>
-                               <name type="conference">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='830']">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='856'][@ind2='2']/marc:subfield[@code='q']">
-                       <relatedItem>
-                               <internetMediaType>
-                                       <xsl:value-of select="."/>
-                               </internetMediaType>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='020']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">isbn</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="isbn">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='0']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">isrc</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="isrc">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='2']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">ismn</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="ismn">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='4']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">sici</xsl:with-param>
-                       </xsl:call-template>
-                       <identifier type="sici">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='022']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">issn</xsl:with-param>
-                       </xsl:call-template>
-                       <identifier type="issn">
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='010']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">lccn</xsl:with-param>
-                       </xsl:call-template>
-                       <identifier type="lccn">
-                               <xsl:value-of select="normalize-space(marc:subfield[@code='a'])"/>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='028']">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:choose>
-                                               <xsl:when test="@ind1='0'">issue number</xsl:when>
-                                               <xsl:when test="@ind1='1'">matrix number</xsl:when>
-                                               <xsl:when test="@ind1='2'">music plate</xsl:when>
-                                               <xsl:when test="@ind1='3'">music publisher</xsl:when>
-                                               <xsl:when test="@ind1='4'">videorecording identifier</xsl:when>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               <!--<xsl:call-template name="isInvalid"/>--> <!-- no $z in 028 -->
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">
-                                               <xsl:choose>
-                                                       <xsl:when test="@ind1='0'">ba</xsl:when>
-                                                       <xsl:otherwise>ab</xsl:otherwise>
-                                               </xsl:choose>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='037']">
-                       <identifier type="stock number">
-                               <!--<xsl:call-template name="isInvalid"/>--> <!-- no $z in 037 -->
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='856'][marc:subfield[@code='u']]">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:choose>
-                                               <xsl:when test="starts-with(marc:subfield[@code='u'],'urn:doi') or starts-with(marc:subfield[@code='u'],'doi')">doi</xsl:when>
-                                               <xsl:when test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov')">hdl</xsl:when>
-                                               <xsl:otherwise>uri</xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               <xsl:choose>
-                                       <xsl:when test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov') ">
-                                               <xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"></xsl:value-of>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of select="marc:subfield[@code='u']"></xsl:value-of>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </identifier>
-                       <xsl:if test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl')">
-                               <identifier type="hdl">
-                                       <xsl:if test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">y3z</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"></xsl:value-of>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=024][@ind1=1]">
-                       <identifier type="upc">
-                               <xsl:call-template name="isInvalid"/>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </identifier>
-               </xsl:for-each>
-               <!-- 1/04 fix added $y -->
-               <xsl:for-each select="marc:datafield[@tag=856][marc:subfield[@code='u']]">
-                       <location>
-                               <url>
-                                       <xsl:if test="marc:subfield[@code='y' or @code='3']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">y3</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:if test="marc:subfield[@code='z' ]">
-                                               <xsl:attribute name="note">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">z</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="marc:subfield[@code='u']"></xsl:value-of>
-
-                               </url>
-                       </location>
-               </xsl:for-each>
-                       
-                       <!-- 3.2 change tmee 856z  -->
-
-               
-               <xsl:for-each select="marc:datafield[@tag=852]">
-                       <location>
-                               <physicalLocation>
-                                       <xsl:call-template name="displayLabel"></xsl:call-template>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abje</xsl:with-param>
-                                       </xsl:call-template>
-                               </physicalLocation>
-                       </location>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=506]">
-                       <accessCondition type="restrictionOnAccess">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abcd35</xsl:with-param>
-                               </xsl:call-template>
-                       </accessCondition>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=540]">
-                       <accessCondition type="useAndReproduction">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abcde35</xsl:with-param>
-                               </xsl:call-template>
-                       </accessCondition>
-               </xsl:for-each>
-               <recordInfo>
-                       <xsl:for-each select="marc:datafield[@tag=040]">
-                               <recordContentSource authority="marcorg">
-                                       <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                               </recordContentSource>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=008]">
-                               <recordCreationDate encoding="marc">
-                                       <xsl:value-of select="substring(.,1,6)"></xsl:value-of>
-                               </recordCreationDate>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=005]">
-                               <recordChangeDate encoding="iso8601">
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </recordChangeDate>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=001]">
-                               <recordIdentifier>
-                                       <xsl:if test="../marc:controlfield[@tag=003]">
-                                               <xsl:attribute name="source">
-                                                       <xsl:value-of select="../marc:controlfield[@tag=003]"></xsl:value-of>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </recordIdentifier>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=040]/marc:subfield[@code='b']">
-                               <languageOfCataloging>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </languageTerm>
-                               </languageOfCataloging>
-                       </xsl:for-each>
-               </recordInfo>
-       </xsl:template>
-       <xsl:template name="displayForm">
-               <xsl:for-each select="marc:subfield[@code='c']">
-                       <displayForm>
-                               <xsl:value-of select="."></xsl:value-of>
-                       </displayForm>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="affiliation">
-               <xsl:for-each select="marc:subfield[@code='u']">
-                       <affiliation>
-                               <xsl:value-of select="."></xsl:value-of>
-                       </affiliation>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="uri">
-               <xsl:for-each select="marc:subfield[@code='u']">
-                       <xsl:attribute name="xlink:href">
-                               <xsl:value-of select="."></xsl:value-of>
-                       </xsl:attribute>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="role">
-               <xsl:for-each select="marc:subfield[@code='e']">
-                       <role>
-                               <roleTerm type="text">
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </roleTerm>
-                       </role>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='4']">
-                       <role>
-                               <roleTerm authority="marcrelator" type="code">
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </roleTerm>
-                       </role>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="part">
-               <xsl:variable name="partNumber">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">n</xsl:with-param>
-                               <xsl:with-param name="anyCodes">n</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:variable name="partName">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">p</xsl:with-param>
-                               <xsl:with-param name="anyCodes">p</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($partNumber))">
-                       <partNumber>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="$partNumber"></xsl:with-param>
-                               </xsl:call-template>
-                       </partNumber>
-               </xsl:if>
-               <xsl:if test="string-length(normalize-space($partName))">
-                       <partName>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="$partName"></xsl:with-param>
-                               </xsl:call-template>
-                       </partName>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedPart">
-               <xsl:if test="@tag=773">
-                       <xsl:for-each select="marc:subfield[@code='g']">
-                               <part>
-                                       <text>
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </text>
-                               </part>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:subfield[@code='q']">
-                               <part>
-                                       <xsl:call-template name="parsePart"></xsl:call-template>
-                               </part>
-                       </xsl:for-each>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedPartNumName">
-               <xsl:variable name="partNumber">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">g</xsl:with-param>
-                               <xsl:with-param name="anyCodes">g</xsl:with-param>
-                               <xsl:with-param name="afterCodes">pst</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:variable name="partName">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">p</xsl:with-param>
-                               <xsl:with-param name="anyCodes">p</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($partNumber))">
-                       <partNumber>
-                               <xsl:value-of select="$partNumber"></xsl:value-of>
-                       </partNumber>
-               </xsl:if>
-               <xsl:if test="string-length(normalize-space($partName))">
-                       <partName>
-                               <xsl:value-of select="$partName"></xsl:value-of>
-                       </partName>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedName">
-               <xsl:for-each select="marc:subfield[@code='a']">
-                       <name>
-                               <namePart>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </namePart>
-                       </name>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedForm">
-               <xsl:for-each select="marc:subfield[@code='h']">
-                       <physicalDescription>
-                               <form>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </form>
-                       </physicalDescription>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedExtent">
-               <xsl:for-each select="marc:subfield[@code='h']">
-                       <physicalDescription>
-                               <extent>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </extent>
-                       </physicalDescription>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedNote">
-               <xsl:for-each select="marc:subfield[@code='n']">
-                       <note>
-                               <xsl:value-of select="."></xsl:value-of>
-                       </note>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedSubject">
-               <xsl:for-each select="marc:subfield[@code='j']">
-                       <subject>
-                               <temporal encoding="iso8601">
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                       </xsl:call-template>
-                               </temporal>
-                       </subject>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifierISSN">
-               <xsl:for-each select="marc:subfield[@code='x']">
-                       <identifier type="issn">
-                               <xsl:value-of select="."></xsl:value-of>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifierLocal">
-               <xsl:for-each select="marc:subfield[@code='w']">
-                       <identifier type="local">
-                               <xsl:value-of select="."></xsl:value-of>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifier">
-               <xsl:for-each select="marc:subfield[@code='o']">
-                       <identifier>
-                               <xsl:value-of select="."></xsl:value-of>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedItem76X-78X">
-               <xsl:call-template name="displayLabel"></xsl:call-template>
-               <xsl:call-template name="relatedTitle76X-78X"></xsl:call-template>
-               <xsl:call-template name="relatedName"></xsl:call-template>
-               <xsl:call-template name="relatedOriginInfo"></xsl:call-template>
-               <xsl:call-template name="relatedLanguage"></xsl:call-template>
-               <xsl:call-template name="relatedExtent"></xsl:call-template>
-               <xsl:call-template name="relatedNote"></xsl:call-template>
-               <xsl:call-template name="relatedSubject"></xsl:call-template>
-               <xsl:call-template name="relatedIdentifier"></xsl:call-template>
-               <xsl:call-template name="relatedIdentifierISSN"></xsl:call-template>
-               <xsl:call-template name="relatedIdentifierLocal"></xsl:call-template>
-               <xsl:call-template name="relatedPart"></xsl:call-template>
-       </xsl:template>
-       <xsl:template name="subjectGeographicZ">
-               <geographic>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                       </xsl:call-template>
-               </geographic>
-       </xsl:template>
-       <xsl:template name="subjectTemporalY">
-               <temporal>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                       </xsl:call-template>
-               </temporal>
-       </xsl:template>
-       <xsl:template name="subjectTopic">
-               <topic>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                       </xsl:call-template>
-               </topic>
-       </xsl:template> 
-       <!-- 3.2 change tmee 6xx $v genre -->
-       <xsl:template name="subjectGenre">
-               <genre>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                       </xsl:call-template>
-               </genre>
-       </xsl:template>
-       
-       <xsl:template name="nameABCDN">
-               <xsl:for-each select="marc:subfield[@code='a']">
-                       <namePart>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="."></xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='b']">
-                       <namePart>
-                               <xsl:value-of select="."></xsl:value-of>
-                       </namePart>
-               </xsl:for-each>
-               <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
-                       <namePart>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">cdn</xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="nameABCDQ">
-               <namePart>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString">
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">aq</xsl:with-param>
-                                       </xsl:call-template>
-                               </xsl:with-param>
-                               <xsl:with-param name="punctuation">
-                                       <xsl:text>:,;/ </xsl:text>
-                               </xsl:with-param>
-                       </xsl:call-template>
-               </namePart>
-               <xsl:call-template name="termsOfAddress"></xsl:call-template>
-               <xsl:call-template name="nameDate"></xsl:call-template>
-       </xsl:template>
-       <xsl:template name="nameACDEQ">
-               <namePart>
-                       <xsl:call-template name="subfieldSelect">
-                               <xsl:with-param name="codes">acdeq</xsl:with-param>
-                       </xsl:call-template>
-               </namePart>
-       </xsl:template>
-       <xsl:template name="constituentOrRelatedType">
-               <xsl:if test="@ind2=2">
-                       <xsl:attribute name="type">constituent</xsl:attribute>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedTitle">
-               <xsl:for-each select="marc:subfield[@code='t']">
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                       </titleInfo>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedTitle76X-78X">
-               <xsl:for-each select="marc:subfield[@code='t']">
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='p']">
-                       <titleInfo type="abbreviated">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='s']">
-                       <titleInfo type="uniform">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"></xsl:call-template>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedOriginInfo">
-               <xsl:if test="marc:subfield[@code='b' or @code='d'] or marc:subfield[@code='f']">
-                       <originInfo>
-                               <xsl:if test="@tag=775">
-                                       <xsl:for-each select="marc:subfield[@code='f']">
-                                               <place>
-                                                       <placeTerm>
-                                                               <xsl:attribute name="type">code</xsl:attribute>
-                                                               <xsl:attribute name="authority">marcgac</xsl:attribute>
-                                                               <xsl:value-of select="."></xsl:value-of>
-                                                       </placeTerm>
-                                               </place>
-                                       </xsl:for-each>
-                               </xsl:if>
-                               <xsl:for-each select="marc:subfield[@code='d']">
-                                       <publisher>
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </publisher>
-                               </xsl:for-each>
-                               <xsl:for-each select="marc:subfield[@code='b']">
-                                       <edition>
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </edition>
-                               </xsl:for-each>
-                       </originInfo>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedLanguage">
-               <xsl:for-each select="marc:subfield[@code='e']">
-                       <xsl:call-template name="getLanguage">
-                               <xsl:with-param name="langString">
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </xsl:with-param>
-                       </xsl:call-template>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="nameDate">
-               <xsl:for-each select="marc:subfield[@code='d']">
-                       <namePart type="date">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="."></xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="subjectAuthority">
-               <xsl:if test="@ind2!=4">
-                       <xsl:if test="@ind2!=' '">
-                               <xsl:if test="@ind2!=8">
-                                       <xsl:if test="@ind2!=9">
-                                               <xsl:attribute name="authority">
-                                                       <xsl:choose>
-                                                               <xsl:when test="@ind2=0">lcsh</xsl:when>
-                                                               <xsl:when test="@ind2=1">lcshac</xsl:when>
-                                                               <xsl:when test="@ind2=2">mesh</xsl:when>
-                                                               <!-- 1/04 fix -->
-                                                               <xsl:when test="@ind2=3">nal</xsl:when>
-                                                               <xsl:when test="@ind2=5">csh</xsl:when>
-                                                               <xsl:when test="@ind2=6">rvm</xsl:when>
-                                                               <xsl:when test="@ind2=7">
-                                                                       <xsl:value-of select="marc:subfield[@code='2']"></xsl:value-of>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                               </xsl:if>
-                       </xsl:if>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="subjectAnyOrder">
-               <xsl:for-each select="marc:subfield[@code='v' or @code='x' or @code='y' or @code='z']">
-                       <xsl:choose>
-                               <xsl:when test="@code='v'">
-                                       <xsl:call-template name="subjectGenre"></xsl:call-template>
-                               </xsl:when>
-                               <xsl:when test="@code='x'">
-                                       <xsl:call-template name="subjectTopic"></xsl:call-template>
-                               </xsl:when>
-                               <xsl:when test="@code='y'">
-                                       <xsl:call-template name="subjectTemporalY"></xsl:call-template>
-                               </xsl:when>
-                               <xsl:when test="@code='z'">
-                                       <xsl:call-template name="subjectGeographicZ"></xsl:call-template>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="specialSubfieldSelect">
-               <xsl:param name="anyCodes"></xsl:param>
-               <xsl:param name="axis"></xsl:param>
-               <xsl:param name="beforeCodes"></xsl:param>
-               <xsl:param name="afterCodes"></xsl:param>
-               <xsl:variable name="str">
-                       <xsl:for-each select="marc:subfield">
-                               <xsl:if test="contains($anyCodes, @code)      or (contains($beforeCodes,@code) and following-sibling::marc:subfield[@code=$axis])      or (contains($afterCodes,@code) and preceding-sibling::marc:subfield[@code=$axis])">
-                                       <xsl:value-of select="text()"></xsl:value-of>
-                                       <xsl:text> </xsl:text>
-                               </xsl:if>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:value-of select="substring($str,1,string-length($str)-1)"></xsl:value-of>
-       </xsl:template>
-       
-       <!-- 3.2 change tmee 6xx $v genre -->
-       <xsl:template match="marc:datafield[@tag=600]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <name type="personal">
-                               <xsl:call-template name="termsOfAddress"></xsl:call-template>
-                               <namePart>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">aq</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </namePart>
-                               <xsl:call-template name="nameDate"></xsl:call-template>
-                               <xsl:call-template name="affiliation"></xsl:call-template>
-                               <xsl:call-template name="role"></xsl:call-template>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=610]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <name type="corporate">
-                               <xsl:for-each select="marc:subfield[@code='a']">
-                                       <namePart>
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </namePart>
-                               </xsl:for-each>
-                               <xsl:for-each select="marc:subfield[@code='b']">
-                                       <namePart>
-                                               <xsl:value-of select="."></xsl:value-of>
-                                       </namePart>
-                               </xsl:for-each>
-                               <xsl:if test="marc:subfield[@code='c' or @code='d' or @code='n' or @code='p']">
-                                       <namePart>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">cdnp</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                               </xsl:if>
-                               <xsl:call-template name="role"></xsl:call-template>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=611]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <name type="conference">
-                               <namePart>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abcdeqnp</xsl:with-param>
-                                       </xsl:call-template>
-                               </namePart>
-                               <xsl:for-each select="marc:subfield[@code='4']">
-                                       <role>
-                                               <roleTerm authority="marcrelator" type="code">
-                                                       <xsl:value-of select="."></xsl:value-of>
-                                               </roleTerm>
-                                       </role>
-                               </xsl:for-each>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=630]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">adfhklor</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                                       <xsl:call-template name="part"></xsl:call-template>
-                               </title>
-                       </titleInfo>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=650]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <topic>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">abcd</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </topic>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=651]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"></xsl:call-template>
-                       <xsl:for-each select="marc:subfield[@code='a']">
-                               <geographic>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString" select="."></xsl:with-param>
-                                       </xsl:call-template>
-                               </geographic>
-                       </xsl:for-each>
-                       <xsl:call-template name="subjectAnyOrder"></xsl:call-template>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=653]">
-               <subject>
-                       <xsl:for-each select="marc:subfield[@code='a']">
-                               <topic>
-                                       <xsl:value-of select="."></xsl:value-of>
-                               </topic>
-                       </xsl:for-each>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=656]">
-               <subject>
-                       <xsl:if test="marc:subfield[@code=2]">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code=2]"></xsl:value-of>
-                               </xsl:attribute>
-                       </xsl:if>
-                       <occupation>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </occupation>
-               </subject>
-       </xsl:template>
-       <xsl:template name="termsOfAddress">
-               <xsl:if test="marc:subfield[@code='b' or @code='c']">
-                       <namePart type="termsOfAddress">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">bc</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="displayLabel">
-               <xsl:if test="marc:subfield[@code='i']">
-                       <xsl:attribute name="displayLabel">
-                               <xsl:value-of select="marc:subfield[@code='i']"></xsl:value-of>
-                       </xsl:attribute>
-               </xsl:if>
-               <xsl:if test="marc:subfield[@code='3']">
-                       <xsl:attribute name="displayLabel">
-                               <xsl:value-of select="marc:subfield[@code='3']"></xsl:value-of>
-                       </xsl:attribute>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="isInvalid">
-               <xsl:param name="type"/>
-               <xsl:if test="marc:subfield[@code='z'] or marc:subfield[@code='y']">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:value-of select="$type"/>
-                               </xsl:attribute>
-                               <xsl:attribute name="invalid">
-                                       <xsl:text>yes</xsl:text>
-                               </xsl:attribute>
-                               <xsl:if test="marc:subfield[@code='z']">
-                                       <xsl:value-of select="marc:subfield[@code='z']"/>
-                               </xsl:if>
-                               <xsl:if test="marc:subfield[@code='y']">
-                                       <xsl:value-of select="marc:subfield[@code='y']"/>
-                               </xsl:if>
-                       </identifier>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="subtitle">
-               <xsl:if test="marc:subfield[@code='b']">
-                       <subTitle>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:value-of select="marc:subfield[@code='b']"/>
-                                               <!--<xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">b</xsl:with-param>                                                                 
-                                               </xsl:call-template>-->
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </subTitle>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="script">
-               <xsl:param name="scriptCode"></xsl:param>
-               <xsl:attribute name="script">
-                       <xsl:choose>
-                               <xsl:when test="$scriptCode='(3'">Arabic</xsl:when>
-                               <xsl:when test="$scriptCode='(B'">Latin</xsl:when>
-                               <xsl:when test="$scriptCode='$1'">Chinese, Japanese, Korean</xsl:when>
-                               <xsl:when test="$scriptCode='(N'">Cyrillic</xsl:when>
-                               <xsl:when test="$scriptCode='(2'">Hebrew</xsl:when>
-                               <xsl:when test="$scriptCode='(S'">Greek</xsl:when>
-                       </xsl:choose>
-               </xsl:attribute>
-       </xsl:template>
-       <xsl:template name="parsePart">
-               <!-- assumes 773$q= 1:2:3<4
-                    with up to 3 levels and one optional start page
-               -->
-               <xsl:variable name="level1">
-                       <xsl:choose>
-                               <xsl:when test="contains(text(),':')">
-                                       <!-- 1:2 -->
-                                       <xsl:value-of select="substring-before(text(),':')"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:when test="not(contains(text(),':'))">
-                                       <!-- 1 or 1<3 -->
-                                       <xsl:if test="contains(text(),'&lt;')">
-                                               <!-- 1<3 -->
-                                               <xsl:value-of select="substring-before(text(),'&lt;')"></xsl:value-of>
-                                       </xsl:if>
-                                       <xsl:if test="not(contains(text(),'&lt;'))">
-                                               <!-- 1 -->
-                                               <xsl:value-of select="text()"></xsl:value-of>
-                                       </xsl:if>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="sici2">
-                       <xsl:choose>
-                               <xsl:when test="starts-with(substring-after(text(),$level1),':')">
-                                       <xsl:value-of select="substring(substring-after(text(),$level1),2)"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="substring-after(text(),$level1)"></xsl:value-of>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="level2">
-                       <xsl:choose>
-                               <xsl:when test="contains($sici2,':')">
-                                       <!--  2:3<4  -->
-                                       <xsl:value-of select="substring-before($sici2,':')"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:when test="contains($sici2,'&lt;')">
-                                       <!-- 1: 2<4 -->
-                                       <xsl:value-of select="substring-before($sici2,'&lt;')"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="$sici2"></xsl:value-of>
-                                       <!-- 1:2 -->
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="sici3">
-                       <xsl:choose>
-                               <xsl:when test="starts-with(substring-after($sici2,$level2),':')">
-                                       <xsl:value-of select="substring(substring-after($sici2,$level2),2)"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="substring-after($sici2,$level2)"></xsl:value-of>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="level3">
-                       <xsl:choose>
-                               <xsl:when test="contains($sici3,'&lt;')">
-                                       <!-- 2<4 -->
-                                       <xsl:value-of select="substring-before($sici3,'&lt;')"></xsl:value-of>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="$sici3"></xsl:value-of>
-                                       <!-- 3 -->
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="page">
-                       <xsl:if test="contains(text(),'&lt;')">
-                               <xsl:value-of select="substring-after(text(),'&lt;')"></xsl:value-of>
-                       </xsl:if>
-               </xsl:variable>
-               <xsl:if test="$level1">
-                       <detail level="1">
-                               <number>
-                                       <xsl:value-of select="$level1"></xsl:value-of>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$level2">
-                       <detail level="2">
-                               <number>
-                                       <xsl:value-of select="$level2"></xsl:value-of>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$level3">
-                       <detail level="3">
-                               <number>
-                                       <xsl:value-of select="$level3"></xsl:value-of>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$page">
-                       <extent unit="page">
-                               <start>
-                                       <xsl:value-of select="$page"></xsl:value-of>
-                               </start>
-                       </extent>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="getLanguage">
-               <xsl:param name="langString"></xsl:param>
-               <xsl:param name="controlField008-35-37"></xsl:param>
-               <xsl:variable name="length" select="string-length($langString)"></xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="$length=0"></xsl:when>
-                       <xsl:when test="$controlField008-35-37=substring($langString,1,3)">
-                               <xsl:call-template name="getLanguage">
-                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"></xsl:with-param>
-                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"></xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <language>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="substring($langString,1,3)"></xsl:value-of>
-                                       </languageTerm>
-                               </language>
-                               <xsl:call-template name="getLanguage">
-                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"></xsl:with-param>
-                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"></xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="isoLanguage">
-               <xsl:param name="currentLanguage"></xsl:param>
-               <xsl:param name="usedLanguages"></xsl:param>
-               <xsl:param name="remainingLanguages"></xsl:param>
-               <xsl:choose>
-                       <xsl:when test="string-length($currentLanguage)=0"></xsl:when>
-                       <xsl:when test="not(contains($usedLanguages, $currentLanguage))">
-                               <language>
-                                       <xsl:if test="@code!='a'">
-                                               <xsl:attribute name="objectPart">
-                                                       <xsl:choose>
-                                                               <xsl:when test="@code='b'">summary or subtitle</xsl:when>
-                                                               <xsl:when test="@code='d'">sung or spoken text</xsl:when>
-                                                               <xsl:when test="@code='e'">libretto</xsl:when>
-                                                               <xsl:when test="@code='f'">table of contents</xsl:when>
-                                                               <xsl:when test="@code='g'">accompanying material</xsl:when>
-                                                               <xsl:when test="@code='h'">translation</xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="$currentLanguage"></xsl:value-of>
-                                       </languageTerm>
-                               </language>
-                               <xsl:call-template name="isoLanguage">
-                                       <xsl:with-param name="currentLanguage">
-                                               <xsl:value-of select="substring($remainingLanguages,1,3)"></xsl:value-of>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="usedLanguages">
-                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"></xsl:value-of>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="remainingLanguages">
-                                               <xsl:value-of select="substring($remainingLanguages,4,string-length($remainingLanguages))"></xsl:value-of>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:call-template name="isoLanguage">
-                                       <xsl:with-param name="currentLanguage">
-                                               <xsl:value-of select="substring($remainingLanguages,1,3)"></xsl:value-of>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="usedLanguages">
-                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"></xsl:value-of>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="remainingLanguages">
-                                               <xsl:value-of select="substring($remainingLanguages,4,string-length($remainingLanguages))"></xsl:value-of>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="chopBrackets">
-               <xsl:param name="chopString"></xsl:param>
-               <xsl:variable name="string">
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="$chopString"></xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="substring($string, 1,1)='['">
-                       <xsl:value-of select="substring($string,2, string-length($string)-2)"></xsl:value-of>
-               </xsl:if>
-               <xsl:if test="substring($string, 1,1)!='['">
-                       <xsl:value-of select="$string"></xsl:value-of>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="rfcLanguages">
-               <xsl:param name="nodeNum"></xsl:param>
-               <xsl:param name="usedLanguages"></xsl:param>
-               <xsl:param name="controlField008-35-37"></xsl:param>
-               <xsl:variable name="currentLanguage" select="."></xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="not($currentLanguage)"></xsl:when>
-                       <xsl:when test="$currentLanguage!=$controlField008-35-37 and $currentLanguage!='rfc3066'">
-                               <xsl:if test="not(contains($usedLanguages,$currentLanguage))">
-                                       <language>
-                                               <xsl:if test="@code!='a'">
-                                                       <xsl:attribute name="objectPart">
-                                                               <xsl:choose>
-                                                                       <xsl:when test="@code='b'">summary or subtitle</xsl:when>
-                                                                       <xsl:when test="@code='d'">sung or spoken text</xsl:when>
-                                                                       <xsl:when test="@code='e'">libretto</xsl:when>
-                                                                       <xsl:when test="@code='f'">table of contents</xsl:when>
-                                                                       <xsl:when test="@code='g'">accompanying material</xsl:when>
-                                                                       <xsl:when test="@code='h'">translation</xsl:when>
-                                                               </xsl:choose>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <languageTerm authority="rfc3066" type="code">
-                                                       <xsl:value-of select="$currentLanguage"/>
-                                               </languageTerm>
-                                       </language>
-                               </xsl:if>
-                       </xsl:when>
-                       <xsl:otherwise>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="datafield">
-               <xsl:param name="tag"/>
-               <xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>
-               <xsl:param name="ind2"><xsl:text> </xsl:text></xsl:param>
-               <xsl:param name="subfields"/>
-               <xsl:element name="marc:datafield">
-                       <xsl:attribute name="tag">
-                               <xsl:value-of select="$tag"/>
-                       </xsl:attribute>
-                       <xsl:attribute name="ind1">
-                               <xsl:value-of select="$ind1"/>
-                       </xsl:attribute>
-                       <xsl:attribute name="ind2">
-                               <xsl:value-of select="$ind2"/>
-                       </xsl:attribute>
-                       <xsl:copy-of select="$subfields"/>
-               </xsl:element>
-       </xsl:template>
-
-       <xsl:template name="subfieldSelect">
-               <xsl:param name="codes"/>
-               <xsl:param name="delimeter"><xsl:text> </xsl:text></xsl:param>
-               <xsl:variable name="str">
-                       <xsl:for-each select="marc:subfield">
-                               <xsl:if test="contains($codes, @code)">
-                                       <xsl:value-of select="text()"/><xsl:value-of select="$delimeter"/>
-                               </xsl:if>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
-       </xsl:template>
-
-       <xsl:template name="buildSpaces">
-               <xsl:param name="spaces"/>
-               <xsl:param name="char"><xsl:text> </xsl:text></xsl:param>
-               <xsl:if test="$spaces>0">
-                       <xsl:value-of select="$char"/>
-                       <xsl:call-template name="buildSpaces">
-                               <xsl:with-param name="spaces" select="$spaces - 1"/>
-                               <xsl:with-param name="char" select="$char"/>
-                       </xsl:call-template>
-               </xsl:if>
-       </xsl:template>
-
-       <xsl:template name="chopPunctuation">
-               <xsl:param name="chopString"/>
-               <xsl:param name="punctuation"><xsl:text>.:,;/ </xsl:text></xsl:param>
-               <xsl:variable name="length" select="string-length($chopString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="contains($punctuation, substring($chopString,$length,1))">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
-                                       <xsl:with-param name="punctuation" select="$punctuation"/>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:when test="not($chopString)"/>
-                       <xsl:otherwise><xsl:value-of select="$chopString"/></xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-
-       <xsl:template name="chopPunctuationFront">
-               <xsl:param name="chopString"/>
-               <xsl:variable name="length" select="string-length($chopString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="contains('.:,;/[ ', substring($chopString,1,1))">
-                               <xsl:call-template name="chopPunctuationFront">
-                                       <xsl:with-param name="chopString" select="substring($chopString,2,$length - 1)"/>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:when test="not($chopString)"/>
-                       <xsl:otherwise><xsl:value-of select="$chopString"/></xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-</xsl:stylesheet>$$ WHERE name = 'mods32';
-
-COMMIT;
-
-INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule)
- SELECT  1, d.id, f.id, m.id
-   FROM  config.rule_circ_duration d
-               JOIN config.rule_recuring_fine f ON (f.name = d.name)
-               JOIN config.rule_max_fine m ON (f.name = m.name)
-   WHERE m.name = 'default';
-
diff --git a/Open-ILS/src/sql/Pg/1.4-shadow_full_rec-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.4-shadow_full_rec-upgrade-db.sql
deleted file mode 100644 (file)
index bf44934..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com> 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-
-BEGIN;
-
--- To avoid any updates while we're doin' our thing...
-SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
--- This index, right here, is the reason for this change.
-DROP INDEX metabib.metabib_full_rec_value_idx;
-
--- So, on to it.
--- Move the table out of the way ...
-ALTER TABLE metabib.full_rec RENAME TO real_full_rec;
-
--- ... and let the trigger management functions know about the change ...
-CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
-    DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$
-
-    TRUNCATE TABLE reporter.materialized_simple_record;
-
-    INSERT INTO reporter.materialized_simple_record
-        (id,fingerprint,quality,tcn_source,tcn_value,title,author,publisher,pubdate,isbn,issn)
-        SELECT DISTINCT ON (id) * FROM reporter.old_super_simple_record;
-
-    CREATE TRIGGER zzz_update_materialized_simple_record_tgr
-        AFTER INSERT OR UPDATE OR DELETE ON metabib.real_full_rec
-        FOR EACH ROW EXECUTE PROCEDURE reporter.simple_rec_sync();
-
-$$ LANGUAGE SQL;
-
--- ... replace the table with a suitable view, which applies the index contstraint we'll use ...
-CREATE OR REPLACE VIEW metabib.full_rec AS
-    SELECT  id,
-            record,
-            tag,
-            ind1,
-            ind2,
-            subfield,
-            SUBSTRING(value,1,1024) AS value,
-            index_vector
-      FROM  metabib.real_full_rec;
-
--- ... now some rules to transform DML against the view into DML against the underlying table ...
-CREATE OR REPLACE RULE metabib_full_rec_insert_rule
-    AS ON INSERT TO metabib.full_rec
-    DO INSTEAD
-    INSERT INTO metabib.real_full_rec VALUES (
-        COALESCE(NEW.id, NEXTVAL('metabib.full_rec_id_seq'::REGCLASS)),
-        NEW.record,
-        NEW.tag,
-        NEW.ind1,
-        NEW.ind2,
-        NEW.subfield,
-        NEW.value,
-        NEW.index_vector
-    );
-
-CREATE OR REPLACE RULE metabib_full_rec_update_rule
-    AS ON UPDATE TO metabib.full_rec
-    DO INSTEAD
-    UPDATE  metabib.real_full_rec SET
-        id = NEW.id,
-        record = NEW.record,
-        tag = NEW.tag,
-        ind1 = NEW.ind1,
-        ind2 = NEW.ind2,
-        subfield = NEW.subfield,
-        value = NEW.value,
-        index_vector = NEW.index_vector
-      WHERE id = OLD.id;
-
-CREATE OR REPLACE RULE metabib_full_rec_delete_rule
-    AS ON DELETE TO metabib.full_rec
-    DO INSTEAD
-    DELETE FROM metabib.real_full_rec WHERE id = OLD.id;
-
--- ... and last, but not least, create a fore-shortened index on the value column.
-CREATE INDEX metabib_full_rec_value_idx ON metabib.real_full_rec (substring(value,1,1024));
-
--- Wheeee...
-COMMIT;
-
diff --git a/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql
deleted file mode 100644 (file)
index 2cf9905..0000000
+++ /dev/null
@@ -1,7506 +0,0 @@
-/*
- * Copyright (C) 2009  Equinox Software, Inc.
- * Mike Rylander <miker@esilibrary.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-
-
-DROP SCHEMA IF EXISTS acq CASCADE;
-DROP SCHEMA IF EXISTS serial CASCADE;
-
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('1.6.0.0');
-CREATE TABLE config.standing_penalty (
-       id              SERIAL  PRIMARY KEY,
-       name            TEXT    NOT NULL UNIQUE,
-       label           TEXT    NOT NULL,
-       block_list      TEXT
-);
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (1,'PATRON_EXCEEDS_FINES','Patron exceeds fine threshold','CIRC|HOLD|RENEW');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (2,'PATRON_EXCEEDS_OVERDUE_COUNT','Patron exceeds max overdue item threshold','CIRC|HOLD|RENEW');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (3,'PATRON_EXCEEDS_CHECKOUT_COUNT','Patron exceeds max checked out item threshold','CIRC');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (4,'PATRON_EXCEEDS_COLLECTIONS_WARNING','Patron exceeds pre-collections warning fine threshold','CIRC|HOLD|RENEW');
-
-INSERT INTO config.standing_penalty (id,name,label) VALUES (20,'ALERT_NOTE','Alerting Note, no blocks');
-INSERT INTO config.standing_penalty (id,name,label) VALUES (21,'SILENT_NOTE','Note, no blocks');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (22,'STAFF_C','Alerting block on Circ','CIRC');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (23,'STAFF_CH','Alerting block on Circ and Hold','CIRC|HOLD');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (24,'STAFF_CR','Alerting block on Circ and Renew','CIRC|RENEW');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (25,'STAFF_CHR','Alerting block on Circ, Hold and Renew','CIRC|HOLD|RENEW');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (26,'STAFF_HR','Alerting block on Hold and Renew','HOLD|RENEW');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (27,'STAFF_H','Alerting block on Hold','HOLD');
-INSERT INTO config.standing_penalty (id,name,label,block_list) VALUES (28,'STAFF_R','Alerting block on Renew','RENEW');
-
-SELECT SETVAL('config.standing_penalty_id_seq', 100);
-
-CREATE TABLE config.billing_type (
-    id              SERIAL  PRIMARY KEY,
-    name            TEXT    NOT NULL,
-    owner           INT     NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    default_price   NUMERIC(6,2),
-    CONSTRAINT billing_type_once_per_lib UNIQUE (name, owner)
-);
-
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 1, 'Overdue Materials', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 2, 'Long Overdue Collection Fee', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 3, 'Lost Materials', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 4, 'Lost Materials Processing Fee', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 5, 'System: Deposit', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 6, 'System: Rental', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 7, 'Damaged Item', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 8, 'Damaged Item Processing Fee', 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES ( 9, 'Notification Fee', 1);
-
-SELECT SETVAL('config.billing_type_id_seq'::TEXT, 100);
-ALTER TABLE actor.usr ADD COLUMN alias TEXT;
-ALTER TABLE actor.usr ADD COLUMN juvenile BOOL;
-ALTER TABLE auditor.actor_usr_history ADD COLUMN alias TEXT;
-ALTER TABLE auditor.actor_usr_history ADD COLUMN juvenile BOOL;
-
-ALTER TABLE actor.usr ALTER COLUMN juvenile SET DEFAULT FALSE;
-UPDATE actor.usr SET juvenile=FALSE;
-
-
-DROP TABLE actor.usr_standing_penalty;
-CREATE TABLE actor.usr_standing_penalty (
-       id                      SERIAL  PRIMARY KEY,
-       org_unit                INT     NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       usr                     INT     NOT NULL REFERENCES actor.usr (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       standing_penalty        INT     NOT NULL REFERENCES config.standing_penalty (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       staff                   INT     REFERENCES actor.usr (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-       set_date                TIMESTAMP WITH TIME ZONE        DEFAULT NOW(),
-       stop_date               TIMESTAMP WITH TIME ZONE,
-       note                    TEXT
-);
-CREATE INDEX actor_usr_standing_penalty_usr_idx ON actor.usr_standing_penalty (usr);
-
-
-ALTER TABLE actor.usr_address ADD COLUMN pending BOOL;
-ALTER TABLE actor.usr_address ADD COLUMN replaces INT;
-ALTER TABLE auditor.actor_usr_address_history ADD COLUMN pending BOOL;
-ALTER TABLE auditor.actor_usr_address_history ADD COLUMN replaces INT;
-
-ALTER TABLE actor.usr_address ALTER COLUMN pending SET DEFAULT FALSE;
-UPDATE actor.usr_address SET pending = FALSE;
-
-
-CREATE TABLE permission.grp_penalty_threshold (
-    id          SERIAL          PRIMARY KEY,
-    grp         INT             NOT NULL REFERENCES permission.grp_tree (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    org_unit    INT             NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    penalty     INT             NOT NULL REFERENCES config.standing_penalty (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    threshold   NUMERIC(8,2)    NOT NULL,
-    CONSTRAINT penalty_grp_once UNIQUE (grp,penalty)
-);
-
-INSERT INTO permission.grp_penalty_threshold (grp,org_unit,penalty,threshold) VALUES (1,1,1,10.0);
-INSERT INTO permission.grp_penalty_threshold (grp,org_unit,penalty,threshold) VALUES (1,1,2,10.0);
-INSERT INTO permission.grp_penalty_threshold (grp,org_unit,penalty,threshold) VALUES (1,1,3,10.0);
-SELECT SETVAL('permission.grp_penalty_threshold_id_seq'::TEXT, (SELECT MAX(id) FROM permission.grp_penalty_threshold));
-
-
-
-CREATE OR REPLACE FUNCTION permission.usr_has_perm_at_nd(
-       user_id    IN INTEGER,
-       perm_code  IN TEXT
-)
-RETURNS SETOF INTEGER AS $$
---
--- Return a set of all the org units for which a given user has a given
--- permission, granted directly (not through inheritance from a parent
--- org unit).
---
--- The permissions apply to a minimum depth of the org unit hierarchy,
--- for the org unit(s) to which the user is assigned.  (They also apply
--- to the subordinates of those org units, but we don't report the
--- subordinates here.)
---
--- For purposes of this function, the permission.usr_work_ou_map table
--- defines which users belong to which org units.  I.e. we ignore the
--- home_ou column of actor.usr.
---
--- The result set may contain duplicates, which should be eliminated
--- by a DISTINCT clause.
---
-DECLARE
-       b_super       BOOLEAN;
-       n_perm        INTEGER;
-       n_min_depth   INTEGER; 
-       n_work_ou     INTEGER;
-       n_curr_ou     INTEGER;
-       n_depth       INTEGER;
-       n_curr_depth  INTEGER;
-BEGIN
-       --
-       -- Check for superuser
-       --
-       SELECT INTO b_super
-               super_user
-       FROM
-               actor.usr
-       WHERE
-               id = user_id;
-       --
-       IF NOT FOUND THEN
-               return;                         -- No user?  No permissions.
-       ELSIF b_super THEN
-               --
-               -- Super user has all permissions everywhere
-               --
-               FOR n_work_ou IN
-                       SELECT
-                               id
-                       FROM
-                               actor.org_unit
-                       WHERE
-                               parent_ou IS NULL
-               LOOP
-                       RETURN NEXT n_work_ou; 
-               END LOOP;
-               RETURN;
-       END IF;
-       --
-       -- Translate the permission name
-       -- to a numeric permission id
-       --
-       SELECT INTO n_perm
-               id
-       FROM
-               permission.perm_list
-       WHERE
-               code = perm_code;
-       --
-       IF NOT FOUND THEN
-               RETURN;               -- No such permission
-       END IF;
-       --
-       -- Find the highest-level org unit (i.e. the minimum depth)
-       -- to which the permission is applied for this user
-       --
-       -- This query is modified from the one in permission.usr_perms().
-       --
-       SELECT INTO n_min_depth
-               min( depth )
-       FROM    (
-               SELECT depth 
-                 FROM permission.usr_perm_map upm
-                WHERE upm.usr = user_id 
-                  AND upm.perm = n_perm
-                                       UNION
-               SELECT  gpm.depth
-                 FROM  permission.grp_perm_map gpm
-                 WHERE gpm.perm = n_perm 
-               AND gpm.grp IN (
-                          SELECT       (permission.grp_ancestors(
-                                       (SELECT profile FROM actor.usr WHERE id = user_id)
-                               )).id
-                       )
-                                       UNION
-               SELECT  p.depth
-                 FROM  permission.grp_perm_map p 
-                 WHERE p.perm = n_perm
-                   AND p.grp IN (
-                               SELECT (permission.grp_ancestors(m.grp)).id 
-                               FROM   permission.usr_grp_map m
-                               WHERE  m.usr = user_id
-                       )
-       ) AS x;
-       --
-       IF NOT FOUND THEN
-               RETURN;                -- No such permission for this user
-       END IF;
-       --
-       -- Identify the org units to which the user is assigned.  Note that
-       -- we pay no attention to the home_ou column in actor.usr.
-       --
-       FOR n_work_ou IN
-               SELECT
-                       work_ou
-               FROM
-                       permission.usr_work_ou_map
-               WHERE
-                       usr = user_id
-       LOOP            -- For each org unit to which the user is assigned
-               --
-               -- Determine the level of the org unit by a lookup in actor.org_unit_type.
-               -- We take it on faith that this depth agrees with the actual hierarchy
-               -- defined in actor.org_unit.
-               --
-               SELECT INTO n_depth
-                   type.depth
-               FROM
-                   actor.org_unit_type type
-                       INNER JOIN actor.org_unit ou
-                           ON ( ou.ou_type = type.id )
-               WHERE
-                   ou.id = n_work_ou;
-               --
-               IF NOT FOUND THEN
-                       CONTINUE;        -- Maybe raise exception?
-               END IF;
-               --
-               -- Compare the depth of the work org unit to the
-               -- minimum depth, and branch accordingly
-               --
-               IF n_depth = n_min_depth THEN
-                       --
-                       -- The org unit is at the right depth, so return it.
-                       --
-                       RETURN NEXT n_work_ou;
-               ELSIF n_depth > n_min_depth THEN
-                       --
-                       -- Traverse the org unit tree toward the root,
-                       -- until you reach the minimum depth determined above
-                       --
-                       n_curr_depth := n_depth;
-                       n_curr_ou := n_work_ou;
-                       WHILE n_curr_depth > n_min_depth LOOP
-                               SELECT INTO n_curr_ou
-                                       parent_ou
-                               FROM
-                                       actor.org_unit
-                               WHERE
-                                       id = n_curr_ou;
-                               --
-                               IF FOUND THEN
-                                       n_curr_depth := n_curr_depth - 1;
-                               ELSE
-                                       --
-                                       -- This can happen only if the hierarchy defined in
-                                       -- actor.org_unit is corrupted, or out of sync with
-                                       -- the depths defined in actor.org_unit_type.
-                                       -- Maybe we should raise an exception here, instead
-                                       -- of silently ignoring the problem.
-                                       --
-                                       n_curr_ou = NULL;
-                                       EXIT;
-                               END IF;
-                       END LOOP;
-                       --
-                       IF n_curr_ou IS NOT NULL THEN
-                               RETURN NEXT n_curr_ou;
-                       END IF;
-               ELSE
-                       --
-                       -- The permission applies only at a depth greater than the work org unit.
-                       -- Use connectby() to find all dependent org units at the specified depth.
-                       --
-                       FOR n_curr_ou IN
-                               SELECT ou::INTEGER
-                               FROM connectby( 
-                                               'actor.org_unit',         -- table name
-                                               'id',                     -- key column
-                                               'parent_ou',              -- recursive foreign key
-                                               n_work_ou::TEXT,          -- id of starting point
-                                               (n_min_depth - n_depth)   -- max depth to search, relative
-                                       )                             --   to starting point
-                                       AS t(
-                                               ou text,            -- dependent org unit
-                                               parent_ou text,     -- (ignore)
-                                               level int           -- depth relative to starting point
-                                       )
-                               WHERE
-                                       level = n_min_depth - n_depth
-                       LOOP
-                               RETURN NEXT n_curr_ou;
-                       END LOOP;
-               END IF;
-               --
-       END LOOP;
-       --
-       RETURN;
-       --
-END;
-$$ LANGUAGE 'plpgsql';
-
-
-CREATE OR REPLACE FUNCTION permission.usr_has_perm_at_all_nd(
-       user_id    IN INTEGER,
-       perm_code  IN TEXT
-)
-RETURNS SETOF INTEGER AS $$
---
--- Return a set of all the org units for which a given user has a given
--- permission, granted either directly or through inheritance from a parent
--- org unit.
---
--- The permissions apply to a minimum depth of the org unit hierarchy, and
--- to the subordinates of those org units, for the org unit(s) to which the
--- user is assigned.
---
--- For purposes of this function, the permission.usr_work_ou_map table
--- assigns users to org units.  I.e. we ignore the home_ou column of actor.usr.
---
--- The result set may contain duplicates, which should be eliminated
--- by a DISTINCT clause.
---
-DECLARE
-       n_head_ou     INTEGER;
-       n_child_ou    INTEGER;
-BEGIN
-       FOR n_head_ou IN
-               SELECT DISTINCT * FROM permission.usr_has_perm_at_nd( user_id, perm_code )
-       LOOP
-               --
-               -- The permission applies only at a depth greater than the work org unit.
-               -- Use connectby() to find all dependent org units at the specified depth.
-               --
-               FOR n_child_ou IN
-                       SELECT ou::INTEGER
-                       FROM connectby( 
-                                       'actor.org_unit',   -- table name
-                                       'id',               -- key column
-                                       'parent_ou',        -- recursive foreign key
-                                       n_head_ou::TEXT,    -- id of starting point
-                                       0                   -- no limit on search depth
-                               )
-                               AS t(
-                                       ou text,            -- dependent org unit
-                                       parent_ou text,     -- (ignore)
-                                       level int           -- (ignore)
-                               )
-               LOOP
-                       RETURN NEXT n_child_ou;
-               END LOOP;
-       END LOOP;
-       --
-       RETURN;
-       --
-END;
-$$ LANGUAGE 'plpgsql';
-
-
-CREATE OR REPLACE FUNCTION permission.usr_has_perm_at(
-       user_id    IN INTEGER,
-       perm_code  IN TEXT
-)
-RETURNS SETOF INTEGER AS $$
-SELECT DISTINCT * FROM permission.usr_has_perm_at_nd( $1, $2 );
-$$ LANGUAGE 'sql';
-
-
-CREATE OR REPLACE FUNCTION permission.usr_has_perm_at_all(
-       user_id    IN INTEGER,
-       perm_code  IN TEXT
-)
-RETURNS SETOF INTEGER AS $$
-SELECT DISTINCT * FROM permission.usr_has_perm_at_all_nd( $1, $2 );
-$$ LANGUAGE 'sql';
-
-
-
-CREATE OR REPLACE FUNCTION vandelay.ingest_items ( import_id BIGINT, attr_def_id BIGINT ) RETURNS SETOF vandelay.import_item AS $$
-DECLARE
-
-    owning_lib      TEXT;
-    circ_lib        TEXT;
-    call_number     TEXT;
-    copy_number     TEXT;
-    status          TEXT;
-    location        TEXT;
-    circulate       TEXT;
-    deposit         TEXT;
-    deposit_amount  TEXT;
-    ref             TEXT;
-    holdable        TEXT;
-    price           TEXT;
-    barcode         TEXT;
-    circ_modifier   TEXT;
-    circ_as_type    TEXT;
-    alert_message   TEXT;
-    opac_visible    TEXT;
-    pub_note        TEXT;
-    priv_note       TEXT;
-
-    attr_def        RECORD;
-    tmp_attr_set    RECORD;
-    attr_set        vandelay.import_item%ROWTYPE;
-
-    xpath           TEXT;
-
-BEGIN
-
-    SELECT * INTO attr_def FROM vandelay.import_item_attr_definition WHERE id = attr_def_id;
-
-    IF FOUND THEN
-
-        attr_set.definition := attr_def.id;
-
-        -- Build the combined XPath
-
-        owning_lib :=
-            CASE
-                WHEN attr_def.owning_lib IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.owning_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.owning_lib || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.owning_lib
-            END;
-
-        circ_lib :=
-            CASE
-                WHEN attr_def.circ_lib IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_lib || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_lib
-            END;
-
-        call_number :=
-            CASE
-                WHEN attr_def.call_number IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.call_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.call_number || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.call_number
-            END;
-
-        copy_number :=
-            CASE
-                WHEN attr_def.copy_number IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.copy_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.copy_number || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.copy_number
-            END;
-
-        status :=
-            CASE
-                WHEN attr_def.status IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.status ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.status || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.status
-            END;
-
-        location :=
-            CASE
-                WHEN attr_def.location IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.location ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.location || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.location
-            END;
-
-        circulate :=
-            CASE
-                WHEN attr_def.circulate IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circulate ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circulate || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circulate
-            END;
-
-        deposit :=
-            CASE
-                WHEN attr_def.deposit IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.deposit ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit
-            END;
-
-        deposit_amount :=
-            CASE
-                WHEN attr_def.deposit_amount IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.deposit_amount ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit_amount || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit_amount
-            END;
-
-        ref :=
-            CASE
-                WHEN attr_def.ref IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.ref ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.ref || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.ref
-            END;
-
-        holdable :=
-            CASE
-                WHEN attr_def.holdable IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.holdable ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.holdable || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.holdable
-            END;
-
-        price :=
-            CASE
-                WHEN attr_def.price IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.price ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.price || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.price
-            END;
-
-        barcode :=
-            CASE
-                WHEN attr_def.barcode IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.barcode ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.barcode || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.barcode
-            END;
-
-        circ_modifier :=
-            CASE
-                WHEN attr_def.circ_modifier IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_modifier ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_modifier || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_modifier
-            END;
-
-        circ_as_type :=
-            CASE
-                WHEN attr_def.circ_as_type IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.circ_as_type ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_as_type || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_as_type
-            END;
-
-        alert_message :=
-            CASE
-                WHEN attr_def.alert_message IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.alert_message ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.alert_message || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.alert_message
-            END;
-
-        opac_visible :=
-            CASE
-                WHEN attr_def.opac_visible IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.opac_visible ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.opac_visible || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.opac_visible
-            END;
-
-        pub_note :=
-            CASE
-                WHEN attr_def.pub_note IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.pub_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.pub_note || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.pub_note
-            END;
-        priv_note :=
-            CASE
-                WHEN attr_def.priv_note IS NULL THEN 'null()'
-                WHEN LENGTH( attr_def.priv_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.priv_note || '"]'
-                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.priv_note
-            END;
-
-
-        xpath :=
-            owning_lib      || '|' ||
-            circ_lib        || '|' ||
-            call_number     || '|' ||
-            copy_number     || '|' ||
-            status          || '|' ||
-            location        || '|' ||
-            circulate       || '|' ||
-            deposit         || '|' ||
-            deposit_amount  || '|' ||
-            ref             || '|' ||
-            holdable        || '|' ||
-            price           || '|' ||
-            barcode         || '|' ||
-            circ_modifier   || '|' ||
-            circ_as_type    || '|' ||
-            alert_message   || '|' ||
-            pub_note        || '|' ||
-            priv_note       || '|' ||
-            opac_visible;
-
-        -- RAISE NOTICE 'XPath: %', xpath;
-
-        FOR tmp_attr_set IN
-                SELECT  *
-                  FROM  xpath_table( 'id', 'marc', 'vandelay.queued_bib_record', xpath, 'id = ' || import_id )
-                            AS t( id BIGINT, ol TEXT, clib TEXT, cn TEXT, cnum TEXT, cs TEXT, cl TEXT, circ TEXT,
-                                  dep TEXT, dep_amount TEXT, r TEXT, hold TEXT, pr TEXT, bc TEXT, circ_mod TEXT,
-                                  circ_as TEXT, amessage TEXT, note TEXT, pnote TEXT, opac_vis TEXT )
-        LOOP
-
-            tmp_attr_set.pr = REGEXP_REPLACE(tmp_attr_set.pr, E'[^0-9\\.]', '', 'g');
-            tmp_attr_set.dep_amount = REGEXP_REPLACE(tmp_attr_set.dep_amount, E'[^0-9\\.]', '', 'g');
-
-            tmp_attr_set.pr := NULLIF( tmp_attr_set.pr, '' );
-            tmp_attr_set.dep_amount := NULLIF( tmp_attr_set.dep_amount, '' );
-
-            SELECT id INTO attr_set.owning_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.ol); -- INT
-            SELECT id INTO attr_set.circ_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.clib); -- INT
-            SELECT id INTO attr_set.status FROM config.copy_status WHERE LOWER(name) = LOWER(tmp_attr_set.cs); -- INT
-
-            SELECT  id INTO attr_set.location
-              FROM  asset.copy_location
-              WHERE LOWER(name) = LOWER(tmp_attr_set.cl)
-                    AND asset.copy_location.owning_lib = COALESCE(attr_set.owning_lib, attr_set.circ_lib); -- INT
-
-            attr_set.circulate      :=
-                LOWER( SUBSTRING( tmp_attr_set.circ, 1, 1)) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.circ) = 'circulating'; -- BOOL
-
-            attr_set.deposit        :=
-                LOWER( SUBSTRING( tmp_attr_set.dep, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.dep) = 'deposit'; -- BOOL
-
-            attr_set.holdable       :=
-                LOWER( SUBSTRING( tmp_attr_set.hold, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.hold) = 'holdable'; -- BOOL
-
-            attr_set.opac_visible   :=
-                LOWER( SUBSTRING( tmp_attr_set.opac_vis, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.opac_vis) = 'visible'; -- BOOL
-
-            attr_set.ref            :=
-                LOWER( SUBSTRING( tmp_attr_set.r, 1, 1 ) ) IN ('t','y','1')
-                OR LOWER(tmp_attr_set.r) = 'reference'; -- BOOL
-
-            attr_set.copy_number    := tmp_attr_set.cnum::INT; -- INT,
-            attr_set.deposit_amount := tmp_attr_set.dep_amount::NUMERIC(6,2); -- NUMERIC(6,2),
-            attr_set.price          := tmp_attr_set.pr::NUMERIC(8,2); -- NUMERIC(8,2),
-
-            attr_set.call_number    := tmp_attr_set.cn; -- TEXT
-            attr_set.barcode        := tmp_attr_set.bc; -- TEXT,
-            attr_set.circ_modifier  := tmp_attr_set.circ_mod; -- TEXT,
-            attr_set.circ_as_type   := tmp_attr_set.circ_as; -- TEXT,
-            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
-            attr_set.pub_note       := tmp_attr_set.note; -- TEXT,
-            attr_set.priv_note      := tmp_attr_set.pnote; -- TEXT,
-            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
-
-            RETURN NEXT attr_set;
-
-        END LOOP;
-
-    END IF;
-
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION actor.org_unit_ancestors ( INT ) RETURNS SETOF actor.org_unit AS $$
-        SELECT  a.*
-          FROM  connectby('actor.org_unit'::text,'parent_ou'::text,'id'::text,'name'::text,$1::text,100,'.'::text)
-                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-                JOIN actor.org_unit a ON a.id::text = t.keyid::text
-        JOIN actor.org_unit_type tp ON tp.id = a.ou_type
-        ORDER BY tp.depth, a.name;
-$$ LANGUAGE SQL STABLE;
-
-CREATE OR REPLACE FUNCTION actor.org_unit_ancestor_setting( setting_name TEXT, org_id INT ) RETURNS SETOF actor.org_unit_setting AS $$
-DECLARE
-    setting RECORD;
-    cur_org INT;
-BEGIN
-    cur_org := org_id;
-    LOOP
-        SELECT INTO setting * FROM actor.org_unit_setting WHERE org_unit = cur_org AND name = setting_name;
-        IF FOUND THEN
-            RETURN NEXT setting;
-        END IF;
-        SELECT INTO cur_org parent_ou FROM actor.org_unit WHERE id = cur_org;
-        EXIT WHEN cur_org IS NULL;
-    END LOOP;
-    RETURN;
-END;
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION actor.org_unit_ancestor_setting( TEXT, INT) IS $$
-/**
-* Search "up" the org_unit tree until we find the first occurrence of an 
-* org_unit_setting with the given name.
-*/
-$$;
-
-ALTER TABLE asset.copy_tranparency_map RENAME TO copy_transparency_map;
-ALTER TABLE asset.copy_transparency_map RENAME COLUMN tansparency TO transparency;
-
-CREATE TABLE asset.uri (
-    id  SERIAL  PRIMARY KEY,
-    href    TEXT    NOT NULL,
-    label   TEXT,
-    use_restriction TEXT,
-    active  BOOL    NOT NULL DEFAULT TRUE
-);
-
-CREATE TABLE asset.uri_call_number_map (
-    id          BIGSERIAL   PRIMARY KEY,
-    uri         INT         NOT NULL REFERENCES asset.uri (id),
-    call_number INT         NOT NULL REFERENCES asset.call_number (id),
-    CONSTRAINT uri_cn_once UNIQUE (uri,call_number)
-);
-CREATE INDEX asset_uri_call_number_map_cn_idx ON asset.uri_call_number_map (call_number);
-
------------------------------
-
-CREATE TABLE container.copy_bucket_type (
-       code    TEXT    PRIMARY KEY,
-       label   TEXT    NOT NULL UNIQUE
-);
-
-
-CREATE TABLE container.copy_bucket_note (
-    id      SERIAL      PRIMARY KEY,
-    bucket  INT         NOT NULL REFERENCES container.copy_bucket (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
-ALTER TABLE container.copy_bucket_item ADD COLUMN pos INT;
-CREATE INDEX copy_bucket_item_bucket_idx ON container.copy_bucket_item (bucket);
-
-CREATE TABLE container.copy_bucket_item_note (
-    id      SERIAL      PRIMARY KEY,
-    item    INT         NOT NULL REFERENCES container.copy_bucket_item (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
------------------------------ 
-CREATE TABLE container.call_number_bucket_type (
-       code    TEXT    PRIMARY KEY,
-       label   TEXT    NOT NULL UNIQUE
-);
-ALTER TABLE container.call_number_bucket_item ADD COLUMN pos INT;
-CREATE INDEX call_number_bucket_item_bucket_idx ON container.call_number_bucket_item (bucket);
-
-CREATE TABLE container.call_number_bucket_note (
-    id      SERIAL      PRIMARY KEY,
-    bucket  INT         NOT NULL REFERENCES container.call_number_bucket (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
-
-CREATE TABLE container.call_number_bucket_item_note (
-    id      SERIAL      PRIMARY KEY,
-    item    INT         NOT NULL REFERENCES container.call_number_bucket_item (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
----------------------------
-CREATE TABLE container.biblio_record_entry_bucket_type (
-       code    TEXT    PRIMARY KEY,
-       label   TEXT    NOT NULL UNIQUE
-);
-
-
-CREATE TABLE container.biblio_record_entry_bucket_note (
-    id      SERIAL      PRIMARY KEY,
-    bucket  INT         NOT NULL REFERENCES container.biblio_record_entry_bucket (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
-ALTER TABLE container.biblio_record_entry_bucket_item ADD COLUMN pos INT;
-CREATE INDEX biblio_record_entry_bucket_item_bucket_idx ON container.biblio_record_entry_bucket_item (bucket);
-
-CREATE TABLE container.biblio_record_entry_bucket_item_note (
-    id      SERIAL      PRIMARY KEY,
-    item    INT         NOT NULL REFERENCES container.biblio_record_entry_bucket_item (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
----------------------------
-CREATE TABLE container.user_bucket_type (
-       code    TEXT    PRIMARY KEY,
-       label   TEXT    NOT NULL UNIQUE
-);
-CREATE TABLE container.user_bucket_note (
-    id      SERIAL      PRIMARY KEY,
-    bucket  INT         NOT NULL REFERENCES container.user_bucket (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
-ALTER TABLE container.user_bucket_item ADD COLUMN pos INT;
-CREATE INDEX user_bucket_item_bucket_idx ON container.user_bucket_item (bucket);
-
-CREATE TABLE container.user_bucket_item_note (
-    id      SERIAL      PRIMARY KEY,
-    item    INT         NOT NULL REFERENCES container.user_bucket_item (id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    note    TEXT        NOT NULL
-);
-
------------------------------
-
-INSERT INTO config.billing_type (name,owner) SELECT DISTINCT billing_type, 1 FROM money.billing WHERE billing_type NOT IN (SELECT name FROM config.billing_type);
-ALTER TABLE money.billing ADD COLUMN btype INT;
-
-UPDATE money.billing SET btype = config.billing_type.id FROM config.billing_type WHERE config.billing_type.name = money.billing.billing_type;
-ALTER TABLE money.billing ALTER COLUMN btype SET NOT NULL;
-ALTER TABLE money.billing ADD CONSTRAINT btype_fkey FOREIGN KEY (btype) REFERENCES config.billing_type (id) ON DELETE RESTRICT DEFERRABLE INITIALLY DEFERRED;
-
-
-CREATE TABLE money.materialized_billable_xact_summary AS
-       SELECT * FROM money.billable_xact_summary WHERE 1=0;
-
-CREATE INDEX money_mat_summary_id_idx ON money.materialized_billable_xact_summary (id);
-CREATE INDEX money_mat_summary_usr_idx ON money.materialized_billable_xact_summary (usr);
-CREATE INDEX money_mat_summary_xact_start_idx ON money.materialized_billable_xact_summary (xact_start);
-
-/* AFTER trigger only! */
-CREATE OR REPLACE FUNCTION money.mat_summary_create () RETURNS TRIGGER AS $$
-BEGIN
-       INSERT INTO money.materialized_billable_xact_summary (id, usr, xact_start, xact_finish, total_paid, total_owed, balance_owed, xact_type)
-               VALUES ( NEW.id, NEW.usr, NEW.xact_start, NEW.xact_finish, 0.0, 0.0, 0.0, TG_ARGV[0]);
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* BEFORE or AFTER trigger only! */
-CREATE OR REPLACE FUNCTION money.mat_summary_update () RETURNS TRIGGER AS $$
-BEGIN
-       UPDATE  money.materialized_billable_xact_summary
-         SET   usr = NEW.usr,
-               xact_start = NEW.xact_start,
-               xact_finish = NEW.xact_finish
-         WHERE id = NEW.id;
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* AFTER trigger only! */
-CREATE OR REPLACE FUNCTION money.mat_summary_delete () RETURNS TRIGGER AS $$
-BEGIN
-       DELETE FROM money.materialized_billable_xact_summary WHERE id = OLD.id;
-       RETURN OLD;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER mat_summary_create_tgr AFTER INSERT ON money.grocery FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_create ('grocery');
-CREATE TRIGGER mat_summary_change_tgr AFTER UPDATE ON money.grocery FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_update ();
-CREATE TRIGGER mat_summary_remove_tgr AFTER DELETE ON money.grocery FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_delete ();
-
-
-
-/* BEFORE or AFTER trigger */
-CREATE OR REPLACE FUNCTION money.materialized_summary_billing_add () RETURNS TRIGGER AS $$
-BEGIN
-       IF NOT NEW.voided THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_owed = total_owed + NEW.amount,
-                       last_billing_ts = NEW.billing_ts,
-                       last_billing_note = NEW.note,
-                       last_billing_type = NEW.billing_type,
-                       balance_owed = balance_owed + NEW.amount
-                 WHERE id = NEW.xact;
-       END IF;
-
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* AFTER trigger only! */
-CREATE OR REPLACE FUNCTION money.materialized_summary_billing_update () RETURNS TRIGGER AS $$
-DECLARE
-       old_billing     money.billing%ROWTYPE;
-       old_voided      money.billing%ROWTYPE;
-BEGIN
-
-       SELECT * INTO old_billing FROM money.billing WHERE xact = NEW.xact AND NOT voided ORDER BY billing_ts DESC LIMIT 1;
-       SELECT * INTO old_voided FROM money.billing WHERE xact = NEW.xact ORDER BY billing_ts DESC LIMIT 1;
-
-       IF NEW.voided AND NOT OLD.voided THEN
-               IF OLD.id = old_voided.id THEN
-                       UPDATE  money.materialized_billable_xact_summary
-                         SET   last_billing_ts = old_billing.billing_ts,
-                               last_billing_note = old_billing.note,
-                               last_billing_type = old_billing.billing_type
-                         WHERE id = OLD.xact;
-               END IF;
-
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_owed = total_owed - NEW.amount,
-                       balance_owed = balance_owed - NEW.amount
-                 WHERE id = NEW.xact;
-
-       ELSIF NOT NEW.voided AND OLD.voided THEN
-
-               IF OLD.id = old_billing.id THEN
-                       UPDATE  money.materialized_billable_xact_summary
-                         SET   last_billing_ts = old_billing.billing_ts,
-                               last_billing_note = old_billing.note,
-                               last_billing_type = old_billing.billing_type
-                         WHERE id = OLD.xact;
-               END IF;
-
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_owed = total_owed + NEW.amount,
-                       balance_owed = balance_owed + NEW.amount
-                 WHERE id = NEW.xact;
-
-       ELSE
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_owed = total_owed - (OLD.amount - NEW.amount),
-                       balance_owed = balance_owed - (OLD.amount - NEW.amount)
-                 WHERE id = NEW.xact;
-       END IF;
-
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* BEFORE trigger only! */
-CREATE OR REPLACE FUNCTION money.materialized_summary_billing_del () RETURNS TRIGGER AS $$
-DECLARE
-       prev_billing    money.billing%ROWTYPE;
-       old_billing     money.billing%ROWTYPE;
-BEGIN
-       SELECT * INTO prev_billing FROM money.billing WHERE xact = OLD.xact AND NOT voided ORDER BY billing_ts DESC LIMIT 1 OFFSET 1;
-       SELECT * INTO old_billing FROM money.billing WHERE xact = OLD.xact AND NOT voided ORDER BY billing_ts DESC LIMIT 1;
-
-       IF OLD.id = old_billing.id THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   last_billing_ts = prev_billing.billing_ts,
-                       last_billing_note = prev_billing.note,
-                       last_billing_type = prev_billing.billing_type
-                 WHERE id = NEW.xact;
-       END IF;
-
-       IF NOT OLD.voided THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_owed = total_owed - OLD.amount,
-                       balance_owed = balance_owed + OLD.amount
-                 WHERE id = OLD.xact;
-       END IF;
-
-       RETURN OLD;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.billing FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_billing_add ();
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.billing FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_billing_update ();
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.billing FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_billing_del ();
-
-
-/* BEFORE or AFTER trigger */
-CREATE OR REPLACE FUNCTION money.materialized_summary_payment_add () RETURNS TRIGGER AS $$
-BEGIN
-       IF NOT NEW.voided THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_paid = total_paid + NEW.amount,
-                       last_payment_ts = NEW.payment_ts,
-                       last_payment_note = NEW.note,
-                       last_payment_type = TG_ARGV[0],
-                       balance_owed = balance_owed - NEW.amount
-                 WHERE id = NEW.xact;
-       END IF;
-
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* AFTER trigger only! */
-CREATE OR REPLACE FUNCTION money.materialized_summary_payment_update () RETURNS TRIGGER AS $$
-DECLARE
-       old_payment     money.payment_view%ROWTYPE;
-       old_voided      money.payment_view%ROWTYPE;
-BEGIN
-
-       SELECT * INTO old_payment FROM money.payment_view WHERE xact = NEW.xact AND NOT voided ORDER BY payment_ts DESC LIMIT 1;
-       SELECT * INTO old_voided FROM money.payment_view WHERE xact = NEW.xact ORDER BY payment_ts DESC LIMIT 1;
-
-       IF NEW.voided AND NOT OLD.voided THEN
-               IF OLD.id = old_voided.id THEN
-                       UPDATE  money.materialized_billable_xact_summary
-                         SET   last_payment_ts = old_payment.payment_ts,
-                               last_payment_note = old_payment.note,
-                               last_payment_type = old_payment.payment_type
-                         WHERE id = OLD.xact;
-               END IF;
-
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_paid = total_paid - NEW.amount,
-                       balance_owed = balance_owed + NEW.amount
-                 WHERE id = NEW.xact;
-
-       ELSIF NOT NEW.voided AND OLD.voided THEN
-
-               IF OLD.id = old_payment.id THEN
-                       UPDATE  money.materialized_billable_xact_summary
-                         SET   last_payment_ts = old_payment.payment_ts,
-                               last_payment_note = old_payment.note,
-                               last_payment_type = old_payment.payment_type
-                         WHERE id = OLD.xact;
-               END IF;
-
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_paid = total_paid + NEW.amount,
-                       balance_owed = balance_owed - NEW.amount
-                 WHERE id = NEW.xact;
-
-       ELSE
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_paid = total_paid - (OLD.amount - NEW.amount),
-                       balance_owed = balance_owed + (OLD.amount - NEW.amount)
-                 WHERE id = NEW.xact;
-       END IF;
-
-       RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-/* BEFORE trigger only! */
-CREATE OR REPLACE FUNCTION money.materialized_summary_payment_del () RETURNS TRIGGER AS $$
-DECLARE
-       prev_payment    money.payment_view%ROWTYPE;
-       old_payment     money.payment_view%ROWTYPE;
-BEGIN
-       SELECT * INTO prev_payment FROM money.payment_view WHERE xact = OLD.xact AND NOT voided ORDER BY payment_ts DESC LIMIT 1 OFFSET 1;
-       SELECT * INTO old_payment FROM money.payment_view WHERE xact = OLD.xact AND NOT voided ORDER BY payment_ts DESC LIMIT 1;
-
-       IF OLD.id = old_payment.id THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   last_payment_ts = prev_payment.payment_ts,
-                       last_payment_note = prev_payment.note,
-                       last_payment_type = prev_payment.payment_type
-                 WHERE id = OLD.xact;
-       END IF;
-
-       IF NOT OLD.voided THEN
-               UPDATE  money.materialized_billable_xact_summary
-                 SET   total_paid = total_paid - OLD.amount,
-                       balance_owed = balance_owed + OLD.amount
-                 WHERE id = OLD.xact;
-       END IF;
-
-       RETURN OLD;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.bnm_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('bnm_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.bnm_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('bnm_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.bnm_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('bnm_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.forgive_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('forgive_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.forgive_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('forgive_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.forgive_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('forgive_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.work_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('work_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.work_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('work_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.work_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('work_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.credit_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('credit_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.credit_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('credit_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.credit_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('credit_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.goods_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('goods_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.goods_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('goods_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.goods_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('goods_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.bnm_desk_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('bnm_desk_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.bnm_desk_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('bnm_desk_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.bnm_desk_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('bnm_desk_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('cash_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('cash_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('cash_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('check_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('check_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('check_payment');
-
-CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.credit_card_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('credit_card_payment');
-CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.credit_card_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('credit_card_payment');
-CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.credit_card_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('credit_card_payment');
-
-
-CREATE TRIGGER mat_summary_create_tgr AFTER INSERT ON action.circulation FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_create ('circulation');
-CREATE TRIGGER mat_summary_change_tgr AFTER UPDATE ON action.circulation FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_update ();
-CREATE TRIGGER mat_summary_remove_tgr AFTER DELETE ON action.circulation FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_delete ();
-
-CREATE OR REPLACE VIEW action.billable_circulations AS
-       SELECT  *
-         FROM  action.circulation
-         WHERE xact_finish IS NULL;
-
-CREATE TABLE action.hold_request_cancel_cause (
-    id      SERIAL  PRIMARY KEY,
-    label   TEXT    UNIQUE
-);
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (1,'Untargeted expiration');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (2,'Hold Shelf expiration');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (3,'Patron via phone');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (4,'Patron in person');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (5,'Staff forced');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (6,'Patron via OPAC');
-SELECT SETVAL('action.hold_request_cancel_cause_id_seq', 100);
-ALTER TABLE action.hold_request ADD COLUMN cancel_cause INT;
-ALTER TABLE action.hold_request ADD COLUMN cancel_note TEXT;
-
-
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN juvenile_flag BOOL;
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN circulate BOOL NOT NULL DEFAULT TRUE;
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN duration_rule INT REFERENCES config.rule_circ_duration (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN recurring_fine_rule INT REFERENCES config.rule_recurring_fine (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN max_fine_rule INT REFERENCES config.rule_max_fine (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN script_test TEXT;
-
-ALTER TABLE config.circ_matrix_matchpoint DROP CONSTRAINT ep_once_per_grp_loc_mod_marc;
-ALTER TABLE config.circ_matrix_matchpoint
-       ADD CONSTRAINT ep_once_per_grp_loc_mod_marc
-               UNIQUE (grp, org_unit, circ_modifier, marc_type, marc_form, marc_vr_format, ref_flag, juvenile_flag, usr_age_lower_bound, usr_age_upper_bound, is_renewal);
-
-UPDATE config.circ_matrix_matchpoint
-  SET  duration_rule = config.circ_matrix_ruleset.duration_rule,
-       recurring_fine_rule = config.circ_matrix_ruleset.recurring_fine_rule,
-       max_fine_rule = config.circ_matrix_ruleset.max_fine_rule
-  FROM config.circ_matrix_ruleset
-  WHERE        config.circ_matrix_ruleset.matchpoint = config.circ_matrix_matchpoint.id;
-
-DROP TABLE config.circ_matrix_ruleset;
-
-ALTER TABLE config.circ_matrix_circ_mod_test DROP COLUMN circ_mod;
-CREATE TABLE config.circ_matrix_circ_mod_test_map (
-    id      SERIAL  PRIMARY KEY,
-    circ_mod_test   INT NOT NULL REFERENCES config.circ_matrix_circ_mod_test (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    circ_mod        TEXT    NOT NULL REFERENCES config.circ_modifier (code) ON DELETE CASCADE ON UPDATE CASCADE  DEFERRABLE INITIALLY DEFERRED,
-    CONSTRAINT cm_once_per_test UNIQUE (circ_mod_test, circ_mod)
-);
-DROP FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL );
-CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS config.circ_matrix_matchpoint AS $func$
-DECLARE
-    current_group    permission.grp_tree%ROWTYPE;
-    user_object    actor.usr%ROWTYPE;
-    item_object    asset.copy%ROWTYPE;
-    rec_descriptor    metabib.rec_descriptor%ROWTYPE;
-    current_mp    config.circ_matrix_matchpoint%ROWTYPE;
-    matchpoint    config.circ_matrix_matchpoint%ROWTYPE;
-BEGIN
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-    SELECT INTO rec_descriptor r.* FROM metabib.rec_descriptor r JOIN asset.call_number c USING (record) WHERE c.id = item_object.call_number;
-    SELECT INTO current_group * FROM permission.grp_tree WHERE id = user_object.profile;
-
-    LOOP
-        -- for each potential matchpoint for this ou and group ...
-        FOR current_mp IN
-            SELECT    m.*
-              FROM    config.circ_matrix_matchpoint m
-                JOIN actor.org_unit_ancestors( context_ou ) d ON (m.org_unit = d.id)
-                LEFT JOIN actor.org_unit_proximity p ON (p.from_org = context_ou AND p.to_org = d.id)
-              WHERE    m.grp = current_group.id AND m.active
-              ORDER BY    CASE WHEN p.prox        IS NULL THEN 999 ELSE p.prox END,
-                    CASE WHEN m.is_renewal = renewal        THEN 128 ELSE 0 END +
-                    CASE WHEN m.juvenile_flag    IS NOT NULL THEN 64 ELSE 0 END +
-                    CASE WHEN m.circ_modifier    IS NOT NULL THEN 32 ELSE 0 END +
-                    CASE WHEN m.marc_type        IS NOT NULL THEN 16 ELSE 0 END +
-                    CASE WHEN m.marc_form        IS NOT NULL THEN 8 ELSE 0 END +
-                    CASE WHEN m.marc_vr_format    IS NOT NULL THEN 4 ELSE 0 END +
-                    CASE WHEN m.ref_flag        IS NOT NULL THEN 2 ELSE 0 END +
-                    CASE WHEN m.usr_age_lower_bound    IS NOT NULL THEN 0.5 ELSE 0 END +
-                    CASE WHEN m.usr_age_upper_bound    IS NOT NULL THEN 0.5 ELSE 0 END DESC LOOP
-
-            IF current_mp.circ_modifier IS NOT NULL THEN
-                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
-            END IF;
-
-            IF current_mp.marc_type IS NOT NULL THEN
-                IF item_object.circ_as_type IS NOT NULL THEN
-                    CONTINUE WHEN current_mp.marc_type <> item_object.circ_as_type;
-                ELSE
-                    CONTINUE WHEN current_mp.marc_type <> rec_descriptor.item_type;
-                END IF;
-            END IF;
-
-            IF current_mp.marc_form IS NOT NULL THEN
-                CONTINUE WHEN current_mp.marc_form <> rec_descriptor.item_form;
-            END IF;
-
-            IF current_mp.marc_vr_format IS NOT NULL THEN
-                CONTINUE WHEN current_mp.marc_vr_format <> rec_descriptor.vr_format;
-            END IF;
-
-            IF current_mp.ref_flag IS NOT NULL THEN
-                CONTINUE WHEN current_mp.ref_flag <> item_object.ref;
-            END IF;
-
-            IF current_mp.juvenile_flag IS NOT NULL THEN
-                CONTINUE WHEN current_mp.juvenile_flag <> user_object.juvenile;
-            END IF;
-
-            IF current_mp.usr_age_lower_bound IS NOT NULL THEN
-                CONTINUE WHEN user_object.dob IS NULL OR current_mp.usr_age_lower_bound < age(user_object.dob);
-            END IF;
-
-            IF current_mp.usr_age_upper_bound IS NOT NULL THEN
-                CONTINUE WHEN user_object.dob IS NULL OR current_mp.usr_age_upper_bound > age(user_object.dob);
-            END IF;
-
-
-            -- everything was undefined or matched
-            matchpoint = current_mp;
-
-            EXIT WHEN matchpoint.id IS NOT NULL;
-        END LOOP;
-
-        EXIT WHEN current_group.parent IS NULL OR matchpoint.id IS NOT NULL;
-
-        SELECT INTO current_group * FROM permission.grp_tree WHERE id = current_group.parent;
-    END LOOP;
-
-    RETURN matchpoint;
-END;
-$func$ LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
-DECLARE
-    user_object        actor.usr%ROWTYPE;
-    standing_penalty    config.standing_penalty%ROWTYPE;
-    item_object        asset.copy%ROWTYPE;
-    item_status_object    config.copy_status%ROWTYPE;
-    item_location_object    asset.copy_location%ROWTYPE;
-    result            action.matrix_test_result;
-    circ_test        config.circ_matrix_matchpoint%ROWTYPE;
-    out_by_circ_mod        config.circ_matrix_circ_mod_test%ROWTYPE;
-    circ_mod_map        config.circ_matrix_circ_mod_test_map%ROWTYPE;
-    penalty_type         TEXT;
-    tmp_grp         INT;
-    items_out        INT;
-    context_org_list        INT[];
-    done            BOOL := FALSE;
-BEGIN
-    result.success := TRUE;
-
-    -- Fail if the user is BARRED
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-
-    -- Fail if we couldn't find a set of tests
-    IF user_object.id IS NULL THEN
-        result.fail_part := 'no_user';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
-
-    IF user_object.barred IS TRUE THEN
-        result.fail_part := 'actor.usr.barred';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    -- Fail if the item can't circulate
-    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-    IF item_object.circulate IS FALSE THEN
-        result.fail_part := 'asset.copy.circulate';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    -- Fail if the item isn't in a circulateable status on a non-renewal
-    IF NOT renewal AND item_object.status NOT IN ( 0, 7, 8 ) THEN
-        result.fail_part := 'asset.copy.status';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    ELSIF renewal AND item_object.status <> 1 THEN
-        result.fail_part := 'asset.copy.status';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    -- Fail if the item can't circulate because of the shelving location
-    SELECT INTO item_location_object * FROM asset.copy_location WHERE id = item_object.location;
-    IF item_location_object.circulate IS FALSE THEN
-        result.fail_part := 'asset.copy_location.circulate';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    SELECT INTO circ_test * FROM action.find_circ_matrix_matchpoint(circ_ou, match_item, match_user, renewal);
-    result.matchpoint := circ_test.id;
-
-    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( circ_test.org_unit );
-
-    -- Fail if we couldn't find a set of tests
-    IF result.matchpoint IS NULL THEN
-        result.fail_part := 'no_matchpoint';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    -- Fail if the test is set to hard non-circulating
-    IF circ_test.circulate IS FALSE THEN
-        result.fail_part := 'config.circ_matrix_test.circulate';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    IF renewal THEN
-        penalty_type = '%RENEW%';
-    ELSE
-        penalty_type = '%CIRC%';
-    END IF;
-
-    FOR standing_penalty IN
-        SELECT  DISTINCT csp.*
-          FROM  actor.usr_standing_penalty usp
-                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
-          WHERE usr = match_user
-                AND usp.org_unit IN ( SELECT * FROM explode_array(context_org_list) )
-                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
-                AND csp.block_list LIKE penalty_type LOOP
-
-        result.fail_part := standing_penalty.name;
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END LOOP;
-
-    -- Fail if the user has too many items with specific circ_modifiers checked out
-    FOR out_by_circ_mod IN SELECT * FROM config.circ_matrix_circ_mod_test WHERE matchpoint = circ_test.id LOOP
-        SELECT  INTO items_out COUNT(*)
-          FROM  action.circulation circ
-            JOIN asset.copy cp ON (cp.id = circ.target_copy)
-          WHERE circ.usr = match_user
-               AND circ_lib IN ( SELECT * FROM explode_array(context_org_list) )
-            AND circ.checkin_time IS NULL
-            AND (circ.stop_fines IN ('MAXFINES','LONGOVERDUE') OR circ.stop_fines IS NULL)
-            AND cp.circ_modifier IN (SELECT circ_mod FROM config.circ_matrix_circ_mod_test_map WHERE circ_mod_test = out_by_circ_mod.id);
-        IF items_out >= out_by_circ_mod.items_out THEN
-            result.fail_part := 'config.circ_matrix_circ_mod_test';
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END IF;
-    END LOOP;
-
-    -- If we passed everything, return the successful matchpoint id
-    IF NOT done THEN
-        RETURN NEXT result;
-    END IF;
-
-    RETURN;
-END;
-$func$ LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION actor.calculate_system_penalties( match_user INT, context_org INT ) RETURNS SETOF actor.usr_standing_penalty AS $func$
-DECLARE
-    user_object         actor.usr%ROWTYPE;
-    new_sp_row          actor.usr_standing_penalty%ROWTYPE;
-    existing_sp_row     actor.usr_standing_penalty%ROWTYPE;
-    collections_fines   permission.grp_penalty_threshold%ROWTYPE;
-    max_fines           permission.grp_penalty_threshold%ROWTYPE;
-    max_overdue         permission.grp_penalty_threshold%ROWTYPE;
-    max_items_out       permission.grp_penalty_threshold%ROWTYPE;
-    tmp_grp             INT;
-    items_overdue       INT;
-    items_out           INT;
-    context_org_list    INT[];
-    current_fines        NUMERIC(8,2) := 0.0;
-    tmp_fines            NUMERIC(8,2);
-    tmp_groc            RECORD;
-    tmp_circ            RECORD;
-    tmp_org             actor.org_unit%ROWTYPE;
-BEGIN
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-
-    -- Max fines
-    SELECT INTO tmp_org * FROM actor.org_unit WHERE id = context_org;
-
-    -- Fail if the user has a high fine balance
-    LOOP
-        tmp_grp := user_object.profile;
-        LOOP
-            SELECT * INTO max_fines FROM permission.grp_penalty_threshold WHERE grp = tmp_grp AND penalty = 1 AND org_unit = tmp_org.id;
-
-            IF max_fines.threshold IS NULL THEN
-                SELECT parent INTO tmp_grp FROM permission.grp_tree WHERE id = tmp_grp;
-            ELSE
-                EXIT;
-            END IF;
-
-            IF tmp_grp IS NULL THEN
-                EXIT;
-            END IF;
-        END LOOP;
-
-        IF max_fines.threshold IS NOT NULL OR tmp_org.parent_ou IS NULL THEN
-            EXIT;
-        END IF;
-
-        SELECT * INTO tmp_org FROM actor.org_unit WHERE id = tmp_org.parent_ou;
-
-    END LOOP;
-
-    IF max_fines.threshold IS NOT NULL THEN
-
-        FOR existing_sp_row IN
-                SELECT  *
-                  FROM  actor.usr_standing_penalty
-                  WHERE usr = match_user
-                        AND org_unit = max_fines.org_unit
-                        AND (stop_date IS NULL or stop_date > NOW())
-                        AND standing_penalty = 1
-                LOOP
-            RETURN NEXT existing_sp_row;
-        END LOOP;
-
-        SELECT  SUM(f.balance_owed) INTO current_fines
-          FROM  money.materialized_billable_xact_summary f
-                JOIN (
-                    SELECT  g.id
-                      FROM  money.grocery g
-                            JOIN  actor.org_unit_full_path( max_fines.org_unit ) fp ON (g.billing_location = fp.id)
-                      WHERE usr = match_user
-                            AND xact_finish IS NULL
-                                UNION ALL
-                    SELECT  circ.id
-                      FROM  action.circulation circ
-                            JOIN  actor.org_unit_full_path( max_fines.org_unit ) fp ON (circ.circ_lib = fp.id)
-                      WHERE usr = match_user
-                            AND xact_finish IS NULL ) l USING (id);
-
-        IF current_fines >= max_fines.threshold THEN
-            new_sp_row.usr := match_user;
-            new_sp_row.org_unit := max_fines.org_unit;
-            new_sp_row.standing_penalty := 1;
-            RETURN NEXT new_sp_row;
-        END IF;
-    END IF;
-
-    -- Start over for max overdue
-    SELECT INTO tmp_org * FROM actor.org_unit WHERE id = context_org;
-
-    -- Fail if the user has too many overdue items
-    LOOP
-        tmp_grp := user_object.profile;
-        LOOP
-
-            SELECT * INTO max_overdue FROM permission.grp_penalty_threshold WHERE grp = tmp_grp AND penalty = 2 AND org_unit = tmp_org.id;
-
-            IF max_overdue.threshold IS NULL THEN
-                SELECT parent INTO tmp_grp FROM permission.grp_tree WHERE id = tmp_grp;
-            ELSE
-                EXIT;
-            END IF;
-
-            IF tmp_grp IS NULL THEN
-                EXIT;
-            END IF;
-        END LOOP;
-
-        IF max_overdue.threshold IS NOT NULL OR tmp_org.parent_ou IS NULL THEN
-            EXIT;
-        END IF;
-
-        SELECT INTO tmp_org * FROM actor.org_unit WHERE id = tmp_org.parent_ou;
-
-    END LOOP;
-
-    IF max_overdue.threshold IS NOT NULL THEN
-
-        FOR existing_sp_row IN
-                SELECT  *
-                  FROM  actor.usr_standing_penalty
-                  WHERE usr = match_user
-                        AND org_unit = max_overdue.org_unit
-                        AND (stop_date IS NULL or stop_date > NOW())
-                        AND standing_penalty = 2
-                LOOP
-            RETURN NEXT existing_sp_row;
-        END LOOP;
-
-        SELECT  INTO items_overdue COUNT(*)
-          FROM  action.circulation circ
-                JOIN  actor.org_unit_full_path( max_overdue.org_unit ) fp ON (circ.circ_lib = fp.id)
-          WHERE circ.usr = match_user
-            AND circ.checkin_time IS NULL
-            AND circ.due_date < NOW()
-            AND (circ.stop_fines = 'MAXFINES' OR circ.stop_fines IS NULL);
-
-        IF items_overdue >= max_overdue.threshold::INT THEN
-            new_sp_row.usr := match_user;
-            new_sp_row.org_unit := max_overdue.org_unit;
-            new_sp_row.standing_penalty := 2;
-            RETURN NEXT new_sp_row;
-        END IF;
-    END IF;
-
-    -- Start over for max out
-    SELECT INTO tmp_org * FROM actor.org_unit WHERE id = context_org;
-
-    -- Fail if the user has too many checked out items
-    LOOP
-        tmp_grp := user_object.profile;
-        LOOP
-            SELECT * INTO max_items_out FROM permission.grp_penalty_threshold WHERE grp = tmp_grp AND penalty = 3 AND org_unit = tmp_org.id;
-
-            IF max_items_out.threshold IS NULL THEN
-                SELECT parent INTO tmp_grp FROM permission.grp_tree WHERE id = tmp_grp;
-            ELSE
-                EXIT;
-            END IF;
-
-            IF tmp_grp IS NULL THEN
-                EXIT;
-            END IF;
-        END LOOP;
-
-        IF max_items_out.threshold IS NOT NULL OR tmp_org.parent_ou IS NULL THEN
-            EXIT;
-        END IF;
-
-        SELECT INTO tmp_org * FROM actor.org_unit WHERE id = tmp_org.parent_ou;
-
-    END LOOP;
-
-
-    -- Fail if the user has too many items checked out
-    IF max_items_out.threshold IS NOT NULL THEN
-
-        FOR existing_sp_row IN
-                SELECT  *
-                  FROM  actor.usr_standing_penalty
-                  WHERE usr = match_user
-                        AND org_unit = max_items_out.org_unit
-                        AND (stop_date IS NULL or stop_date > NOW())
-                        AND standing_penalty = 3
-                LOOP
-            RETURN NEXT existing_sp_row;
-        END LOOP;
-
-        SELECT  INTO items_out COUNT(*)
-          FROM  action.circulation circ
-                JOIN  actor.org_unit_full_path( max_items_out.org_unit ) fp ON (circ.circ_lib = fp.id)
-          WHERE circ.usr = match_user
-                AND circ.checkin_time IS NULL
-                AND (circ.stop_fines IN ('MAXFINES','LONGOVERDUE') OR circ.stop_fines IS NULL);
-
-           IF items_out >= max_items_out.threshold::INT THEN
-            new_sp_row.usr := match_user;
-            new_sp_row.org_unit := max_items_out.org_unit;
-            new_sp_row.standing_penalty := 3;
-            RETURN NEXT new_sp_row;
-           END IF;
-    END IF;
-
-    -- Start over for collections warning
-    SELECT INTO tmp_org * FROM actor.org_unit WHERE id = context_org;
-
-    -- Fail if the user has a collections-level fine balance
-    LOOP
-        tmp_grp := user_object.profile;
-        LOOP
-            SELECT * INTO max_fines FROM permission.grp_penalty_threshold WHERE grp = tmp_grp AND penalty = 4 AND org_unit = tmp_org.id;
-
-            IF max_fines.threshold IS NULL THEN
-                SELECT parent INTO tmp_grp FROM permission.grp_tree WHERE id = tmp_grp;
-            ELSE
-                EXIT;
-            END IF;
-
-            IF tmp_grp IS NULL THEN
-                EXIT;
-            END IF;
-        END LOOP;
-
-        IF max_fines.threshold IS NOT NULL OR tmp_org.parent_ou IS NULL THEN
-            EXIT;
-        END IF;
-
-        SELECT * INTO tmp_org FROM actor.org_unit WHERE id = tmp_org.parent_ou;
-
-    END LOOP;
-
-    IF max_fines.threshold IS NOT NULL THEN
-
-        FOR existing_sp_row IN
-                SELECT  *
-                  FROM  actor.usr_standing_penalty
-                  WHERE usr = match_user
-                        AND org_unit = max_fines.org_unit
-                        AND (stop_date IS NULL or stop_date > NOW())
-                        AND standing_penalty = 4
-                LOOP
-            RETURN NEXT existing_sp_row;
-        END LOOP;
-
-        SELECT  SUM(f.balance_owed) INTO current_fines
-          FROM  money.materialized_billable_xact_summary f
-                JOIN (
-                    SELECT  g.id
-                      FROM  money.grocery g
-                            JOIN  actor.org_unit_full_path( max_fines.org_unit ) fp ON (g.billing_location = fp.id)
-                      WHERE usr = match_user
-                            AND xact_finish IS NULL
-                                UNION ALL
-                    SELECT  circ.id
-                      FROM  action.circulation circ
-                            JOIN  actor.org_unit_full_path( max_fines.org_unit ) fp ON (circ.circ_lib = fp.id)
-                      WHERE usr = match_user
-                            AND xact_finish IS NULL ) l USING (id);
-
-        IF current_fines >= max_fines.threshold THEN
-            new_sp_row.usr := match_user;
-            new_sp_row.org_unit := max_fines.org_unit;
-            new_sp_row.standing_penalty := 4;
-            RETURN NEXT new_sp_row;
-        END IF;
-    END IF;
-
-
-    RETURN;
-END;
-$func$ LANGUAGE plpgsql;
-
-
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN juvenile_flag BOOL;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN age_hold_protect_rule INT REFERENCES config.rule_age_hold_protect (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN holdable BOOL NOT NULL DEFAULT TRUE;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN distance_is_from_owner BOOL NOT NULL DEFAULT FALSE;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN transit_range INT REFERENCES actor.org_unit_type (id) DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN max_holds INT;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN include_frozen_holds BOOL NOT NULL DEFAULT TRUE;
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN stop_blocked_user BOOL NOT NULL DEFAULT FALSE;
-
-CREATE OR REPLACE FUNCTION action.find_hold_matrix_matchpoint( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS INT AS $func$
-DECLARE
-    current_requestor_group    permission.grp_tree%ROWTYPE;
-    root_ou            actor.org_unit%ROWTYPE;
-    requestor_object    actor.usr%ROWTYPE;
-    user_object        actor.usr%ROWTYPE;
-    item_object        asset.copy%ROWTYPE;
-    item_cn_object        asset.call_number%ROWTYPE;
-    rec_descriptor        metabib.rec_descriptor%ROWTYPE;
-    current_mp_weight    FLOAT;
-    matchpoint_weight    FLOAT;
-    tmp_weight        FLOAT;
-    current_mp        config.hold_matrix_matchpoint%ROWTYPE;
-    matchpoint        config.hold_matrix_matchpoint%ROWTYPE;
-BEGIN
-    SELECT INTO root_ou * FROM actor.org_unit WHERE parent_ou IS NULL;
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-    SELECT INTO requestor_object * FROM actor.usr WHERE id = match_requestor;
-    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-    SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
-    SELECT INTO rec_descriptor r.* FROM metabib.rec_descriptor r WHERE r.record = item_cn_object.record;
-    SELECT INTO current_requestor_group * FROM permission.grp_tree WHERE id = requestor_object.profile;
-
-    LOOP
-        -- for each potential matchpoint for this ou and group ...
-        FOR current_mp IN
-            SELECT    m.*
-              FROM    config.hold_matrix_matchpoint m
-              WHERE    m.requestor_grp = current_requestor_group.id AND m.active
-              ORDER BY    CASE WHEN m.circ_modifier    IS NOT NULL THEN 16 ELSE 0 END +
-                    CASE WHEN m.juvenile_flag    IS NOT NULL THEN 16 ELSE 0 END +
-                    CASE WHEN m.marc_type        IS NOT NULL THEN 8 ELSE 0 END +
-                    CASE WHEN m.marc_form        IS NOT NULL THEN 4 ELSE 0 END +
-                    CASE WHEN m.marc_vr_format    IS NOT NULL THEN 2 ELSE 0 END +
-                    CASE WHEN m.ref_flag        IS NOT NULL THEN 1 ELSE 0 END DESC LOOP
-
-            current_mp_weight := 5.0;
-
-            IF current_mp.circ_modifier IS NOT NULL THEN
-                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
-            END IF;
-
-            IF current_mp.marc_type IS NOT NULL THEN
-                IF item_object.circ_as_type IS NOT NULL THEN
-                    CONTINUE WHEN current_mp.marc_type <> item_object.circ_as_type;
-                ELSE
-                    CONTINUE WHEN current_mp.marc_type <> rec_descriptor.item_type;
-                END IF;
-            END IF;
-
-            IF current_mp.marc_form IS NOT NULL THEN
-                CONTINUE WHEN current_mp.marc_form <> rec_descriptor.item_form;
-            END IF;
-
-            IF current_mp.marc_vr_format IS NOT NULL THEN
-                CONTINUE WHEN current_mp.marc_vr_format <> rec_descriptor.vr_format;
-            END IF;
-
-            IF current_mp.juvenile_flag IS NOT NULL THEN
-                CONTINUE WHEN current_mp.juvenile_flag <> user_object.juvenile;
-            END IF;
-
-            IF current_mp.ref_flag IS NOT NULL THEN
-                CONTINUE WHEN current_mp.ref_flag <> item_object.ref;
-            END IF;
-
-
-            -- caclulate the rule match weight
-            IF current_mp.item_owning_ou IS NOT NULL AND current_mp.item_owning_ou <> root_ou.id THEN
-                SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.item_owning_ou, item_cn_object.owning_lib)::FLOAT + 1.0)::FLOAT;
-                current_mp_weight := current_mp_weight - tmp_weight;
-            END IF;
-
-            IF current_mp.item_circ_ou IS NOT NULL AND current_mp.item_circ_ou <> root_ou.id THEN
-                SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.item_circ_ou, item_object.circ_lib)::FLOAT + 1.0)::FLOAT;
-                current_mp_weight := current_mp_weight - tmp_weight;
-            END IF;
-
-            IF current_mp.pickup_ou IS NOT NULL AND current_mp.pickup_ou <> root_ou.id THEN
-                SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.pickup_ou, pickup_ou)::FLOAT + 1.0)::FLOAT;
-                current_mp_weight := current_mp_weight - tmp_weight;
-            END IF;
-
-            IF current_mp.request_ou IS NOT NULL AND current_mp.request_ou <> root_ou.id THEN
-                SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.request_ou, request_ou)::FLOAT + 1.0)::FLOAT;
-                current_mp_weight := current_mp_weight - tmp_weight;
-            END IF;
-
-            IF current_mp.user_home_ou IS NOT NULL AND current_mp.user_home_ou <> root_ou.id THEN
-                SELECT INTO tmp_weight 1.0 / (actor.org_unit_proximity(current_mp.user_home_ou, user_object.home_ou)::FLOAT + 1.0)::FLOAT;
-                current_mp_weight := current_mp_weight - tmp_weight;
-            END IF;
-
-            -- set the matchpoint if we found the best one
-            IF matchpoint_weight IS NULL OR matchpoint_weight > current_mp_weight THEN
-                matchpoint = current_mp;
-                matchpoint_weight = current_mp_weight;
-            END IF;
-
-        END LOOP;
-
-        EXIT WHEN current_requestor_group.parent IS NULL OR matchpoint.id IS NOT NULL;
-
-        SELECT INTO current_requestor_group * FROM permission.grp_tree WHERE id = current_requestor_group.parent;
-    END LOOP;
-
-    RETURN matchpoint.id;
-END;
-$func$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT ) RETURNS SETOF action.matrix_test_result AS
-$func$
-DECLARE
-    matchpoint_id        INT;
-    user_object        actor.usr%ROWTYPE;
-    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
-    standing_penalty    config.standing_penalty%ROWTYPE;
-    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
-    transit_source        actor.org_unit%ROWTYPE;
-    item_object        asset.copy%ROWTYPE;
-    result            action.matrix_test_result;
-    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
-    hold_count        INT;
-    hold_transit_prox    INT;
-    frozen_hold_count    INT;
-    context_org_list    INT[];
-    done            BOOL := FALSE;
-BEGIN
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
-
-    -- Fail if we couldn't find a user
-    IF user_object.id IS NULL THEN
-        result.fail_part := 'no_user';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
-
-    -- Fail if user is barred
-    IF user_object.barred IS TRUE THEN
-        result.fail_part := 'actor.usr.barred';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
-
-    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
-
-    -- Fail if we couldn't find a copy
-    IF item_object.id IS NULL THEN
-        result.fail_part := 'no_item';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
-
-    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
-
-    -- Fail if we couldn't find any matchpoint (requires a default)
-    IF matchpoint_id IS NULL THEN
-        result.fail_part := 'no_matchpoint';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
-
-    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
-
-    result.matchpoint := hold_test.id;
-    result.success := TRUE;
-
-    IF hold_test.holdable IS FALSE THEN
-        result.fail_part := 'config.hold_matrix_test.holdable';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
-
-    IF hold_test.transit_range IS NOT NULL THEN
-        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
-        IF hold_test.distance_is_from_owner THEN
-            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
-        ELSE
-            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
-        END IF;
-
-        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
-
-        IF NOT FOUND THEN
-            result.fail_part := 'transit_range';
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END IF;
-    END IF;
-
-    FOR standing_penalty IN
-        SELECT  DISTINCT csp.*
-          FROM  actor.usr_standing_penalty usp
-                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
-          WHERE usr = match_user
-                AND usp.org_unit IN ( SELECT * FROM explode_array(context_org_list) )
-                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
-                AND csp.block_list LIKE '%HOLD%' LOOP
-
-        result.fail_part := standing_penalty.name;
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END LOOP;
-
-    IF hold_test.stop_blocked_user IS TRUE THEN
-        FOR standing_penalty IN
-            SELECT  DISTINCT csp.*
-              FROM  actor.usr_standing_penalty usp
-                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
-              WHERE usr = match_user
-                    AND usp.org_unit IN ( SELECT * FROM explode_array(context_org_list) )
-                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
-                    AND csp.block_list LIKE '%CIRC%' LOOP
-
-            result.fail_part := standing_penalty.name;
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END LOOP;
-    END IF;
-
-    IF hold_test.max_holds IS NOT NULL THEN
-        SELECT    INTO hold_count COUNT(*)
-          FROM    action.hold_request
-          WHERE    usr = match_user
-            AND fulfillment_time IS NULL
-            AND cancel_time IS NULL
-            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
-
-        IF hold_count >= hold_test.max_holds THEN
-            result.fail_part := 'config.hold_matrix_test.max_holds';
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END IF;
-    END IF;
-
-    IF item_object.age_protect IS NOT NULL THEN
-        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
-
-        IF item_object.create_date + age_protect_object.age > NOW() THEN
-            IF hold_test.distance_is_from_owner THEN
-                SELECT INTO hold_transit_prox prox FROM actor.org_unit_prox WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
-            ELSE
-                SELECT INTO hold_transit_prox prox FROM actor.org_unit_prox WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
-            END IF;
-
-            IF hold_transit_prox > age_protect_object.prox THEN
-                result.fail_part := 'config.rule_age_hold_protect.prox';
-                result.success := FALSE;
-                done := TRUE;
-                RETURN NEXT result;
-            END IF;
-        END IF;
-    END IF;
-
-    IF NOT done THEN
-        RETURN NEXT result;
-    END IF;
-
-    RETURN;
-END;
-$func$ LANGUAGE plpgsql;
-
-CREATE SCHEMA acq;
-
-
--- Tables
-
-
-CREATE TABLE acq.currency_type (
-    code    TEXT PRIMARY KEY,
-    label   TEXT
-);
-
--- Use the ISO 4217 abbreviations for currency codes
-INSERT INTO acq.currency_type (code, label) VALUES ('USD','US Dollars');
-INSERT INTO acq.currency_type (code, label) VALUES ('CAN','Canadian Dollars');
-INSERT INTO acq.currency_type (code, label) VALUES ('EUR','Euros');
-
-CREATE TABLE acq.exchange_rate (
-    id              SERIAL  PRIMARY KEY,
-    from_currency   TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    to_currency     TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    ratio           NUMERIC NOT NULL,
-    CONSTRAINT exchange_rate_from_to_once UNIQUE (from_currency,to_currency)
-);
-
-INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','CAN',1.2);
-INSERT INTO acq.exchange_rate (from_currency,to_currency,ratio) VALUES ('USD','EUR',0.5);
-
-CREATE TABLE acq.provider (
-    id                  SERIAL  PRIMARY KEY,
-    name                TEXT    NOT NULL,
-    owner               INT     NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
-    currency_type       TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    code                TEXT    UNIQUE,
-    holding_tag         TEXT,
-    CONSTRAINT provider_name_once_per_owner UNIQUE (name,owner)
-);
-
-CREATE TABLE acq.provider_holding_subfield_map (
-    id          SERIAL  PRIMARY KEY,
-    provider    INT     NOT NULL REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED,
-    name        TEXT    NOT NULL, -- barcode, price, etc
-    subfield    TEXT    NOT NULL,
-    CONSTRAINT name_once_per_provider UNIQUE (provider,name)
-);
-
-CREATE TABLE acq.provider_address (
-    id      SERIAL  PRIMARY KEY,
-    valid       BOOL    NOT NULL DEFAULT TRUE,
-    address_type    TEXT,
-    provider    INT     NOT NULL REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED,
-    street1     TEXT    NOT NULL,
-    street2     TEXT,
-    city        TEXT    NOT NULL,
-    county      TEXT,
-    state       TEXT    NOT NULL,
-    country     TEXT    NOT NULL,
-    post_code   TEXT    NOT NULL
-);
-
-CREATE TABLE acq.provider_contact (
-    id      SERIAL  PRIMARY KEY,
-    provider    INT NOT NULL REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED,
-    name    TEXT NULL NULL,
-    role    TEXT, -- free-form.. e.g. "our sales guy"
-    email   TEXT,
-    phone   TEXT
-);
-
-CREATE TABLE acq.provider_contact_address (
-    id          SERIAL  PRIMARY KEY,
-    valid           BOOL    NOT NULL DEFAULT TRUE,
-    address_type    TEXT,
-    contact         INT     NOT NULL REFERENCES acq.provider_contact (id) DEFERRABLE INITIALLY DEFERRED,
-    street1         TEXT    NOT NULL,
-    street2         TEXT,
-    city            TEXT    NOT NULL,
-    county          TEXT,
-    state           TEXT    NOT NULL,
-    country         TEXT    NOT NULL,
-    post_code       TEXT    NOT NULL
-);
-
-
-CREATE TABLE acq.funding_source (
-    id      SERIAL  PRIMARY KEY,
-    name        TEXT    NOT NULL,
-    owner       INT NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
-    currency_type   TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    code        TEXT    UNIQUE,
-    CONSTRAINT funding_source_name_once_per_owner UNIQUE (name,owner)
-);
-
-CREATE TABLE acq.funding_source_credit (
-    id  SERIAL  PRIMARY KEY,
-    funding_source    INT     NOT NULL REFERENCES acq.funding_source (id) DEFERRABLE INITIALLY DEFERRED,
-    amount  NUMERIC NOT NULL,
-    note    TEXT
-);
-
-CREATE TABLE acq.fund (
-    id              SERIAL  PRIMARY KEY,
-    org             INT     NOT NULL REFERENCES actor.org_unit (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    name            TEXT    NOT NULL,
-    year            INT     NOT NULL DEFAULT EXTRACT( YEAR FROM NOW() ),
-    currency_type   TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    code            TEXT    UNIQUE,
-    CONSTRAINT name_once_per_org_year UNIQUE (org,name,year)
-);
-
-CREATE TABLE acq.fund_debit (
-    id          SERIAL  PRIMARY KEY,
-    fund            INT     NOT NULL REFERENCES acq.fund (id) DEFERRABLE INITIALLY DEFERRED,
-    origin_amount       NUMERIC NOT NULL,  -- pre-exchange-rate amount
-    origin_currency_type    TEXT    NOT NULL REFERENCES acq.currency_type (code) DEFERRABLE INITIALLY DEFERRED,
-    amount          NUMERIC NOT NULL,
-    encumbrance     BOOL    NOT NULL DEFAULT TRUE,
-    debit_type      TEXT    NOT NULL,
-    xfer_destination    INT REFERENCES acq.fund (id) DEFERRABLE INITIALLY DEFERRED,
-    create_time     TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
-);
-
-CREATE TABLE acq.fund_allocation (
-    id          SERIAL  PRIMARY KEY,
-    funding_source        INT     NOT NULL REFERENCES acq.funding_source (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    fund        INT     NOT NULL REFERENCES acq.fund (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    amount      NUMERIC,
-    percent     NUMERIC CHECK (percent IS NULL OR percent BETWEEN 0.0 AND 100.0),
-    allocator   INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    note        TEXT,
-    create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    CONSTRAINT allocation_amount_or_percent CHECK ((percent IS NULL AND amount IS NOT NULL) OR (percent IS NOT NULL AND amount IS NULL))
-);
-
-
-CREATE TABLE acq.picklist (
-    id      SERIAL              PRIMARY KEY,
-    owner       INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    creator         INT                             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    editor          INT                             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    org_unit    INT             NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
-    name        TEXT                NOT NULL,
-    create_time TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    edit_time   TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    CONSTRAINT name_once_per_owner UNIQUE (name,owner)
-);
-
-CREATE TABLE acq.purchase_order (
-    id      SERIAL              PRIMARY KEY,
-    owner       INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    creator         INT                             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    editor          INT                             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    ordering_agency INT             NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
-    create_time TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    edit_time   TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    provider    INT             NOT NULL REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED,
-    state       TEXT                NOT NULL DEFAULT 'new'
-);
-CREATE INDEX po_owner_idx ON acq.purchase_order (owner);
-CREATE INDEX po_provider_idx ON acq.purchase_order (provider);
-CREATE INDEX po_state_idx ON acq.purchase_order (state);
-
-CREATE TABLE acq.po_note (
-    id      SERIAL              PRIMARY KEY,
-    purchase_order  INT             NOT NULL REFERENCES acq.purchase_order (id) DEFERRABLE INITIALLY DEFERRED,
-    creator     INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    editor      INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    create_time TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    edit_time   TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    value       TEXT                NOT NULL
-);
-CREATE INDEX po_note_po_idx ON acq.po_note (purchase_order);
-
-CREATE TABLE acq.lineitem (
-    id                  BIGSERIAL                   PRIMARY KEY,
-    creator             INT                         NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    editor              INT                         NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    selector            INT                         NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    provider            INT                         REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED,
-    purchase_order      INT                         REFERENCES acq.purchase_order (id) DEFERRABLE INITIALLY DEFERRED,
-    picklist            INT                         REFERENCES acq.picklist (id) DEFERRABLE INITIALLY DEFERRED,
-    expected_recv_time  TIMESTAMP WITH TIME ZONE,
-    create_time         TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    edit_time           TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    marc                TEXT                        NOT NULL,
-    eg_bib_id           INT                         REFERENCES biblio.record_entry (id) DEFERRABLE INITIALLY DEFERRED,
-    source_label        TEXT,
-    item_count          INT                         NOT NULL DEFAULT 0,
-    state               TEXT                        NOT NULL DEFAULT 'new',
-    CONSTRAINT picklist_or_po CHECK (picklist IS NOT NULL OR purchase_order IS NOT NULL)
-);
-CREATE INDEX li_po_idx ON acq.lineitem (purchase_order);
-CREATE INDEX li_pl_idx ON acq.lineitem (picklist);
-
-CREATE TABLE acq.lineitem_note (
-    id      SERIAL              PRIMARY KEY,
-    lineitem    INT             NOT NULL REFERENCES acq.lineitem (id) DEFERRABLE INITIALLY DEFERRED,
-    creator     INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    editor      INT             NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
-    create_time TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    edit_time   TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT NOW(),
-    value       TEXT                NOT NULL
-);
-CREATE INDEX li_note_li_idx ON acq.lineitem_note (lineitem);
-
-CREATE TABLE acq.lineitem_detail (
-    id          BIGSERIAL   PRIMARY KEY,
-    lineitem    INT         NOT NULL REFERENCES acq.lineitem (id) DEFERRABLE INITIALLY DEFERRED,
-    fund        INT         REFERENCES acq.fund (id) DEFERRABLE INITIALLY DEFERRED,
-    fund_debit  INT         REFERENCES acq.fund_debit (id) DEFERRABLE INITIALLY DEFERRED,
-    eg_copy_id  BIGINT      REFERENCES asset.copy (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    barcode     TEXT,
-    cn_label    TEXT,
-    note        TEXT,
-    collection_code TEXT,
-    circ_modifier   TEXT    REFERENCES config.circ_modifier (code) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    owning_lib  INT         REFERENCES actor.org_unit (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    location    INT         REFERENCES asset.copy_location (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    recv_time   TIMESTAMP WITH TIME ZONE
-);
-
-CREATE INDEX li_detail_li_idx ON acq.lineitem_detail (lineitem);
-
-CREATE TABLE acq.lineitem_attr_definition (
-    id      BIGSERIAL   PRIMARY KEY,
-    code        TEXT        NOT NULL,
-    description TEXT        NOT NULL,
-    remove      TEXT        NOT NULL DEFAULT '',
-    ident       BOOL        NOT NULL DEFAULT FALSE
-);
-
-CREATE TABLE acq.lineitem_marc_attr_definition (
-    id      BIGINT  PRIMARY KEY DEFAULT NEXTVAL('acq.lineitem_attr_definition_id_seq'),
-    xpath       TEXT        NOT NULL
-) INHERITS (acq.lineitem_attr_definition);
-
-CREATE TABLE acq.lineitem_provider_attr_definition (
-    id      BIGINT  PRIMARY KEY DEFAULT NEXTVAL('acq.lineitem_attr_definition_id_seq'),
-    xpath       TEXT        NOT NULL,
-    provider    INT NOT NULL REFERENCES acq.provider (id) DEFERRABLE INITIALLY DEFERRED
-) INHERITS (acq.lineitem_attr_definition);
-
-CREATE TABLE acq.lineitem_generated_attr_definition (
-    id      BIGINT  PRIMARY KEY DEFAULT NEXTVAL('acq.lineitem_attr_definition_id_seq'),
-    xpath       TEXT        NOT NULL
-) INHERITS (acq.lineitem_attr_definition);
-
-CREATE TABLE acq.lineitem_usr_attr_definition (
-    id      BIGINT  PRIMARY KEY DEFAULT NEXTVAL('acq.lineitem_attr_definition_id_seq'),
-    usr     INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED
-) INHERITS (acq.lineitem_attr_definition);
-
-CREATE TABLE acq.lineitem_local_attr_definition (
-    id      BIGINT  PRIMARY KEY DEFAULT NEXTVAL('acq.lineitem_attr_definition_id_seq')
-) INHERITS (acq.lineitem_attr_definition);
-
-CREATE TABLE acq.lineitem_attr (
-    id      BIGSERIAL   PRIMARY KEY,
-    definition  BIGINT      NOT NULL,
-    lineitem    BIGINT      NOT NULL REFERENCES acq.lineitem (id) DEFERRABLE INITIALLY DEFERRED,
-    attr_type   TEXT        NOT NULL,
-    attr_name   TEXT        NOT NULL,
-    attr_value  TEXT        NOT NULL
-);
-
-CREATE INDEX li_attr_li_idx ON acq.lineitem_attr (lineitem);
-CREATE INDEX li_attr_value_idx ON acq.lineitem_attr (attr_value);
-CREATE INDEX li_attr_definition_idx ON acq.lineitem_attr (definition);
-
-
--- Seed data
-
-
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('title','Title of work','//*[@tag="245"]/*[contains("abcmnopr",@code)]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('author','Author of work','//*[@tag="100" or @tag="110" or @tag="113"]/*[contains("ad",@code)]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('language','Language of work','//*[@tag="240"]/*[@code="l"][1]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('pagination','Pagination','//*[@tag="300"]/*[@code="a"][1]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath, remove ) VALUES ('isbn','ISBN','//*[@tag="020"]/*[@code="a"]', $r$(?:-|\s.+$)$r$);
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath, remove ) VALUES ('issn','ISSN','//*[@tag="022"]/*[@code="a"]', $r$(?:-|\s.+$)$r$);
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('price','Price','//*[@tag="020" or @tag="022"]/*[@code="c"][1]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('identifier','Identifier','//*[@tag="001"]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('publisher','Publisher','//*[@tag="260"]/*[@code="b"][1]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('pubdate','Publication Date','//*[@tag="260"]/*[@code="c"][1]');
-INSERT INTO acq.lineitem_marc_attr_definition ( code, description, xpath ) VALUES ('edition','Edition','//*[@tag="250"]/*[@code="a"][1]');
-
-INSERT INTO acq.lineitem_local_attr_definition ( code, description ) VALUES ('estimated_price', 'Estimated Price');
-
-
-CREATE TABLE acq.distribution_formula (
-    id      SERIAL PRIMARY KEY,
-    owner   INT NOT NULL
-            REFERENCES actor.org_unit(id) DEFERRABLE INITIALLY DEFERRED,
-    name    TEXT NOT NULL,
-    skip_count  INT NOT NULL DEFAULT 0,
-    CONSTRAINT acqdf_name_once_per_owner UNIQUE (name, owner)
-);
-
-CREATE TABLE acq.distribution_formula_entry (
-    id          SERIAL PRIMARY KEY,
-    formula     INTEGER NOT NULL REFERENCES acq.distribution_formula(id)
-                ON DELETE CASCADE
-                DEFERRABLE INITIALLY DEFERRED,
-    position    INTEGER NOT NULL,
-    item_count  INTEGER NOT NULL,
-    owning_lib  INTEGER REFERENCES actor.org_unit(id)
-                DEFERRABLE INITIALLY DEFERRED,
-    location    INTEGER REFERENCES asset.copy_location(id),
-    CONSTRAINT acqdfe_lib_once_per_formula UNIQUE( formula, position ),
-    CONSTRAINT acqdfe_must_be_somewhere
-                CHECK( owning_lib IS NOT NULL OR location IS NOT NULL )
-);
-
-CREATE TABLE acq.fund_tag (
-    id      SERIAL PRIMARY KEY,
-    owner   INT NOT NULL
-            REFERENCES actor.org_unit(id) DEFERRABLE INITIALLY DEFERRED,
-    name    TEXT NOT NULL,
-    CONSTRAINT acqft_tag_once_per_owner UNIQUE (name, owner)
-);
-
-CREATE TABLE acq.fund_tag_map (
-    id          SERIAL PRIMARY KEY,
-    fund        INTEGER NOT NULL REFERENCES acq.fund(id)
-                DEFERRABLE INITIALLY DEFERRED,
-    tag         INTEGER REFERENCES acq.fund_tag(id)
-                ON DELETE CASCADE
-                DEFERRABLE INITIALLY DEFERRED,
-    CONSTRAINT acqftm_fund_once_per_tag UNIQUE( fund, tag )
-);
-
--- Functions
-
-CREATE TYPE acq.flat_lineitem_holding_subfield AS (lineitem int, holding int, subfield text, data text);
-CREATE OR REPLACE FUNCTION acq.extract_holding_attr_table (lineitem int, tag text) RETURNS SETOF acq.flat_lineitem_holding_subfield AS $$
-DECLARE
-    counter INT;
-    lida    acq.flat_lineitem_holding_subfield%ROWTYPE;
-BEGIN
-
-    SELECT  COUNT(*) INTO counter
-      FROM  xpath_table(
-                'id',
-                'marc',
-                'acq.lineitem',
-                '//*[@tag="' || tag || '"]',
-                'id=' || lineitem
-            ) as t(i int,c text);
-
-    FOR i IN 1 .. counter LOOP
-        FOR lida IN
-            SELECT  *
-              FROM  (   SELECT  id,i,t,v
-                          FROM  xpath_table(
-                                    'id',
-                                    'marc',
-                                    'acq.lineitem',
-                                    '//*[@tag="' || tag || '"][position()=' || i || ']/*/@code|' ||
-                                        '//*[@tag="' || tag || '"][position()=' || i || ']/*[@code]',
-                                    'id=' || lineitem
-                                ) as t(id int,t text,v text)
-                    )x
-        LOOP
-            RETURN NEXT lida;
-        END LOOP;
-    END LOOP;
-
-    RETURN;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TYPE acq.flat_lineitem_detail AS (lineitem int, holding int, attr text, data text);
-CREATE OR REPLACE FUNCTION acq.extract_provider_holding_data ( lineitem_i int ) RETURNS SETOF acq.flat_lineitem_detail AS $$
-DECLARE
-    prov_i  INT;
-    tag_t   TEXT;
-    lida    acq.flat_lineitem_detail%ROWTYPE;
-BEGIN
-    SELECT provider INTO prov_i FROM acq.lineitem WHERE id = lineitem_i;
-    IF NOT FOUND THEN RETURN; END IF;
-
-    SELECT holding_tag INTO tag_t FROM acq.provider WHERE id = prov_i;
-    IF NOT FOUND OR tag_t IS NULL THEN RETURN; END IF;
-
-    FOR lida IN
-        SELECT  lineitem_i,
-                h.holding,
-                a.name,
-                h.data
-          FROM  acq.extract_holding_attr_table( lineitem_i, tag_t ) h
-                JOIN acq.provider_holding_subfield_map a USING (subfield)
-          WHERE a.provider = prov_i
-    LOOP
-        RETURN NEXT lida;
-    END LOOP;
-
-    RETURN;
-END;
-$$ LANGUAGE PLPGSQL;
-
--- select * from acq.extract_provider_holding_data(699);
-
-CREATE OR REPLACE FUNCTION public.extract_acq_marc_field ( BIGINT, TEXT, TEXT) RETURNS TEXT AS $$
-    SELECT public.extract_marc_field('acq.lineitem', $1, $2, $3);
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION public.ingest_acq_marc ( ) RETURNS TRIGGER AS $$
-DECLARE
-    value       TEXT;
-    atype       TEXT;
-    prov        INT;
-    adef        RECORD;
-    xpath_string    TEXT;
-BEGIN
-    FOR adef IN SELECT *,tableoid FROM acq.lineitem_attr_definition LOOP
-
-        SELECT relname::TEXT INTO atype FROM pg_class WHERE oid = adef.tableoid;
-
-        IF (atype NOT IN ('lineitem_usr_attr_definition','lineitem_local_attr_definition')) THEN
-            IF (atype = 'lineitem_provider_attr_definition') THEN
-                SELECT provider INTO prov FROM acq.lineitem_provider_attr_definition WHERE id = adef.id;
-                CONTINUE WHEN NEW.provider IS NULL OR prov <> NEW.provider;
-            END IF;
-
-            IF (atype = 'lineitem_provider_attr_definition') THEN
-                SELECT xpath INTO xpath_string FROM acq.lineitem_provider_attr_definition WHERE id = adef.id;
-            ELSIF (atype = 'lineitem_marc_attr_definition') THEN
-                SELECT xpath INTO xpath_string FROM acq.lineitem_marc_attr_definition WHERE id = adef.id;
-            ELSIF (atype = 'lineitem_generated_attr_definition') THEN
-                SELECT xpath INTO xpath_string FROM acq.lineitem_generated_attr_definition WHERE id = adef.id;
-            END IF;
-
-            SELECT extract_acq_marc_field(id, xpath_string, adef.remove) INTO value FROM acq.lineitem WHERE id = NEW.id;
-
-            IF (value IS NOT NULL AND value <> '') THEN
-                INSERT INTO acq.lineitem_attr (lineitem, definition, attr_type, attr_name, attr_value)
-                    VALUES (NEW.id, adef.id, atype, adef.code, value);
-            END IF;
-
-        END IF;
-
-    END LOOP;
-
-    RETURN NULL;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION public.cleanup_acq_marc ( ) RETURNS TRIGGER AS $$
-BEGIN
-    IF TG_OP = 'UPDATE' THEN
-        DELETE FROM acq.lineitem_attr
-                WHERE lineitem = OLD.id AND attr_type IN ('lineitem_provider_attr_definition', 'lineitem_marc_attr_definition','lineitem_generated_attr_definition');
-        RETURN NEW;
-    ELSE
-        DELETE FROM acq.lineitem_attr WHERE lineitem = OLD.id;
-        RETURN OLD;
-    END IF;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER cleanup_lineitem_trigger
-    BEFORE UPDATE OR DELETE ON acq.lineitem
-    FOR EACH ROW EXECUTE PROCEDURE public.cleanup_acq_marc();
-
-CREATE TRIGGER ingest_lineitem_trigger
-    AFTER INSERT OR UPDATE ON acq.lineitem
-    FOR EACH ROW EXECUTE PROCEDURE public.ingest_acq_marc();
-
-CREATE OR REPLACE FUNCTION acq.exchange_ratio ( from_ex TEXT, to_ex TEXT ) RETURNS NUMERIC AS $$
-DECLARE
-    rat NUMERIC;
-BEGIN
-    IF from_ex = to_ex THEN
-        RETURN 1.0;
-    END IF;
-
-    SELECT ratio INTO rat FROM acq.exchange_rate WHERE from_currency = from_ex AND to_currency = to_ex;
-
-    IF FOUND THEN
-        RETURN rat;
-    ELSE
-        SELECT ratio INTO rat FROM acq.exchange_rate WHERE from_currency = to_ex AND to_currency = from_ex;
-        IF FOUND THEN
-            RETURN 1.0/rat;
-        END IF;
-    END IF;
-
-    RETURN NULL;
-
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE OR REPLACE FUNCTION acq.exchange_ratio ( TEXT, TEXT, NUMERIC ) RETURNS NUMERIC AS $$
-    SELECT $3 * acq.exchange_ratio($1, $2);
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE VIEW acq.funding_source_credit_total AS
-    SELECT  funding_source,
-            SUM(amount) AS amount
-      FROM  acq.funding_source_credit
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.funding_source_allocation_total AS
-    SELECT  funding_source,
-            SUM(amount)::NUMERIC(100,2) AS amount
-      FROM (
-            SELECT  funding_source,
-                    SUM(a.amount)::NUMERIC(100,2) AS amount
-              FROM  acq.fund_allocation a
-              WHERE a.percent IS NULL
-              GROUP BY 1
-                            UNION ALL
-            SELECT  funding_source,
-                    SUM( (SELECT SUM(amount) FROM acq.funding_source_credit c WHERE c.funding_source = a.funding_source) * (a.percent/100.0) )::NUMERIC(100,2) AS amount
-              FROM  acq.fund_allocation a
-              WHERE a.amount IS NULL
-              GROUP BY 1
-        ) x
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.funding_source_balance AS
-    SELECT  COALESCE(c.funding_source, a.funding_source) AS funding_source,
-            SUM(COALESCE(c.amount,0.0) - COALESCE(a.amount,0.0))::NUMERIC(100,2) AS amount
-      FROM  acq.funding_source_credit_total c
-            FULL JOIN acq.funding_source_allocation_total a USING (funding_source)
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.fund_allocation_total AS
-    SELECT  fund,
-            SUM(amount)::NUMERIC(100,2) AS amount
-      FROM (
-            SELECT  fund,
-                    SUM(a.amount * acq.exchange_ratio(s.currency_type, f.currency_type))::NUMERIC(100,2) AS amount
-              FROM  acq.fund_allocation a
-                    JOIN acq.fund f ON (a.fund = f.id)
-                    JOIN acq.funding_source s ON (a.funding_source = s.id)
-              WHERE a.percent IS NULL
-              GROUP BY 1
-                            UNION ALL
-            SELECT  fund,
-                    SUM( (SELECT SUM(amount) FROM acq.funding_source_credit c WHERE c.funding_source = a.funding_source) * acq.exchange_ratio(s.currency_type, f.currency_type) * (a.percent/100.0) )::NUMERIC(100,2) AS amount
-              FROM  acq.fund_allocation a
-                    JOIN acq.fund f ON (a.fund = f.id)
-                    JOIN acq.funding_source s ON (a.funding_source = s.id)
-              WHERE a.amount IS NULL
-              GROUP BY 1
-        ) x
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.fund_debit_total AS
-    SELECT  id AS fund,
-            encumbrance,
-            SUM(amount) AS amount
-      FROM  acq.fund_debit
-      GROUP BY 1,2;
-
-CREATE OR REPLACE VIEW acq.fund_encumbrance_total AS
-    SELECT  fund,
-            SUM(amount) AS amount
-      FROM  acq.fund_debit_total
-      WHERE encumbrance IS TRUE
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.fund_spent_total AS
-    SELECT  fund,
-            SUM(amount) AS amount
-      FROM  acq.fund_debit_total
-      WHERE encumbrance IS FALSE
-      GROUP BY 1;
-
-CREATE OR REPLACE VIEW acq.fund_combined_balance AS
-    SELECT  c.fund,
-            c.amount - COALESCE(d.amount,0.0) AS amount
-      FROM  acq.fund_allocation_total c
-            LEFT JOIN acq.fund_debit_total d USING (fund);
-
-CREATE OR REPLACE VIEW acq.fund_spent_balance AS
-    SELECT  c.fund,
-            c.amount - COALESCE(d.amount,0.0) AS amount
-      FROM  acq.fund_allocation_total c
-            LEFT JOIN acq.fund_spent_total d USING (fund);
-
-CREATE SCHEMA serial;
-
-CREATE TABLE serial.record_entry (
-    id      BIGSERIAL   PRIMARY KEY,
-    record      BIGINT      REFERENCES biblio.record_entry (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    owning_lib  INT     NOT NULL DEFAULT 1 REFERENCES actor.org_unit (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    creator     INT     NOT NULL DEFAULT 1,
-    editor      INT     NOT NULL DEFAULT 1,
-    source      INT,
-    create_date TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT now(),
-    edit_date   TIMESTAMP WITH TIME ZONE    NOT NULL DEFAULT now(),
-    active      BOOL        NOT NULL DEFAULT TRUE,
-    deleted     BOOL        NOT NULL DEFAULT FALSE,
-    marc        TEXT        NOT NULL,
-    last_xact_id    TEXT        NOT NULL
-);
-CREATE INDEX serial_record_entry_creator_idx ON serial.record_entry ( creator );
-CREATE INDEX serial_record_entry_editor_idx ON serial.record_entry ( editor );
-CREATE INDEX serial_record_entry_owning_lib_idx ON serial.record_entry ( owning_lib, deleted );
-
-CREATE TABLE serial.subscription (
-    id      SERIAL  PRIMARY KEY,
-    callnumber  BIGINT  REFERENCES asset.call_number (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    uri     INT REFERENCES asset.uri (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
-    start_date  DATE    NOT NULL,
-    end_date    DATE    -- interpret NULL as current subscription 
-);
-
-CREATE TABLE serial.binding_unit (
-    id      SERIAL  PRIMARY KEY,
-    subscription    INT NOT NULL REFERENCES serial.subscription (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    label       TEXT    NOT NULL,
-    CONSTRAINT bu_label_once_per_sub UNIQUE (subscription, label)
-);
-
-CREATE TABLE serial.issuance (
-    id      SERIAL  PRIMARY KEY,
-    subscription    INT NOT NULL REFERENCES serial.subscription (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    target_copy BIGINT  REFERENCES asset.copy (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    location    BIGINT  REFERENCES asset.copy_location(id) DEFERRABLE INITIALLY DEFERRED,
-    binding_unit    INT REFERENCES serial.binding_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    label       TEXT
-);
-
-CREATE TABLE serial.bib_summary (
-    id          SERIAL  PRIMARY KEY,
-    subscription        INT UNIQUE NOT NULL REFERENCES serial.subscription (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    generated_coverage  TEXT    NOT NULL,
-    textual_holdings    TEXT
-);
-
-CREATE TABLE serial.sup_summary (
-    id          SERIAL  PRIMARY KEY,
-    subscription        INT UNIQUE NOT NULL REFERENCES serial.subscription (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    generated_coverage  TEXT    NOT NULL,
-    textual_holdings    TEXT
-);
-
-CREATE TABLE serial.index_summary (
-    id          SERIAL  PRIMARY KEY,
-    subscription        INT UNIQUE NOT NULL REFERENCES serial.subscription (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    generated_coverage  TEXT    NOT NULL,
-    textual_holdings    TEXT
-);
-
-
-CREATE OR REPLACE FUNCTION search.staged_fts (
-
-    param_search_ou INT,
-    param_depth     INT,
-    param_searches  TEXT, -- JSON hash, to be turned into a resultset via search.parse_search_args
-    param_statuses  INT[],
-    param_locations INT[],
-    param_audience  TEXT[],
-    param_language  TEXT[],
-    param_lit_form  TEXT[],
-    param_types     TEXT[],
-    param_forms     TEXT[],
-    param_vformats  TEXT[],
-    param_bib_level TEXT[],
-    param_before    TEXT,
-    param_after     TEXT,
-    param_during    TEXT,
-    param_between   TEXT[],
-    param_pref_lang TEXT,
-    param_pref_lang_multiplier REAL,
-    param_sort      TEXT,
-    param_sort_desc BOOL,
-    metarecord      BOOL,
-    staff           BOOL,
-    param_rel_limit INT,
-    param_chk_limit INT,
-    param_skip_chk  INT
-
-) RETURNS SETOF search.search_result AS $func$
-DECLARE
-
-    current_res         search.search_result%ROWTYPE;
-    query_part          search.search_args%ROWTYPE;
-    phrase_query_part   search.search_args%ROWTYPE;
-    rank_adjust_id      INT;
-    core_rel_limit      INT;
-    core_chk_limit      INT;
-    core_skip_chk       INT;
-    rank_adjust         search.relevance_adjustment%ROWTYPE;
-    query_table         TEXT;
-    tmp_text            TEXT;
-    tmp_int             INT;
-    current_rank        TEXT;
-    ranks               TEXT[] := '{}';
-    query_table_alias   TEXT;
-    from_alias_array    TEXT[] := '{}';
-    used_ranks          TEXT[] := '{}';
-    mb_field            INT;
-    mb_field_list       INT[];
-    search_org_list     INT[];
-    select_clause       TEXT := 'SELECT';
-    from_clause         TEXT := ' FROM  metabib.metarecord_source_map m JOIN metabib.rec_descriptor mrd ON (m.source = mrd.record) ';
-    where_clause        TEXT := ' WHERE 1=1 ';
-    mrd_used            BOOL := FALSE;
-    sort_desc           BOOL := FALSE;
-
-    core_result         RECORD;
-    core_cursor         REFCURSOR;
-    core_rel_query      TEXT;
-    vis_limit_query     TEXT;
-    inner_where_clause  TEXT;
-
-    total_count         INT := 0;
-    check_count         INT := 0;
-    deleted_count       INT := 0;
-    visible_count       INT := 0;
-    excluded_count      INT := 0;
-
-BEGIN
-
-    core_rel_limit := COALESCE( param_rel_limit, 25000 );
-    core_chk_limit := COALESCE( param_chk_limit, 1000 );
-    core_skip_chk := COALESCE( param_skip_chk, 1 );
-
-    IF metarecord THEN
-        select_clause := select_clause || ' m.metarecord as id, array_accum(distinct m.source) as records,';
-    ELSE
-        select_clause := select_clause || ' m.source as id, array_accum(distinct m.source) as records,';
-    END IF;
-
-    -- first we need to construct the base query
-    FOR query_part IN SELECT * FROM search.parse_search_args(param_searches) WHERE term_type = 'fts_query' LOOP
-
-        inner_where_clause := 'index_vector @@ ' || query_part.term;
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  id INTO mb_field
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-            IF FOUND THEN
-                inner_where_clause := inner_where_clause ||
-                    ' AND ' || 'field = ' || mb_field;
-            END IF;
-
-        END IF;
-
-        -- moving on to the rank ...
-        SELECT  * INTO query_part
-          FROM  search.parse_search_args(param_searches)
-          WHERE term_type = 'fts_rank'
-                AND table_alias = query_part.table_alias;
-
-        current_rank := query_part.term || ' * ' || query_part.table_alias || '_weight.weight';
-
-        IF query_part.field_name IS NOT NULL THEN
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class
-                   AND name = query_part.field_name;
-
-        ELSE
-
-           SELECT  array_accum(distinct id) INTO mb_field_list
-             FROM  config.metabib_field
-             WHERE field_class = query_part.field_class;
-
-        END IF;
-
-        FOR rank_adjust IN SELECT * FROM search.relevance_adjustment WHERE active AND field IN ( SELECT * FROM search.explode_array( mb_field_list ) ) LOOP
-
-            IF NOT rank_adjust.bump_type = ANY (used_ranks) THEN
-
-                IF rank_adjust.bump_type = 'first_word' THEN
-                    SELECT  term INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word'
-                      ORDER BY id
-                      LIMIT 1;
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'word_order' THEN
-                    SELECT  array_to_string( array_accum( term ), '%' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value ILIKE ' || quote_literal( '%' || tmp_text || '%' );
-
-                ELSIF rank_adjust.bump_type = 'full_match' THEN
-                    SELECT  array_to_string( array_accum( term ), E'\\s+' ) INTO tmp_text
-                      FROM  search.parse_search_args(param_searches)
-                      WHERE table_alias = query_part.table_alias AND term_type = 'word';
-
-                    tmp_text := query_part.table_alias || '.value  ~ ' || quote_literal( '^' || tmp_text || E'\\W*$' );
-
-                END IF;
-
-
-                IF tmp_text IS NOT NULL THEN
-                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
-                END IF;
-
-                used_ranks := array_append( used_ranks, rank_adjust.bump_type );
-
-            END IF;
-
-        END LOOP;
-
-        ranks := array_append( ranks, current_rank );
-        used_ranks := '{}';
-
-        FOR phrase_query_part IN
-            SELECT  *
-              FROM  search.parse_search_args(param_searches)
-              WHERE term_type = 'phrase'
-                    AND table_alias = query_part.table_alias LOOP
-
-            tmp_text := replace( phrase_query_part.term, '*', E'\\*' );
-            tmp_text := replace( tmp_text, '?', E'\\?' );
-            tmp_text := replace( tmp_text, '+', E'\\+' );
-            tmp_text := replace( tmp_text, '|', E'\\|' );
-            tmp_text := replace( tmp_text, '(', E'\\(' );
-            tmp_text := replace( tmp_text, ')', E'\\)' );
-            tmp_text := replace( tmp_text, '[', E'\\[' );
-            tmp_text := replace( tmp_text, ']', E'\\]' );
-
-            inner_where_clause := inner_where_clause || ' AND ' || 'value  ~* ' || quote_literal( E'(^|\\W+)' || regexp_replace(tmp_text, E'\\s+',E'\\\\s+','g') || E'(\\W+|\$)' );
-
-        END LOOP;
-
-        query_table := search.pick_table(query_part.field_class);
-
-        from_clause := from_clause ||
-            ' JOIN ( SELECT * FROM ' || query_table || ' WHERE ' || inner_where_clause ||
-                    CASE WHEN core_rel_limit > 0 THEN ' LIMIT ' || core_rel_limit::TEXT ELSE '' END || ' ) AS ' || query_part.table_alias ||
-                ' ON ( m.source = ' || query_part.table_alias || '.source )' ||
-            ' JOIN config.metabib_field AS ' || query_part.table_alias || '_weight' ||
-                ' ON ( ' || query_part.table_alias || '.field = ' || query_part.table_alias || '_weight.id  AND  ' || query_part.table_alias || '_weight.search_field)';
-
-        from_alias_array := array_append(from_alias_array, query_part.table_alias);
-
-    END LOOP;
-
-    IF param_pref_lang IS NOT NULL AND param_pref_lang_multiplier IS NOT NULL THEN
-        current_rank := ' CASE WHEN mrd.item_lang = ' || quote_literal( param_pref_lang ) ||
-            ' THEN ' || param_pref_lang_multiplier || '::REAL ELSE 1.0 END ';
-
-        -- ranks := array_append( ranks, current_rank );
-    END IF;
-
-    current_rank := ' AVG( ( (' || array_to_string( ranks, ') + (' ) || ') ) * ' || current_rank || ' ) ';
-    select_clause := select_clause || current_rank || ' AS rel,';
-
-    sort_desc = param_sort_desc;
-
-    IF param_sort = 'pubdate' THEN
-
-        tmp_text := '999999';
-        IF param_sort_desc THEN tmp_text := '0'; END IF;
-
-        current_rank := $$ COALESCE( FIRST(NULLIF(REGEXP_REPLACE(mrd.date1, E'\\D+', '9', 'g'),'')), $$ || quote_literal(tmp_text) || $$ )::INT $$;
-
-    ELSIF param_sort = 'title' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(SUBSTR( frt.value, COALESCE(SUBSTRING(frt.ind2 FROM E'\\d+'),'0')::INT + 1 ))
-                  FROM  metabib.full_rec frt
-                  WHERE frt.record = m.source
-                    AND frt.tag = '245'
-                    AND frt.subfield = 'a'
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'author' THEN
-
-        tmp_text := 'zzzzzz';
-        IF param_sort_desc THEN tmp_text := '    '; END IF;
-
-        current_rank := $$
-            ( COALESCE( FIRST ((
-                SELECT  LTRIM(fra.value)
-                  FROM  metabib.full_rec fra
-                  WHERE fra.record = m.source
-                    AND fra.tag LIKE '1%'
-                    AND fra.subfield = 'a'
-                  ORDER BY fra.tag::text::int
-                  LIMIT 1
-            )),$$ || quote_literal(tmp_text) || $$))
-        $$;
-
-    ELSIF param_sort = 'create_date' THEN
-            current_rank := $$( FIRST (( SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSIF param_sort = 'edit_date' THEN
-            current_rank := $$( FIRST (( SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )$$;
-    ELSE
-        sort_desc := NOT COALESCE(param_sort_desc, FALSE);
-    END IF;
-
-    select_clause := select_clause || current_rank || ' AS rank';
-
-    -- now add the other qualifiers
-    IF param_audience IS NOT NULL AND array_upper(param_audience, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.audience IN ('$$ || array_to_string(param_audience, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_language IS NOT NULL AND array_upper(param_language, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_lang IN ('$$ || array_to_string(param_language, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_lit_form IS NOT NULL AND array_upper(param_lit_form, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.lit_form IN ('$$ || array_to_string(param_lit_form, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_types IS NOT NULL AND array_upper(param_types, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_type IN ('$$ || array_to_string(param_types, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_forms IS NOT NULL AND array_upper(param_forms, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.item_form IN ('$$ || array_to_string(param_forms, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_vformats IS NOT NULL AND array_upper(param_vformats, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.vr_format IN ('$$ || array_to_string(param_vformats, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_bib_level IS NOT NULL AND array_upper(param_bib_level, 1) > 0 THEN
-        where_clause = where_clause || $$ AND mrd.bib_level IN ('$$ || array_to_string(param_bib_level, $$','$$) || $$') $$;
-    END IF;
-
-    IF param_before IS NOT NULL AND param_before <> '' THEN
-        where_clause = where_clause || $$ AND mrd.date1 <= $$ || quote_literal(param_before) || ' ';
-    END IF;
-
-    IF param_after IS NOT NULL AND param_after <> '' THEN
-        where_clause = where_clause || $$ AND mrd.date1 >= $$ || quote_literal(param_after) || ' ';
-    END IF;
-
-    IF param_during IS NOT NULL AND param_during <> '' THEN
-        where_clause = where_clause || $$ AND $$ || quote_literal(param_during) || $$ BETWEEN mrd.date1 AND mrd.date2 $$;
-    END IF;
-
-    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 1 THEN
-        where_clause = where_clause || $$ AND mrd.date1 BETWEEN '$$ || array_to_string(param_between, $$' AND '$$) || $$' $$;
-    END IF;
-
-    core_rel_query := select_clause || from_clause || where_clause ||
-                        ' GROUP BY 1 ORDER BY 4' || CASE WHEN sort_desc THEN ' DESC' ELSE ' ASC' END || ';';
-    --RAISE NOTICE 'Base Query:  %', core_rel_query;
-
-    IF param_search_ou > 0 THEN
-        IF param_depth IS NOT NULL THEN
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
-        ELSE
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
-        END IF;
-    ELSIF param_search_ou < 0 THEN
-        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
-    ELSIF param_search_ou = 0 THEN
-        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
-    END IF;
-
-    OPEN core_cursor FOR EXECUTE core_rel_query;
-
-    LOOP
-
-        FETCH core_cursor INTO core_result;
-        EXIT WHEN NOT FOUND;
-
-
-        IF total_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % total, % checked so far ... ', total_count, check_count;
-        END IF;
-
-        IF core_chk_limit > 0 AND total_count - core_skip_chk + 1 >= core_chk_limit THEN
-            total_count := total_count + 1;
-            CONTINUE;
-        END IF;
-
-        total_count := total_count + 1;
-
-        CONTINUE WHEN param_skip_chk IS NOT NULL and total_count < param_skip_chk;
-
-        check_count := check_count + 1;
-
-        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-        IF NOT FOUND THEN
-            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
-            deleted_count := deleted_count + 1;
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  biblio.record_entry b
-                JOIN config.bib_source s ON (b.source = s.id)
-          WHERE s.transcendant
-                AND b.id IN ( SELECT * FROM search.explode_array( core_result.records ) );
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
-
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
-
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
-
-            RETURN NEXT current_res;
-
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  asset.call_number cn
-                JOIN asset.uri_call_number_map map ON (map.call_number = cn.id)
-                JOIN asset.uri uri ON (map.uri = uri.id)
-          WHERE NOT cn.deleted
-                AND cn.label = '##URI##'
-                AND uri.active
-                AND ( param_locations IS NULL OR array_upper(param_locations, 1) IS NULL )
-                AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                AND cn.owning_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-          LIMIT 1;
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % have at least one URI ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
-
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
-
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
-
-            RETURN NEXT current_res;
-
-            CONTINUE;
-        END IF;
-
-        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.status IN ( SELECT * FROM search.explode_array( param_statuses ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.location IN ( SELECT * FROM search.explode_array( param_locations ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all copy_location-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        END IF;
-
-        IF staff IS NULL OR NOT staff THEN
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-                    JOIN config.copy_status cs ON (cp.status = cs.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cs.opac_visible
-                    AND cl.opac_visible
-                    AND cp.opac_visible
-                    AND a.opac_visible
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                excluded_count := excluded_count + 1;
-                CONTINUE;
-            END IF;
-
-        ELSE
-
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-                    JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                    JOIN asset.copy_location cl ON (cp.location = cl.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-              LIMIT 1;
-
-            IF NOT FOUND THEN
-
-                PERFORM 1
-                  FROM  asset.call_number cn
-                  WHERE cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) )
-                  LIMIT 1;
-
-                IF FOUND THEN
-                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-
-            END IF;
-
-        END IF;
-
-        visible_count := visible_count + 1;
-
-        current_res.id = core_result.id;
-        current_res.rel = core_result.rel;
-
-        tmp_int := 1;
-        IF metarecord THEN
-            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-        END IF;
-
-        IF tmp_int = 1 THEN
-            current_res.record = core_result.records[1];
-        ELSE
-            current_res.record = NULL;
-        END IF;
-
-        RETURN NEXT current_res;
-
-        IF visible_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % visible so far ... ', visible_count;
-        END IF;
-
-    END LOOP;
-
-    current_res.id = NULL;
-    current_res.rel = NULL;
-    current_res.record = NULL;
-    current_res.total = total_count;
-    current_res.checked = check_count;
-    current_res.deleted = deleted_count;
-    current_res.visible = visible_count;
-    current_res.excluded = excluded_count;
-
-    CLOSE core_cursor;
-
-    RETURN NEXT current_res;
-
-END;
-$func$ LANGUAGE PLPGSQL;
-
-
-CREATE TABLE config.idl_field_doc (
-    id              BIGSERIAL   PRIMARY KEY,
-    fm_class        TEXT        NOT NULL,
-    field           TEXT        NOT NULL,
-    owner           INT         NOT NULL    REFERENCES actor.org_unit (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    string          TEXT        NOT NULL
-);
-CREATE UNIQUE INDEX idl_field_doc_identity ON config.idl_field_doc (fm_class,field,owner);
-
-
-INSERT INTO config.xml_transform VALUES ( 'mods33', 'http://www.loc.gov/mods/v3', 'mods33', '');
-INSERT INTO container.copy_bucket_type (code,label) VALUES ('misc', 'Miscellaneous');
-INSERT INTO container.copy_bucket_type (code,label) VALUES ('staff_client', 'General Staff Client container');
-INSERT INTO container.call_number_bucket_type (code,label) VALUES ('misc', 'Miscellaneous');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('misc', 'Miscellaneous');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('staff_client', 'General Staff Client container');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag', 'Book Bag');
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('reading_list', 'Reading List');
-
-INSERT INTO container.user_bucket_type (code,label) VALUES ('misc', 'Miscellaneous');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks', 'Friends');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.view', 'List Published Book Bags');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.add', 'Add to Published Book Bags');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.view', 'View Circulations');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.renew', 'Renew Circulations');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.checkout', 'Checkout Items');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:hold.view', 'View Holds');
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:hold.cancel', 'Cancel Holds');
-
-
-
-CREATE SCHEMA action_trigger;
-
-CREATE TABLE action_trigger.hook (
-    key         TEXT    PRIMARY KEY,
-    core_type   TEXT    NOT NULL,
-    description TEXT,
-    passive     BOOL    NOT NULL DEFAULT FALSE
-);
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('checkout','circ','Item checked out to user');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('checkin','circ','Item checked in');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('lost','circ','Circulating Item marked Lost');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('lost.found','circ','Lost Circulating Item checked in');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('lost.auto','circ','Circulating Item automatically marked lost');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('claims_returned','circ','Circulating Item marked Claims Returned');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('claims_returned.found','circ','Claims Returned Circulating Item is checked in');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('missing','acp','Item marked Missing');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('missing.found','acp','Missing Item checked in');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('transit.start','acp','An Item is placed into transit');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('transit.finish','acp','An Item is received from a transit');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold_request.success','ahr','A hold is succefully placed');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold_request.failure','ahr','A hold is attempted by not succefully placed');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold.capture','ahr','A targeted Item is captured for a hold');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold.available','ahr','A held item is ready for pickup');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold_transit.start','ahtc','A hold-captured Item is placed into transit');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('hold_transit.finish','ahtc','A hold-captured Item is received from a transit');
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('checkout.due','circ','Checked out Item is Due',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('penalty.PATRON_EXCEEDS_FINES','ausp','Patron has exceeded allowed fines',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('penalty.PATRON_EXCEEDS_OVERDUE_COUNT','ausp','Patron has exceeded allowed overdue count',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('penalty.PATRON_EXCEEDS_CHECKOUT_COUNT','ausp','Patron has exceeded allowed checkout count',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('penalty.PATRON_EXCEEDS_COLLECTIONS_WARNING','ausp','Patron has exceeded maximum fine amount for collections department warning',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('format.po.jedi','acqpo','Formats a Purchase Order as a JEDI document',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('format.po.html','acqpo','Formats a Purchase Order as an HTML document',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES ('format.po.pdf','acqpo','Formats a Purchase Order as a PDF document',TRUE);
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('damaged','acp','Item marked damaged');
-INSERT INTO action_trigger.hook (key,core_type,description) VALUES ('checkout.damaged','circ','A circulating item is marked damaged and the patron is fined');
--- and much more, I'm sure
-
--- Specialized collection modules.  Given an FM object, gather some info and return a scalar or ref.
-CREATE TABLE action_trigger.collector (
-    module      TEXT    PRIMARY KEY, -- All live under the OpenILS::Trigger::Collector:: namespace
-    description TEXT
-);
-INSERT INTO action_trigger.collector (module,description) VALUES ('fourty_two','Returns the answer to life, the universe and everything');
---INSERT INTO action_trigger.collector (module,description) VALUES ('CircCountsByCircMod','Count of Circulations for a User, broken down by circulation modifier');
-
--- Simple tests on an FM object from hook.core_type to test for "should we still do this."
-CREATE TABLE action_trigger.validator (
-    module      TEXT    PRIMARY KEY, -- All live under the OpenILS::Trigger::Validator:: namespace
-    description TEXT
-);
-INSERT INTO action_trigger.validator (module,description) VALUES ('fourty_two','Returns the answer to life, the universe and everything');
-INSERT INTO action_trigger.validator (module,description) VALUES ('NOOP_True','Always returns true -- validation always passes');
-INSERT INTO action_trigger.validator (module,description) VALUES ('NOOP_False','Always returns false -- validation always fails');
-INSERT INTO action_trigger.validator (module,description) VALUES ('CircIsOpen','Check that the circulation is still open');
-INSERT INTO action_trigger.validator (module,description) VALUES ('HoldIsAvailable','Check that an item is on the hold shelf');
-INSERT INTO action_trigger.validator (module,description) VALUES ('CircIsOverdue','Check that the circulation is overdue');
-
--- After an event passes validation (action_trigger.validator), the reactor processes it.
-CREATE TABLE action_trigger.reactor (
-    module      TEXT    PRIMARY KEY, -- All live under the OpenILS::Trigger::Reactor:: namespace
-    description TEXT
-);
-INSERT INTO action_trigger.reactor (module,description) VALUES ('fourty_two','Returns the answer to life, the universe and everything');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('NOOP_True','Always returns true -- reaction always passes');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('NOOP_False','Always returns false -- reaction always fails');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('SendEmail','Send an email based on a user-defined template');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('MarkItemLost','Marks a circulation and associated item as lost');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('ApplyCircFee','Applies a billing with a pre-defined amount to a circulation');
-INSERT INTO action_trigger.reactor (module,description) VALUES ('ProcessTemplate', 'Processes the configured template');
-
--- After an event is reacted to (either succes or failure) a cleanup module is run against the resulting environment
-CREATE TABLE action_trigger.cleanup (
-    module      TEXT    PRIMARY KEY, -- All live under the OpenILS::Trigger::Cleanup:: namespace
-    description TEXT
-);
-INSERT INTO action_trigger.cleanup (module,description) VALUES ('fourty_two','Returns the answer to life, the universe and everything');
-INSERT INTO action_trigger.cleanup (module,description) VALUES ('NOOP_True','Always returns true -- cleanup always passes');
-INSERT INTO action_trigger.cleanup (module,description) VALUES ('NOOP_False','Always returns false -- cleanup always fails');
-INSERT INTO action_trigger.cleanup (module,description) VALUES ('ClearAllPending','Remove all future, pending notifications for this target');
-
-CREATE TABLE action_trigger.event_definition (
-    id              SERIAL      PRIMARY KEY,
-    active          BOOL        NOT NULL DEFAULT TRUE,
-    owner           INT         NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
-    name            TEXT        NOT NULL,
-    hook            TEXT        NOT NULL REFERENCES action_trigger.hook (key) DEFERRABLE INITIALLY DEFERRED,
-    validator       TEXT        NOT NULL REFERENCES action_trigger.validator (module) DEFERRABLE INITIALLY DEFERRED,
-    reactor         TEXT        NOT NULL REFERENCES action_trigger.reactor (module) DEFERRABLE INITIALLY DEFERRED,
-    cleanup_success TEXT        REFERENCES action_trigger.cleanup (module) DEFERRABLE INITIALLY DEFERRED,
-    cleanup_failure TEXT        REFERENCES action_trigger.cleanup (module) DEFERRABLE INITIALLY DEFERRED,
-    delay           INTERVAL    NOT NULL DEFAULT '5 minutes',
-    delay_field     TEXT,                 -- for instance, xact_start on a circ hook ... look for fields on hook.core_type where datatype=timestamp? If not set, delay from now()
-    group_field     TEXT,                 -- field from this.hook.core_type to batch event targets together on, fed into reactor a group at a time.
-    template        TEXT,                 -- the TT block.  will have an 'environment' hash (or array of hashes, grouped events) built up by validator and collector(s), which can be modified.
-    CONSTRAINT ev_def_owner_hook_val_react_clean_delay_once UNIQUE (owner, hook, validator, reactor, delay, delay_field),
-    CONSTRAINT ev_def_name_owner_once UNIQUE (owner, name)
-);
-
-CREATE TABLE action_trigger.environment (
-    id          SERIAL  PRIMARY KEY,
-    event_def   INT     NOT NULL REFERENCES action_trigger.event_definition (id) DEFERRABLE INITIALLY DEFERRED,
-    path        TEXT,       -- fields to flesh. given a hook with a core_type of circ, imagine circ_lib.parent_ou expanding to
-                            -- {flesh: 2, flesh_fields: {circ: ['circ_lib'], aou: ['parent_ou']}} ... default is to flesh all
-                            -- at flesh depth 1
-    collector   TEXT    REFERENCES action_trigger.collector (module) DEFERRABLE INITIALLY DEFERRED, -- if set, given the object at 'path', return some data
-                                                                      -- to be stashed at environment.<label>
-    label       TEXT    CHECK (label NOT IN ('result','target','event')),
-    CONSTRAINT env_event_label_once UNIQUE (event_def,label)
-);
-
-CREATE TABLE action_trigger.event_output (
-    id              BIGSERIAL   PRIMARY KEY,
-    create_time     TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    is_error        BOOLEAN     NOT NULL DEFAULT FALSE,
-    data            TEXT        NOT NULL
-);
-
-CREATE TABLE action_trigger.event (
-    id              BIGSERIAL   PRIMARY KEY,
-    target          BIGINT      NOT NULL, -- points at the id from class defined by event_def.hook.core_type
-    event_def       INT         REFERENCES action_trigger.event_definition (id) DEFERRABLE INITIALLY DEFERRED,
-    add_time        TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    run_time        TIMESTAMPTZ NOT NULL,
-    start_time      TIMESTAMPTZ,
-    update_time     TIMESTAMPTZ,
-    complete_time   TIMESTAMPTZ,
-    update_process  INT,
-    state           TEXT        NOT NULL DEFAULT 'pending' CHECK (state IN ('pending','invalid','found','collecting','collected','validating','valid','reacting','reacted','cleaning','complete','error')),
-    template_output BIGINT      REFERENCES action_trigger.event_output (id),
-    error_output    BIGINT      REFERENCES action_trigger.event_output (id)
-);
-
-CREATE TABLE action_trigger.event_params (
-    id          BIGSERIAL   PRIMARY KEY,
-    event_def   INT         NOT NULL REFERENCES action_trigger.event_definition (id) DEFERRABLE INITIALLY DEFERRED,
-    param       TEXT        NOT NULL, -- the key under environment.event.params to store the output of ...
-    value       TEXT        NOT NULL, -- ... the eval() output of this.  Has access to environment (and, well, all of perl)
-    CONSTRAINT event_params_event_def_param_once UNIQUE (event_def,param)
-);
-
-
-
--- Trigger Event Definitions -------------------------------------------------
-
--- Sample Overdue Notice --
-
-INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, delay, delay_field, group_field, template) 
-    VALUES (1, 'f', 1, '7 Day Overdue Email Notification', 'checkout.due', 'CircIsOverdue', 'SendEmail', '7 days', 'due_date', 'usr', 
-$$
-[%- USE date -%]
-[%- user = target.0.usr -%]
-To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
-Subject: Overdue Notification
-
-Dear [% user.family_name %], [% user.first_given_name %]
-Our records indicate the following items are overdue.
-
-[% FOR circ IN target %]
-    Title: [% circ.target_copy.call_number.record.simple_record.title %] 
-    Barcode: [% circ.target_copy.barcode %] 
-    Due: [% date.format(helpers.format_date(circ.due_date), '%Y-%m-%d') %]
-    Item Cost: [% helpers.get_copy_price(circ.target_copy) %]
-    Total Owed For Transaction: [% circ.billable_transaction.summary.total_owed %]
-    Library: [% circ.circ_lib.name %]
-[% END %]
-
-$$);
-
-INSERT INTO action_trigger.environment (event_def, path) VALUES 
-    (1, 'target_copy.call_number.record.simple_record'),
-    (1, 'usr'),
-    (1, 'billable_transaction.summary'),
-    (1, 'circ_lib.billing_address');
-  
-
--- Sample Mark Long-Overdue Item Lost --
-
-INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, delay, delay_field) 
-    VALUES (2, 'f', 1, '90 Day Overdue Mark Lost', 'checkout.due', 'CircIsOverdue', 'MarkItemLost', '90 days', 'due_date');
-
--- Sample Auto Mark Lost Notice --
-
-INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, group_field, template) 
-    VALUES (3, 'f', 1, '90 Day Overdue Mark Lost Notice', 'lost.auto', 'NOOP_True', 'SendEmail', 'usr',
-$$
-[%- USE date -%]
-[%- user = target.0.usr -%]
-To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
-Subject: Overdue Items Marked Lost
-
-Dear [% user.family_name %], [% user.first_given_name %]
-The following items are 90 days overdue and have been marked LOST.
-
-[% FOR circ IN target %]
-    Title: [% circ.target_copy.call_number.record.simple_record.title %] 
-    Barcode: [% circ.target_copy.barcode %] 
-    Due: [% date.format(helpers.format_date(circ.due_date), '%Y-%m-%d') %]
-    Item Cost: [% helpers.get_copy_price(circ.target_copy) %]
-    Total Owed For Transaction: [% circ.billable_transaction.summary.total_owed %]
-    Library: [% circ.circ_lib.name %]
-[% END %]
-
-$$);
-
-
-INSERT INTO action_trigger.environment (event_def, path) VALUES 
-    (3, 'target_copy.call_number.record.simple_record'),
-    (3, 'usr'),
-    (3, 'billable_transaction.summary'),
-    (3, 'circ_lib.billing_address');
-
--- Sample Purchase Order HTML Template --
-
-INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, template) 
-    VALUES (4, 't', 1, 'PO HTML', 'format.po.html', 'NOOP_True', 'ProcessTemplate', 
-$$
-[%- USE date -%]
-[%-
-    # find a lineitem attribute by name and optional type
-    BLOCK get_li_attr;
-        FOR attr IN li.attributes;
-            IF attr.attr_name == attr_name;
-                IF !attr_type OR attr_type == attr.attr_type;
-                    attr.attr_value;
-                    LAST;
-                END;
-            END;
-        END;
-    END
--%]
-
-<h2>Purchase Order [% target.id %]</h2>
-<br/>
-date <b>[% date.format(date.now, '%Y%m%d') %]</b>
-<br/>
-
-<style>
-    table td { padding:5px; border:1px solid #aaa;}
-    table { width:95%; border-collapse:collapse; }
-</style>
-<table id='vendor-table'>
-  <tr>
-    <td valign='top'>Vendor</td>
-    <td>
-      <div>[% target.provider.name %]</div>
-      <div>[% target.provider.addresses.0.street1 %]</div>
-      <div>[% target.provider.addresses.0.street2 %]</div>
-      <div>[% target.provider.addresses.0.city %]</div>
-      <div>[% target.provider.addresses.0.state %]</div>
-      <div>[% target.provider.addresses.0.country %]</div>
-      <div>[% target.provider.addresses.0.post_code %]</div>
-    </td>
-    <td valign='top'>Ship to / Bill to</td>
-    <td>
-      <div>[% target.ordering_agency.name %]</div>
-      <div>[% target.ordering_agency.billing_address.street1 %]</div>
-      <div>[% target.ordering_agency.billing_address.street2 %]</div>
-      <div>[% target.ordering_agency.billing_address.city %]</div>
-      <div>[% target.ordering_agency.billing_address.state %]</div>
-      <div>[% target.ordering_agency.billing_address.country %]</div>
-      <div>[% target.ordering_agency.billing_address.post_code %]</div>
-    </td>
-  </tr>
-</table>
-
-<br/><br/><br/>
-
-<table>
-  <thead>
-    <tr>
-      <th>PO#</th>
-      <th>ISBN or Item #</th>
-      <th>Title</th>
-      <th>Quantity</th>
-      <th>Unit Price</th>
-      <th>Line Total</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  [% subtotal = 0 %]
-  [% FOR li IN target.lineitems %]
-
-  <tr>
-    [% count = li.lineitem_details.size %]
-    [% price = PROCESS get_li_attr attr_name = 'estimated_price' %]
-    [% litotal = (price * count) %]
-    [% subtotal = subtotal + litotal %]
-    [% isbn = PROCESS get_li_attr attr_name = 'isbn' %]
-    [% ident = PROCESS get_li_attr attr_name = 'identifier' %]
-
-    <td>[% target.id %]</td>
-    <td>[% isbn || ident %]</td>
-    <td>[% PROCESS get_li_attr attr_name = 'title' %]</td>
-    <td>[% count %]</td>
-    <td>[% price %]</td>
-    <td>[% litotal %]</td>
-  </tr>
-  [% END %]
-  <tr>
-    <td/><td/><td/><td/>
-    <td>Sub Total</td>
-    <td>[% subtotal %]</td>
-  </tr>
-  </tbody>
-</table>
-
-<br/>
-
-Total Line Item Count: [% target.lineitems.size %]
-$$);
-
-INSERT INTO action_trigger.environment (event_def, path) VALUES 
-    (4, 'lineitems.lineitem_details.fund'),
-    (4, 'lineitems.lineitem_details.location'),
-    (4, 'lineitems.lineitem_details.owning_lib'),
-    (4, 'ordering_agency.mailing_address'),
-    (4, 'ordering_agency.billing_address'),
-    (4, 'provider.addresses'),
-    (4, 'lineitems.attributes');
-
-INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, delay, delay_field, group_field, template)
-    VALUES (5, 'f', 1, 'Hold Ready for Pickup Email Notification', 'hold.available', 'HoldIsAvailable', 'SendEmail', '30 minutes', 'capture_time', 'usr',
-$$
-[%- USE date -%]
-[%- user = target.0.usr -%]
-To: [%- params.recipient_email || user.email %]
-From: [%- params.sender_email || default_sender %]
-Subject: Hold Available Notification
-
-Dear [% user.family_name %], [% user.first_given_name %]
-The item(s) you requested are available for pickup from the Library.
-
-[% FOR hold IN target %]
-    Title: [% hold.current_copy.call_number.record.simple_record.title %]
-    Author: [% hold.current_copy.call_number.record.simple_record.author %]
-    Call Number: [% hold.current_copy.call_number.label %]
-    Barcode: [% hold.current_copy.barcode %]
-    Library: [% hold.pickup_lib.name %]
-[% END %]
-
-$$);
-
-INSERT INTO action_trigger.environment (event_def, path) VALUES
-    (5, 'current_copy.call_number.record.simple_record'),
-    (5, 'usr'),
-    (5, 'pickup_lib.billing_address');
-
-
-SELECT SETVAL('action_trigger.event_definition_id_seq'::TEXT, 100);
-
-
-CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$
-DECLARE
-    moved_objects INT := 0;
-    source_cn     asset.call_number%ROWTYPE;
-    target_cn     asset.call_number%ROWTYPE;
-    metarec       metabib.metarecord%ROWTYPE;
-    hold          action.hold_request%ROWTYPE;
-    ser_rec       serial.record_entry%ROWTYPE;
-    uri_count     INT := 0;
-    counter       INT := 0;
-    uri_datafield TEXT;
-    uri_text      TEXT := '';
-BEGIN
-
-    -- move any 856 entries on records that have at least one MARC-mapped URI entry
-    SELECT  INTO uri_count COUNT(*)
-      FROM  asset.uri_call_number_map m
-            JOIN asset.call_number cn ON (m.call_number = cn.id)
-      WHERE cn.record = source_record;
-
-    IF uri_count > 0 THEN
-
-        SELECT  COUNT(*) INTO counter
-          FROM  xpath_table(
-                    'id',
-                    'marc',
-                    'acq.lineitem',
-                    '//*[@tag="856"]',
-                    'id=' || lineitem
-                ) as t(i int,c text);
-
-        FOR i IN 1 .. counter LOOP
-            SELECT  '<datafield xmlns="http://www.loc.gov/MARC21/slim" tag="856">' ||
-                        array_to_string(
-                            array_accum(
-                                '<subfield code="' || subfield || '">' ||
-                                regexp_replace(
-                                    regexp_replace(
-                                        regexp_replace(data,'&','&amp;','g'),
-                                        '>', '&gt;', 'g'
-                                    ),
-                                    '<', '&lt;', 'g'
-                                ) || '</subfield>'
-                            ), ''
-                        ) || '</datafield>' INTO uri_datafield
-              FROM  xpath_table(
-                        'id',
-                        'marc',
-                        'biblio.record_entry',
-                        '//*[@tag="856"][position()=' || i || ']/*/@code|' ||
-                        '//*[@tag="856"][position()=' || i || ']/*[@code]',
-                        'id=' || source_record
-                    ) as t(id int,subfield text,data text);
-
-            uri_text := uri_text || uri_datafield;
-        END LOOP;
-
-        IF uri_text <> '' THEN
-            UPDATE  biblio.record_entry
-              SET   marc = regexp_replace(marc,'(</[^>]*record>)', uri_text || E'\\1')
-              WHERE id = target_record;
-        END IF;
-
-    END IF;
-
-    -- Find and move metarecords to the target record
-    SELECT  INTO metarec *
-      FROM  metabib.metarecord
-      WHERE master_record = source_record;
-
-    IF FOUND THEN
-        UPDATE  metabib.metarecord
-          SET   master_record = target_record,
-            mods = NULL
-          WHERE id = metarec.id;
-
-        moved_objects := moved_objects + 1;
-    END IF;
-
-    -- Find call numbers attached to the source ...
-    FOR source_cn IN SELECT * FROM asset.call_number WHERE record = source_record LOOP
-
-        SELECT  INTO target_cn *
-          FROM  asset.call_number
-          WHERE label = source_cn.label
-            AND owning_lib = source_cn.owning_lib
-            AND record = target_record;
-
-        -- ... and if there's a conflicting one on the target ...
-        IF FOUND THEN
-
-            -- ... move the copies to that, and ...
-            UPDATE  asset.copy
-              SET   call_number = target_cn.id
-              WHERE call_number = source_cn.id;
-
-            -- ... move V holds to the move-target call number
-            FOR hold IN SELECT * FROM action.hold_request WHERE target = source_cn.id AND hold_type = 'V' LOOP
-
-                UPDATE  action.hold_request
-                  SET   target = target_cn.id
-                  WHERE id = hold.id;
-
-                moved_objects := moved_objects + 1;
-            END LOOP;
-
-        -- ... if not ...
-        ELSE
-            -- ... just move the call number to the target record
-            UPDATE  asset.call_number
-              SET   record = target_record
-              WHERE id = source_cn.id;
-        END IF;
-
-        moved_objects := moved_objects + 1;
-    END LOOP;
-
-    -- Find T holds targeting the source record ...
-    FOR hold IN SELECT * FROM action.hold_request WHERE target = source_record AND hold_type = 'T' LOOP
-
-        -- ... and move them to the target record
-        UPDATE  action.hold_request
-          SET   target = target_record
-          WHERE id = hold.id;
-
-        moved_objects := moved_objects + 1;
-    END LOOP;
-
-    -- Find serial records targeting the source record ...
-    FOR ser_rec IN SELECT * FROM serial.record_entry WHERE record = source_record LOOP
-        -- ... and move them to the target record
-        UPDATE  serial.record_entry
-          SET   record = target_record
-          WHERE id = ser_rec.id;
-
-        moved_objects := moved_objects + 1;
-    END LOOP;
-
-    -- Finally, "delete" the source record
-    DELETE FROM biblio.record_entry WHERE id = source_record;
-
-    -- That's all, folks!
-    RETURN moved_objects;
-END;
-$func$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION actor.usr_merge_rows( table_name TEXT, col_name TEXT, src_usr INT, dest_usr INT ) RETURNS VOID AS $$
-DECLARE
-    sel TEXT;
-    upd TEXT;
-    del TEXT;
-    cur_row RECORD;
-BEGIN
-    sel := 'SELECT id::BIGINT FROM ' || table_name || ' WHERE ' || quote_ident(col_name) || ' = ' || quote_literal(src_usr);
-    upd := 'UPDATE ' || table_name || ' SET ' || quote_ident(col_name) || ' = ' || quote_literal(dest_usr) || ' WHERE id = ';
-    del := 'DELETE FROM ' || table_name || ' WHERE id = ';
-    FOR cur_row IN EXECUTE sel LOOP
-        BEGIN
-            --RAISE NOTICE 'Attempting to merge % %', table_name, cur_row.id;
-            EXECUTE upd || cur_row.id;
-        EXCEPTION WHEN unique_violation THEN
-            --RAISE NOTICE 'Deleting conflicting % %', table_name, cur_row.id;
-            EXECUTE del || cur_row.id;
-        END;
-    END LOOP;
-END;
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION actor.usr_merge_rows(TEXT, TEXT, INT, INT) IS $$
-/**
- * Attempts to move each row of the specified table from src_user to dest_user.  
- * Where conflicts exist, the conflicting "source" row is deleted.
- */
-$$;
-
-
-CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$
-BEGIN
-
-    -- do some initial cleanup 
-    UPDATE actor.usr SET card = NULL WHERE id = src_usr;
-    UPDATE actor.usr SET mailing_address = NULL WHERE id = src_usr;
-    UPDATE actor.usr SET billing_address = NULL WHERE id = src_usr;
-
-    -- actor.*
-    IF del_cards THEN
-        DELETE FROM actor.card where usr = src_usr;
-    ELSE
-        IF deactivate_cards THEN
-            UPDATE actor.card SET active = 'f' WHERE usr = src_usr;
-        END IF;
-        UPDATE actor.card SET usr = dest_usr WHERE usr = src_usr;
-    END IF;
-
-
-    IF del_addrs THEN
-        DELETE FROM actor.usr_address WHERE usr = src_usr;
-    ELSE
-        UPDATE actor.usr_address SET usr = dest_usr WHERE usr = src_usr;
-    END IF;
-
-    UPDATE actor.usr_note SET usr = dest_usr WHERE usr = src_usr;
-    -- dupes are technically OK in actor.usr_standing_penalty, should manually delete them...
-    UPDATE actor.usr_standing_penalty SET usr = dest_usr WHERE usr = src_usr;
-    PERFORM actor.usr_merge_rows('actor.usr_org_unit_opt_in', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('actor.usr_setting', 'usr', src_usr, dest_usr);
-
-    -- permission.*
-    PERFORM actor.usr_merge_rows('permission.usr_perm_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_object_perm_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_grp_map', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('permission.usr_work_ou_map', 'usr', src_usr, dest_usr);
-
-
-    -- container.*
-    PERFORM actor.usr_merge_rows('container.biblio_record_entry_bucket', 'owner', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('container.call_number_bucket', 'owner', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('container.copy_bucket', 'owner', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('container.user_bucket', 'owner', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('container.user_bucket_item', 'target_user', src_usr, dest_usr);
-
-    -- vandelay.*
-    PERFORM actor.usr_merge_rows('vandelay.queue', 'owner', src_usr, dest_usr);
-
-    -- money.*
-    PERFORM actor.usr_merge_rows('money.collections_tracker', 'usr', src_usr, dest_usr);
-    PERFORM actor.usr_merge_rows('money.collections_tracker', 'collector', src_usr, dest_usr);
-    UPDATE money.billable_xact SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE money.billing SET voider = dest_usr WHERE voider = src_usr;
-    UPDATE money.bnm_payment SET accepting_usr = dest_usr WHERE accepting_usr = src_usr;
-
-    -- action.*
-    UPDATE action.circulation SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
-    UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
-
-    UPDATE action.hold_request SET usr = dest_usr WHERE usr = src_usr;
-    UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
-    UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
-    UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
-
-    UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.non_cataloged_circulation SET patron = dest_usr WHERE patron = src_usr;
-    UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
-    UPDATE action.survey_response SET usr = dest_usr WHERE usr = src_usr;
-
-    -- acq.*
-    UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
-    PERFORM actor.usr_merge_rows('acq.picklist', 'owner', src_usr, dest_usr);
-    UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
-    UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE acq.lineitem_usr_attr_definition SET usr = dest_usr WHERE usr = src_usr;
-
-    -- asset.*
-    UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
-    UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
-
-    -- serial.*
-    UPDATE serial.record_entry SET creator = dest_usr WHERE creator = src_usr;
-    UPDATE serial.record_entry SET editor = dest_usr WHERE editor = src_usr;
-
-    -- reporter.*
-    -- It's not uncommon to define the reporter schema in a replica 
-    -- DB only, so don't assume these tables exist in the write DB.
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.template', 'owner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.report', 'owner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.schedule', 'runner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.template_folder', 'owner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.report_folder', 'owner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-    BEGIN
-        PERFORM actor.usr_merge_rows('reporter.output_folder', 'owner', src_usr, dest_usr);
-    EXCEPTION WHEN undefined_table THEN
-        -- do nothing
-    END;
-
-    -- Finally, delete the source user
-    DELETE FROM actor.usr WHERE id = src_usr;
-
-END;
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION actor.usr_merge(INT, INT, BOOLEAN, BOOLEAN, BOOLEAN) IS $$
-/**
- * Merges all user date from src_usr to dest_usr.  When collisions occur, 
- * keep dest_usr's data and delete src_usr's data.
- */
-$$;
-
-
-
-CREATE OR REPLACE FUNCTION actor.approve_pending_address(pending_id INT) RETURNS BIGINT AS $$
-DECLARE
-    old_id INT;
-BEGIN
-    SELECT INTO old_id replaces FROM actor.usr_address where id = pending_id;
-    IF old_id IS NULL THEN
-        UPDATE actor.usr_address SET pending = 'f' WHERE id = pending_id;
-        RETURN pending_id;
-    END IF;
-    -- address replaces an existing address
-    DELETE FROM actor.usr_address WHERE id = -old_id;
-    UPDATE actor.usr_address SET id = -id WHERE id = old_id;
-    UPDATE actor.usr_address SET replaces = NULL, id = old_id, pending = 'f' WHERE id = pending_id;
-    RETURN old_id;
-END
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION actor.approve_pending_address(INT) IS $$
-/**
- * Replaces an address with a pending address.  This is done by giving the pending 
- * address the ID of the old address.  The replaced address is retained with -id.
- */
-$$;
-
-COMMIT;
-
-
----------!!!!!!!!!!!!!!!!!!!!!!---------------
---  Must go after COMMIT!!
----------!!!!!!!!!!!!!!!!!!!!!!---------------
-
-INSERT INTO config.z3950_source (name, label, host, port, db, auth)
-       VALUES ('biblios', oils_i18n_gettext('biblios','biblios.net', 'czs', 'label'), 'z3950.biblios.net', 210, 'bibliographic', FALSE);
-
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (19, 'biblios','tcn', oils_i18n_gettext(19, 'Title Control Number', 'cza', 'label'), 12, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (20, 'biblios', 'isbn', oils_i18n_gettext(20, 'ISBN', 'cza', 'label'), 7, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (21, 'biblios', 'lccn', oils_i18n_gettext(21, 'LCCN', 'cza', 'label'), 9, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (22, 'biblios', 'author', oils_i18n_gettext(22, 'Author', 'cza', 'label'), 1003, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (23, 'biblios', 'title', oils_i18n_gettext(23, 'Title', 'cza', 'label'), 4, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (24, 'biblios', 'issn', oils_i18n_gettext(24, 'ISSN', 'cza', 'label'), 8, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (25, 'biblios', 'publisher', oils_i18n_gettext(25, 'Publisher', 'cza', 'label'), 1018, 6);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (26, 'biblios', 'pubdate', oils_i18n_gettext(26, 'Publication Date', 'cza', 'label'), 31, 1);
-INSERT INTO config.z3950_attr (id, source, name, label, code, format)
-       VALUES (27, 'biblios', 'item_type', oils_i18n_gettext(27, 'Item Type', 'cza', 'label'), 1001, 1);
-
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_FUNDING_SOURCE', 'Allow a user to delete a funding source');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_FUNDING_SOURCE', 'Allow a user to view a funding source');
-INSERT INTO permission.perm_list (code, description) VALUES ('UPDATE_FUNDING_SOURCE', 'Allow a user to update a funding source');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_FUND', 'Allow a user to create a new fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_FUND', 'Allow a user to delete a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_FUND', 'Allow a user to view a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('UPDATE_FUND', 'Allow a user to update a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_FUND_ALLOCATION', 'Allow a user to create a new fund allocation');
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_FUND_ALLOCATION', 'Allow a user to delete a fund allocation');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_FUND_ALLOCATION', 'Allow a user to view a fund allocation');
-INSERT INTO permission.perm_list (code, description) VALUES ('UPDATE_FUND_ALLOCATION', 'Allow a user to update a fund allocation');
-INSERT INTO permission.perm_list (code, description) VALUES ('GENERAL_ACQ', 'Lowest level permission required to access the ACQ interface');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_PROVIDER', 'Allow a user to create a new provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_PROVIDER', 'Allow a user to delate a provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_PROVIDER', 'Allow a user to view a provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('UPDATE_PROVIDER', 'Allow a user to update a provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_FUNDING_SOURCE', 'Allow a user to create/view/update/delete a funding source');
-INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_ACQ_FUND', 'Allow a user to create/view/update/delete a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_FUND', 'Allow a user to create/view/update/delete a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('MANAGE_FUNDING_SOURCE', 'Allow a user to view/credit/debit a funding source');
-INSERT INTO permission.perm_list (code, description) VALUES ('MANAGE_FUND', 'Allow a user to view/credit/debit a fund');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_PICKLIST', 'Allows a user to create a picklist');
-INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_PROVIDER', 'Allow a user to create/view/update/delete a provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('MANAGE_PROVIDER', 'Allow a user to view and purchase from a provider');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_PICKLIST', 'Allow a user to view another users picklist');
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_RECORD', 'Allow a staff member to directly remove a bibliographic record');
-INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_CURRENCY_TYPE', 'Allow a user to create/view/update/delete a currency_type');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_BAD_DEBT', 'Allow a user to mark a transaction as bad (unrecoverable) debt');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_BILLING_TYPE', 'Allow a user to view billing types');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_AVAILABLE', 'Allow a user to mark an item status as ''available''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_CHECKED_OUT', 'Allow a user to mark an item status as ''checked out''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_BINDERY', 'Allow a user to mark an item status as ''bindery''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_LOST', 'Allow a user to mark an item status as ''lost''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_MISSING', 'Allow a user to mark an item status as ''missing''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_IN_PROCESS', 'Allow a user to mark an item status as ''in process''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_IN_TRANSIT', 'Allow a user to mark an item status as ''in transit''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_RESHELVING', 'Allow a user to mark an item status as ''reshelving''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_ON_HOLDS_SHELF', 'Allow a user to mark an item status as ''on holds shelf''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_ON_ORDER', 'Allow a user to mark an item status as ''on order''');
-INSERT INTO permission.perm_list (code, description) VALUES ('MARK_ITEM_ILL', 'Allow a user to mark an item status as ''inter-library loan''');
-INSERT INTO permission.perm_list (code, description) VALUES ('group_application.user.staff.acq', 'Allows a user to add/remove/edit users in the "ACQ" group');
-INSERT INTO permission.perm_list (code, description) VALUES ('group_application.user.staff.acq_admin', 'Allows a user to add/remove/edit users in the "Acquisitions Administrator" group');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_PURCHASE_ORDER', 'Allows a user to create a purchase order');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_PURCHASE_ORDER', 'Allows a user to view a purchase order');
-INSERT INTO permission.perm_list (code, description) VALUES ('IMPORT_ACQ_LINEITEM_BIB_RECORD', 'Allows a user to import a bib record from the acq staging area (on-order record) into the ILS bib data set');
-INSERT INTO permission.perm_list (code, description) VALUES ('RECEIVE_PURCHASE_ORDER', 'Allows a user to mark a purchase order, lineitem, or individual copy as received');
-INSERT INTO permission.perm_list (code, description) VALUES ('VIEW_ORG_SETTINGS','Allows a user to view all org settings at the specified level');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_MFHD_RECORD', 'Allows a user to create a new MFHD record');
-INSERT INTO permission.perm_list (code, description) VALUES ('UPDATE_MFHD_RECORD', 'Allows a user to update an MFHD record');
-INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_MFHD_RECORD', 'Allows a user to delete an MFHD record');
-INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_FUNDING_SOURCE', 'Allow a user to create a new funding source');
-
-INSERT INTO permission.perm_list (code) VALUES ('CREATE_ACQ_FUNDING_SOURCE');
-INSERT INTO permission.perm_list (code) VALUES ('DELETE_ACQ_FUNDING_SOURCE');
-INSERT INTO permission.perm_list (code) VALUES ('UPDATE_ACQ_FUNDING_SOURCE');
-INSERT INTO permission.perm_list (code) VALUES ('VIEW_ACQ_FUNDING_SOURCE');
-INSERT INTO permission.perm_list (code) VALUES ('UPDATE_ORG_UNIT_SETTING.global.password_regex');
-INSERT INTO permission.perm_list (code) VALUES ('UPDATE_ORG_UNIT_SETTING.global.juvenile_age_threshold');
-INSERT INTO permission.perm_list (code) VALUES ('UPDATE_ORG_UNIT_SETTING.patron.password.use_phone');
-
-INSERT INTO permission.grp_tree (name, parent, description, perm_interval, usergroup, application_perm) VALUES ('Acquisitions', 3, NULL, '3 years', TRUE, 'group_application.user.staff.acq');
-INSERT INTO permission.grp_tree (name, parent, description, perm_interval, usergroup, application_perm) VALUES ('Acquisitions Administrators', (SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), NULL, '3 years', TRUE, 'group_application.user.staff.acq_admin');
-
--- You can't log into the staff client without this
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (3, (SELECT id FROM permission.perm_list WHERE code = 'VIEW_ORG_SETTINGS'), 1, false);
--- MFHD permissions are necessary for serials work; add to the default catalogers group
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, (SELECT id FROM permission.perm_list WHERE code = 'CREATE_MFHD_RECORD'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, (SELECT id FROM permission.perm_list WHERE code = 'DELETE_MFHD_RECORD'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_MFHD_RECORD'), 1, false);
-
--- Add basic acquisitions permissions to the Acquisitions group
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'GENERAL_ACQ'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'VIEW_PICKLIST'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'CREATE_PICKLIST'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'CREATE_PURCHASE_ORDER'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'VIEW_PURCHASE_ORDER'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'RECEIVE_PURCHASE_ORDER'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'VIEW_PROVIDER'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_COPY'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions'), (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_VOLUME'), 1, false);
-
--- Add acquisitions administration permissions to the Acquisitions group
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions Administrators'), (SELECT id FROM permission.perm_list WHERE code = 'ADMIN_PROVIDER'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions Administrators'), (SELECT id FROM permission.perm_list WHERE code = 'ADMIN_FUNDING_SOURCE'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions Administrators'), (SELECT id FROM permission.perm_list WHERE code = 'ADMIN_ACQ_FUND'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions Administrators'), (SELECT id FROM permission.perm_list WHERE code = 'ADMIN_FUND'), 1, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES ((SELECT id FROM permission.grp_tree WHERE name = 'Acquisitions Administrators'), (SELECT id FROM permission.perm_list WHERE code = 'ADMIN_CURRENCY_TYPE'), 1, false);
-
-SELECT SETVAL('permission.perm_list_id_seq'::TEXT, (SELECT MAX(id) FROM permission.perm_list));
-
-ALTER TABLE auditor.action_hold_request_history ADD COLUMN cancel_cause INT;
-ALTER TABLE auditor.action_hold_request_history ADD COLUMN cancel_note TEXT;
-
-CREATE OR REPLACE FUNCTION tmp_populate_p_b_bt () RETURNS BOOL AS $$
-DECLARE
-    p   RECORD;
-BEGIN
-    FOR p IN
-        SELECT  DISTINCT xact
-          FROM  money.payment
-          WHERE NOT voided
-                AND amount > 0.0
-    LOOP
-
-        INSERT INTO money.materialized_payment_by_billing_type (
-            xact, payment, billing, payment_ts, billing_ts,
-            payment_type, billing_type, amount, billing_ou, payment_ou
-        ) SELECT    xact, payment, billing, payment_ts, billing_ts,
-                    payment_type, billing_type, amount, billing_ou, payment_ou
-          FROM money.payment_by_billing_type( p.xact );
-
-    END LOOP;
-
-    RETURN TRUE;
-END;
-$$ LANGUAGE PLPGSQL;
-
-SELECT tmp_populate_p_b_bt();
-
-DROP FUNCTION tmp_populate_p_b_bt ();
-
-
-UPDATE config.xml_transform SET xslt=$$<xsl:stylesheet xmlns="http://www.loc.gov/mods/v3" xmlns:marc="http://www.loc.gov/MARC21/slim"
-       xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-       exclude-result-prefixes="xlink marc" version="1.0">
-       <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
-
-       <xsl:variable name="ascii">
-               <xsl:text> !"#$%&amp;'()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~</xsl:text>
-       </xsl:variable>
-
-       <xsl:variable name="latin1">
-               <xsl:text> ¡¢£¤¥¦§¨©ª«¬\ad®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ</xsl:text>
-       </xsl:variable>
-       <!-- Characters that usually don't need to be escaped -->
-       <xsl:variable name="safe">
-               <xsl:text>!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~</xsl:text>
-       </xsl:variable>
-
-       <xsl:variable name="hex">0123456789ABCDEF</xsl:variable>
-
-
-       
-       <!--MARC21slim2MODS3-3.xsl
-Revision 1.27 - Mapped 648 to <subject> 2009/03/13 tmee
-Revision 1.26 - Added subfield $s mapping for 130/240/730  2008/10/16 tmee
-Revision 1.25 - Mapped 040e to <descriptiveStandard> and Leader/18 to <descriptive standard>aacr2  2008/09/18 tmee
-Revision 1.24 - Mapped 852 subfields $h, $i, $j, $k, $l, $m, $t to <shelfLocation> and 852 subfield $u to <physicalLocation> with @xlink 2008/09/17 tmee
-Revision 1.23 - Commented out xlink/uri for subfield 0 for 130/240/730, 100/700, 110/710, 111/711 as these are currently unactionable  2008/09/17  tmee
-Revision 1.22 - Mapped 022 subfield $l to type "issn-l" subfield $m to output identifier element with corresponding @type and @invalid eq 'yes'2008/09/17  tmee
-Revision 1.21 - Mapped 856 ind2=1 or ind2=2 to <relatedItem><location><url>  2008/07/03  tmee
-Revision 1.20 - Added genre w/@auth="contents of 2" and type= "musical composition"  2008/07/01  tmee
-Revision 1.19 - Added genre offprint for 008/24+ BK code 2  2008/07/01  tmee
-Revision 1.18 - Added xlink/uri for subfield 0 for 130/240/730, 100/700, 110/710, 111/711  2008/06/26  tmee
-Revision 1.17 - Added mapping of 662 2008/05/14 tmee   
-Revision 1.16 - Changed @authority from "marc" to "marcgt" for 007 and 008 codes mapped to a term in <genre> 2007/07/10  tmee
-Revision 1.15 - For field 630, moved call to part template outside title element  2007/07/10  tmee
-Revision 1.14 - Fixed template isValid and fields 010, 020, 022, 024, 028, and 037 to output additional identifier elements with corresponding @type and @invalid eq 'yes' when subfields z or y (in the case of 022) exist in the MARCXML ::: 2007/01/04 17:35:20 cred
-Revision 1.13 - Changed order of output under cartographics to reflect schema  2006/11/28  tmee
-Revision 1.12 - Updated to reflect MODS 3.2 Mapping  2006/10/11  tmee
-Revision 1.11 - The attribute objectPart moved from <languageTerm> to <language>  2006/04/08  jrad
-Revision 1.10 - MODS 3.1 revisions to language and classification elements  (plus ability to find marc:collection embedded in wrapper elements such as SRU zs: wrappers)  2006/02/06  ggar
-Revision 1.9 - Subfield $y was added to field 242 2004/09/02 10:57 jrad
-Revision 1.8 - Subject chopPunctuation expanded and attribute fixes 2004/08/12 jrad
-Revision 1.7 - 2004/03/25 08:29 jrad
-Revision 1.6 - Various validation fixes 2004/02/20 ntra
-Revision 1.5 - MODS2 to MODS3 updates, language unstacking and de-duping, chopPunctuation expanded  2003/10/02 16:18:58  ntra
-Revision 1.3 - Additional Changes not related to MODS Version 2.0 by ntra
-Revision 1.2 - Added Log Comment  2003/03/24 19:37:42  ckeith
--->
-       <xsl:template match="/">
-               <xsl:choose>
-                       <xsl:when test="//marc:collection">
-                               <modsCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                       xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
-                                       <xsl:for-each select="//marc:collection/marc:record">
-                                               <mods version="3.3">
-                                                       <xsl:call-template name="marcRecord"/>
-                                               </mods>
-                                       </xsl:for-each>
-                               </modsCollection>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3"
-                                       xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-2.xsd">
-                                       <xsl:for-each select="//marc:record">
-                                               <xsl:call-template name="marcRecord"/>
-                                       </xsl:for-each>
-                               </mods>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="marcRecord">
-               <xsl:variable name="leader" select="marc:leader"/>
-               <xsl:variable name="leader6" select="substring($leader,7,1)"/>
-               <xsl:variable name="leader7" select="substring($leader,8,1)"/>
-               <xsl:variable name="controlField008" select="marc:controlfield[@tag='008']"/>
-               <xsl:variable name="typeOf008">
-                       <xsl:choose>
-                               <xsl:when test="$leader6='a'">
-                                       <xsl:choose>
-                                               <xsl:when
-                                                       test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
-                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">SE</xsl:when>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:when test="$leader6='t'">BK</xsl:when>
-                               <xsl:when test="$leader6='p'">MM</xsl:when>
-                               <xsl:when test="$leader6='m'">CF</xsl:when>
-                               <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                               <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
-                               <xsl:when test="$leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'"
-                               >MU</xsl:when>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:for-each select="marc:datafield[@tag='245']">
-                       <titleInfo>
-                               <xsl:variable name="title">
-                                       <xsl:choose>
-                                               <xsl:when test="marc:subfield[@code='b']">
-                                                       <xsl:call-template name="specialSubfieldSelect">
-                                                               <xsl:with-param name="axis">b</xsl:with-param>
-                                                               <xsl:with-param name="beforeCodes">afgk</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">abfgk</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:variable>
-                               <xsl:variable name="titleChop">
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="$title"/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </xsl:variable>
-                               <xsl:choose>
-                                       <xsl:when test="@ind2&gt;0">
-                                               <nonSort>
-                                                       <xsl:value-of select="substring($titleChop,1,@ind2)"/>
-                                               </nonSort>
-                                               <title>
-                                                       <xsl:value-of select="substring($titleChop,@ind2+1)"/>
-                                               </title>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <title>
-                                                       <xsl:value-of select="$titleChop"/>
-                                               </title>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               <xsl:if test="marc:subfield[@code='b']">
-                                       <subTitle>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="axis">b</xsl:with-param>
-                                                                       <xsl:with-param name="anyCodes">b</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">afgk</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </subTitle>
-                               </xsl:if>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='210']">
-                       <titleInfo type="abbreviated">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">a</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="subtitle"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='242']">
-                       <titleInfo type="translated">
-                               <!--09/01/04 Added subfield $y-->
-                               <xsl:for-each select="marc:subfield[@code='y']">
-                                       <xsl:attribute name="lang">
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:attribute>
-                               </xsl:for-each>
-                               <xsl:for-each select="marc:subfield[@code='i']">
-                                       <xsl:attribute name="displayLabel">
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:attribute>
-                               </xsl:for-each>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <!-- 1/04 removed $h, b -->
-                                                               <xsl:with-param name="codes">a</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <!-- 1/04 fix -->
-                               <xsl:call-template name="subtitle"/>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='246']">
-                       <titleInfo type="alternative">
-                               <xsl:for-each select="marc:subfield[@code='i']">
-                                       <xsl:attribute name="displayLabel">
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:attribute>
-                               </xsl:for-each>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <!-- 1/04 removed $h, $b -->
-                                                               <xsl:with-param name="codes">af</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="subtitle"/>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each
-                       select="marc:datafield[@tag='130']|marc:datafield[@tag='240']|marc:datafield[@tag='730'][@ind2!='2']">
-                       <titleInfo type="uniform">
-                               <title>
-                                       <!-- deleted uri for subfield 0
-                                               <xsl:call-template name="uri"/>
-                                       -->
-
-                                       <xsl:variable name="str">
-                                               <xsl:for-each select="marc:subfield">
-                                                       <xsl:if
-                                                               test="(contains('adfklmors',@code) and (not(../marc:subfield[@code='n' or @code='p']) or (following-sibling::marc:subfield[@code='n' or @code='p'])))">
-                                                               <xsl:value-of select="text()"/>
-                                                               <xsl:text> </xsl:text>
-                                                       </xsl:if>
-                                               </xsl:for-each>
-                                       </xsl:variable>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='740'][@ind2!='2']">
-                       <titleInfo type="alternative">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">ah</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='100']">
-                       <name type="personal">
-
-                               <!-- deleted uri for subfield 0
-                               <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameABCDQ"/>
-                               <xsl:call-template name="affiliation"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='110']">
-                       <name type="corporate">
-
-                               <!-- deleted uri for subfield 0
-                                       <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameABCDN"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='111']">
-                       <name type="conference">
-
-                               <!-- deleted uri for subfield 0
-                                       <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameACDEQ"/>
-                               <role>
-                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-                               </role>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='700'][not(marc:subfield[@code='t'])]">
-                       <name type="personal">
-
-                               <!-- deleted uri for subfield 0
-                                       <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameABCDQ"/>
-                               <xsl:call-template name="affiliation"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='710'][not(marc:subfield[@code='t'])]">
-                       <name type="corporate">
-
-                               <!-- deleted uri for subfield 0
-                                       <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameABCDN"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='711'][not(marc:subfield[@code='t'])]">
-                       <name type="conference">
-
-                               <!-- deleted uri for subfield 0
-                                       <xsl:call-template name="uri"/>
-                               -->
-
-                               <xsl:call-template name="nameACDEQ"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='720'][not(marc:subfield[@code='t'])]">
-                       <name>
-                               <xsl:if test="@ind1=1">
-                                       <xsl:attribute name="type">
-                                               <xsl:text>personal</xsl:text>
-                                       </xsl:attribute>
-                               </xsl:if>
-                               <namePart>
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </namePart>
-                               <xsl:call-template name="role"/>
-                       </name>
-               </xsl:for-each>
-               <typeOfResource>
-                       <xsl:if test="$leader7='c'">
-                               <xsl:attribute name="collection">yes</xsl:attribute>
-                       </xsl:if>
-                       <xsl:if test="$leader6='d' or $leader6='f' or $leader6='p' or $leader6='t'">
-                               <xsl:attribute name="manuscript">yes</xsl:attribute>
-                       </xsl:if>
-                       <xsl:choose>
-                               <xsl:when test="$leader6='a' or $leader6='t'">text</xsl:when>
-                               <xsl:when test="$leader6='e' or $leader6='f'">cartographic</xsl:when>
-                               <xsl:when test="$leader6='c' or $leader6='d'">notated music</xsl:when>
-                               <xsl:when test="$leader6='i'">sound recording-nonmusical</xsl:when>
-                               <xsl:when test="$leader6='j'">sound recording-musical</xsl:when>
-                               <xsl:when test="$leader6='k'">still image</xsl:when>
-                               <xsl:when test="$leader6='g'">moving image</xsl:when>
-                               <xsl:when test="$leader6='r'">three dimensional object</xsl:when>
-                               <xsl:when test="$leader6='m'">software, multimedia</xsl:when>
-                               <xsl:when test="$leader6='p'">mixed material</xsl:when>
-                       </xsl:choose>
-               </typeOfResource>
-               <xsl:if test="substring($controlField008,26,1)='d'">
-                       <genre authority="marcgt">globe</genre>
-               </xsl:if>
-               <xsl:if
-                       test="marc:controlfield[@tag='007'][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                       <genre authority="marcgt">remote-sensing image</genre>
-               </xsl:if>
-               <xsl:if test="$typeOf008='MP'">
-                       <xsl:variable name="controlField008-25" select="substring($controlField008,26,1)"/>
-                       <xsl:choose>
-                               <xsl:when
-                                       test="$controlField008-25='a' or $controlField008-25='b' or $controlField008-25='c' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                                       <genre authority="marcgt">map</genre>
-                               </xsl:when>
-                               <xsl:when
-                                       test="$controlField008-25='e' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                                       <genre authority="marcgt">atlas</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='SE'">
-                       <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-21='d'">
-                                       <genre authority="marcgt">database</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='l'">
-                                       <genre authority="marcgt">loose-leaf</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='m'">
-                                       <genre authority="marcgt">series</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='n'">
-                                       <genre authority="marcgt">newspaper</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='p'">
-                                       <genre authority="marcgt">periodical</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-21='w'">
-                                       <genre authority="marcgt">web site</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='BK' or $typeOf008='SE'">
-                       <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
-                       <xsl:choose>
-                               <xsl:when test="contains($controlField008-24,'a')">
-                                       <genre authority="marcgt">abstract or summary</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'b')">
-                                       <genre authority="marcgt">bibliography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'c')">
-                                       <genre authority="marcgt">catalog</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'d')">
-                                       <genre authority="marcgt">dictionary</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'e')">
-                                       <genre authority="marcgt">encyclopedia</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'f')">
-                                       <genre authority="marcgt">handbook</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'g')">
-                                       <genre authority="marcgt">legal article</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'i')">
-                                       <genre authority="marcgt">index</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'k')">
-                                       <genre authority="marcgt">discography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'l')">
-                                       <genre authority="marcgt">legislation</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'m')">
-                                       <genre authority="marcgt">theses</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'n')">
-                                       <genre authority="marcgt">survey of literature</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'o')">
-                                       <genre authority="marcgt">review</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'p')">
-                                       <genre authority="marcgt">programmed text</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'q')">
-                                       <genre authority="marcgt">filmography</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'r')">
-                                       <genre authority="marcgt">directory</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'s')">
-                                       <genre authority="marcgt">statistics</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'t')">
-                                       <genre authority="marcgt">technical report</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'v')">
-                                       <genre authority="marcgt">legal case and case notes</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'w')">
-                                       <genre authority="marcgt">law report or digest</genre>
-                               </xsl:when>
-                               <xsl:when test="contains($controlField008-24,'z')">
-                                       <genre authority="marcgt">treaty</genre>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-29='1'">
-                                       <genre authority="marcgt">conference publication</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='CF'">
-                       <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-26='a'">
-                                       <genre authority="marcgt">numeric data</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='e'">
-                                       <genre authority="marcgt">database</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='f'">
-                                       <genre authority="marcgt">font</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-26='g'">
-                                       <genre authority="marcgt">game</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='BK'">
-                       <xsl:if test="substring($controlField008,25,1)='j'">
-                               <genre authority="marcgt">patent</genre>
-                       </xsl:if>
-                       <xsl:if test="substring($controlField008,25,1)='2'">
-                               <genre authority="marcgt">offprint</genre>
-                       </xsl:if>
-                       <xsl:if test="substring($controlField008,31,1)='1'">
-                               <genre authority="marcgt">festschrift</genre>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
-                       <xsl:if
-                               test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
-                               <genre authority="marcgt">biography</genre>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-33='e'">
-                                       <genre authority="marcgt">essay</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='d'">
-                                       <genre authority="marcgt">drama</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='c'">
-                                       <genre authority="marcgt">comic strip</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='l'">
-                                       <genre authority="marcgt">fiction</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='h'">
-                                       <genre authority="marcgt">humor, satire</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='i'">
-                                       <genre authority="marcgt">letter</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='f'">
-                                       <genre authority="marcgt">novel</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='j'">
-                                       <genre authority="marcgt">short story</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='s'">
-                                       <genre authority="marcgt">speech</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:if test="$typeOf008='MU'">
-                       <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
-                       <xsl:if test="contains($controlField008-30-31,'b')">
-                               <genre authority="marcgt">biography</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'c')">
-                               <genre authority="marcgt">conference publication</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'d')">
-                               <genre authority="marcgt">drama</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'e')">
-                               <genre authority="marcgt">essay</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'f')">
-                               <genre authority="marcgt">fiction</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'o')">
-                               <genre authority="marcgt">folktale</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'h')">
-                               <genre authority="marcgt">history</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'k')">
-                               <genre authority="marcgt">humor, satire</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'m')">
-                               <genre authority="marcgt">memoir</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'p')">
-                               <genre authority="marcgt">poetry</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'r')">
-                               <genre authority="marcgt">rehearsal</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'g')">
-                               <genre authority="marcgt">reporting</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'s')">
-                               <genre authority="marcgt">sound</genre>
-                       </xsl:if>
-                       <xsl:if test="contains($controlField008-30-31,'l')">
-                               <genre authority="marcgt">speech</genre>
-                       </xsl:if>
-               </xsl:if>
-               <xsl:if test="$typeOf008='VM'">
-                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="$controlField008-33='a'">
-                                       <genre authority="marcgt">art original</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='b'">
-                                       <genre authority="marcgt">kit</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='c'">
-                                       <genre authority="marcgt">art reproduction</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='d'">
-                                       <genre authority="marcgt">diorama</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='f'">
-                                       <genre authority="marcgt">filmstrip</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='g'">
-                                       <genre authority="marcgt">legal article</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='i'">
-                                       <genre authority="marcgt">picture</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='k'">
-                                       <genre authority="marcgt">graphic</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='l'">
-                                       <genre authority="marcgt">technical drawing</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='m'">
-                                       <genre authority="marcgt">motion picture</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='n'">
-                                       <genre authority="marcgt">chart</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='o'">
-                                       <genre authority="marcgt">flash card</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='p'">
-                                       <genre authority="marcgt">microscope slide</genre>
-                               </xsl:when>
-                               <xsl:when
-                                       test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                                       <genre authority="marcgt">model</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='r'">
-                                       <genre authority="marcgt">realia</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='s'">
-                                       <genre authority="marcgt">slide</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='t'">
-                                       <genre authority="marcgt">transparency</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='v'">
-                                       <genre authority="marcgt">videorecording</genre>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-33='w'">
-                                       <genre authority="marcgt">toy</genre>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-
-               <!-- 1.20 047 genre tmee-->
-
-               <xsl:for-each select="marc:datafield[@tag=047]">
-                       <genre authority="marcgt">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                               </xsl:attribute>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abcdef</xsl:with-param>
-                                       <xsl:with-param name="delimeter">-</xsl:with-param>
-                               </xsl:call-template>
-                       </genre>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=655]">
-                       <genre authority="marcgt">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                               </xsl:attribute>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abvxyz</xsl:with-param>
-                                       <xsl:with-param name="delimeter">-</xsl:with-param>
-                               </xsl:call-template>
-                       </genre>
-               </xsl:for-each>
-               <originInfo>
-                       <xsl:variable name="MARCpublicationCode"
-                               select="normalize-space(substring($controlField008,16,3))"/>
-                       <xsl:if test="translate($MARCpublicationCode,'|','')">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">code</xsl:attribute>
-                                               <xsl:attribute name="authority">marccountry</xsl:attribute>
-                                               <xsl:value-of select="$MARCpublicationCode"/>
-                                       </placeTerm>
-                               </place>
-                       </xsl:if>
-                       <xsl:for-each select="marc:datafield[@tag=044]/marc:subfield[@code='c']">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">code</xsl:attribute>
-                                               <xsl:attribute name="authority">iso3166</xsl:attribute>
-                                               <xsl:value-of select="."/>
-                                       </placeTerm>
-                               </place>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='a']">
-                               <place>
-                                       <placeTerm>
-                                               <xsl:attribute name="type">text</xsl:attribute>
-                                               <xsl:call-template name="chopPunctuationFront">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="chopPunctuation">
-                                                                       <xsl:with-param name="chopString" select="."/>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </placeTerm>
-                               </place>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='m']">
-                               <dateValid point="start">
-                                       <xsl:value-of select="."/>
-                               </dateValid>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='n']">
-                               <dateValid point="end">
-                                       <xsl:value-of select="."/>
-                               </dateValid>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='j']">
-                               <dateModified>
-                                       <xsl:value-of select="."/>
-                               </dateModified>
-                       </xsl:for-each>
-                       <xsl:for-each
-                               select="marc:datafield[@tag=260]/marc:subfield[@code='b' or @code='c' or @code='g']">
-                               <xsl:choose>
-                                       <xsl:when test="@code='b'">
-                                               <publisher>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                               <xsl:with-param name="punctuation">
-                                                                       <xsl:text>:,;/ </xsl:text>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </publisher>
-                                       </xsl:when>
-                                       <xsl:when test="@code='c'">
-                                               <dateIssued>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </dateIssued>
-                                       </xsl:when>
-                                       <xsl:when test="@code='g'">
-                                               <dateCreated>
-                                                       <xsl:value-of select="."/>
-                                               </dateCreated>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </xsl:for-each>
-                       <xsl:variable name="dataField260c">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString"
-                                               select="marc:datafield[@tag=260]/marc:subfield[@code='c']"/>
-                               </xsl:call-template>
-                       </xsl:variable>
-                       <xsl:variable name="controlField008-7-10"
-                               select="normalize-space(substring($controlField008, 8, 4))"/>
-                       <xsl:variable name="controlField008-11-14"
-                               select="normalize-space(substring($controlField008, 12, 4))"/>
-                       <xsl:variable name="controlField008-6"
-                               select="normalize-space(substring($controlField008, 7, 1))"/>
-                       <xsl:if
-                               test="$controlField008-6='e' or $controlField008-6='p' or $controlField008-6='r' or $controlField008-6='t' or $controlField008-6='s'">
-                               <xsl:if test="$controlField008-7-10 and ($controlField008-7-10 != $dataField260c)">
-                                       <dateIssued encoding="marc">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if
-                               test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
-                               <xsl:if test="$controlField008-7-10">
-                                       <dateIssued encoding="marc" point="start">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if
-                               test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <dateIssued encoding="marc" point="end">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='q'">
-                               <xsl:if test="$controlField008-7-10">
-                                       <dateIssued encoding="marc" point="start" qualifier="questionable">
-                                               <xsl:value-of select="$controlField008-7-10"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='q'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <dateIssued encoding="marc" point="end" qualifier="questionable">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </dateIssued>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:if test="$controlField008-6='t'">
-                               <xsl:if test="$controlField008-11-14">
-                                       <copyrightDate encoding="marc">
-                                               <xsl:value-of select="$controlField008-11-14"/>
-                                       </copyrightDate>
-                               </xsl:if>
-                       </xsl:if>
-                       <xsl:for-each
-                               select="marc:datafield[@tag=033][@ind1=0 or @ind1=1]/marc:subfield[@code='a']">
-                               <dateCaptured encoding="iso8601">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][1]">
-                               <dateCaptured encoding="iso8601" point="start">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][2]">
-                               <dateCaptured encoding="iso8601" point="end">
-                                       <xsl:value-of select="."/>
-                               </dateCaptured>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=250]/marc:subfield[@code='a']">
-                               <edition>
-                                       <xsl:value-of select="."/>
-                               </edition>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:leader">
-                               <issuance>
-                                       <xsl:choose>
-                                               <xsl:when
-                                                       test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'"
-                                                       >monographic</xsl:when>
-                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'"
-                                               >continuing</xsl:when>
-                                       </xsl:choose>
-                               </issuance>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=310]|marc:datafield[@tag=321]">
-                               <frequency>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">ab</xsl:with-param>
-                                       </xsl:call-template>
-                               </frequency>
-                       </xsl:for-each>
-               </originInfo>
-               <xsl:variable name="controlField008-35-37"
-                       select="normalize-space(translate(substring($controlField008,36,3),'|#',''))"/>
-               <xsl:if test="$controlField008-35-37">
-                       <language>
-                               <languageTerm authority="iso639-2b" type="code">
-                                       <xsl:value-of select="substring($controlField008,36,3)"/>
-                               </languageTerm>
-                       </language>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=041]">
-                       <xsl:for-each
-                               select="marc:subfield[@code='a' or @code='b' or @code='d' or @code='e' or @code='f' or @code='g' or @code='h']">
-                               <xsl:variable name="langCodes" select="."/>
-                               <xsl:choose>
-                                       <xsl:when test="../marc:subfield[@code='2']='rfc3066'">
-                                               <!-- not stacked but could be repeated -->
-                                               <xsl:call-template name="rfcLanguages">
-                                                       <xsl:with-param name="nodeNum">
-                                                               <xsl:value-of select="1"/>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="usedLanguages">
-                                                               <xsl:text/>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="controlField008-35-37">
-                                                               <xsl:value-of select="$controlField008-35-37"/>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <!-- iso -->
-                                               <xsl:variable name="allLanguages">
-                                                       <xsl:copy-of select="$langCodes"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="currentLanguage">
-                                                       <xsl:value-of select="substring($allLanguages,1,3)"/>
-                                               </xsl:variable>
-                                               <xsl:call-template name="isoLanguage">
-                                                       <xsl:with-param name="currentLanguage">
-                                                               <xsl:value-of select="substring($allLanguages,1,3)"/>
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="remainingLanguages">
-                                                               <xsl:value-of
-                                                                       select="substring($allLanguages,4,string-length($allLanguages)-3)"
-                                                               />
-                                                       </xsl:with-param>
-                                                       <xsl:with-param name="usedLanguages">
-                                                               <xsl:if test="$controlField008-35-37">
-                                                                       <xsl:value-of select="$controlField008-35-37"/>
-                                                               </xsl:if>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </xsl:for-each>
-               </xsl:for-each>
-               <xsl:variable name="physicalDescription">
-                       <!--3.2 change tmee 007/11 -->
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']">
-                               <digitalOrigin>reformatted digital</digitalOrigin>
-                       </xsl:if>
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='b']">
-                               <digitalOrigin>digitized microfilm</digitalOrigin>
-                       </xsl:if>
-                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='d']">
-                               <digitalOrigin>digitized other analog</digitalOrigin>
-                       </xsl:if>
-                       <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
-                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
-                       <xsl:variable name="check008-23">
-                               <xsl:if
-                                       test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='SE' or $typeOf008='MM'">
-                                       <xsl:value-of select="true()"/>
-                               </xsl:if>
-                       </xsl:variable>
-                       <xsl:variable name="check008-29">
-                               <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
-                                       <xsl:value-of select="true()"/>
-                               </xsl:if>
-                       </xsl:variable>
-                       <xsl:choose>
-                               <xsl:when
-                                       test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
-                                       <form authority="marcform">braille</form>
-                               </xsl:when>
-                               <xsl:when
-                                       test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='SE') and ($controlField008-23=' ' or $controlField008='r'))">
-                                       <form authority="marcform">print</form>
-                               </xsl:when>
-                               <xsl:when
-                                       test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
-                                       <form authority="marcform">electronic</form>
-                               </xsl:when>
-                               <xsl:when
-                                       test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
-                                       <form authority="marcform">microfiche</form>
-                               </xsl:when>
-                               <xsl:when
-                                       test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
-                                       <form authority="marcform">microfilm</form>
-                               </xsl:when>
-                       </xsl:choose>
-                       <!-- 1/04 fix -->
-                       <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
-                               <form authority="gmd">
-                                       <xsl:call-template name="chopBrackets">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"
-                                                       />
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </form>
-                       </xsl:if>
-                       <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
-                               <form>
-                                       <xsl:value-of select="."/>
-                               </form>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
-                               <xsl:choose>
-                                       <xsl:when test="substring(text(),14,1)='a'">
-                                               <reformattingQuality>access</reformattingQuality>
-                                       </xsl:when>
-                                       <xsl:when test="substring(text(),14,1)='p'">
-                                               <reformattingQuality>preservation</reformattingQuality>
-                                       </xsl:when>
-                                       <xsl:when test="substring(text(),14,1)='r'">
-                                               <reformattingQuality>replacement</reformattingQuality>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </xsl:for-each>
-                       <!--3.2 change tmee 007/01 -->
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='b']">
-                               <form authority="smd">chip cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
-                               <form authority="smd">computer optical disc cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
-                               <form authority="smd">magnetic disc</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='m']">
-                               <form authority="smd">magneto-optical disc</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
-                               <form authority="smd">optical disc</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
-                               <form authority="smd">tape cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='f']">
-                               <form authority="smd">tape cassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='h']">
-                               <form authority="smd">tape reel</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
-                               <form authority="smd">celestial globe</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
-                               <form authority="smd">earth moon globe</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
-                               <form authority="smd">planetary or lunar globe</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
-                               <form authority="smd">terrestrial globe</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
-                               <form authority="smd">kit</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
-                               <form authority="smd">atlas</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='g']">
-                               <form authority="smd">diagram</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
-                               <form authority="smd">map</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
-                               <form authority="smd">model</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='k']">
-                               <form authority="smd">profile</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote-sensing image</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='s']">
-                               <form authority="smd">section</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='y']">
-                               <form authority="smd">view</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='a']">
-                               <form authority="smd">aperture card</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='e']">
-                               <form authority="smd">microfiche</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='f']">
-                               <form authority="smd">microfiche cassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='b']">
-                               <form authority="smd">microfilm cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='c']">
-                               <form authority="smd">microfilm cassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='d']">
-                               <form authority="smd">microfilm reel</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='h'][substring(text(),2,1)='g']">
-                               <form authority="smd">microopaque</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='c']">
-                               <form authority="smd">film cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='f']">
-                               <form authority="smd">film cassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='m'][substring(text(),2,1)='r']">
-                               <form authority="smd">film reel</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
-                               <form authority="smd">chart</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
-                               <form authority="smd">collage</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
-                               <form authority="smd">drawing</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
-                               <form authority="smd">flash card</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
-                               <form authority="smd">painting</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
-                               <form authority="smd">photomechanical print</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='g']">
-                               <form authority="smd">photonegative</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='h']">
-                               <form authority="smd">photoprint</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
-                               <form authority="smd">picture</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
-                               <form authority="smd">print</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='l']">
-                               <form authority="smd">technical drawing</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
-                               <form authority="smd">notated music</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
-                               <form authority="smd">filmslip</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='c']">
-                               <form authority="smd">filmstrip cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='o']">
-                               <form authority="smd">filmstrip roll</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='f']">
-                               <form authority="smd">other filmstrip type</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
-                               <form authority="smd">slide</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
-                               <form authority="smd">transparency</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='r'][substring(text(),2,1)='r']">
-                               <form authority="smd">remote-sensing image</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='e']">
-                               <form authority="smd">cylinder</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='q']">
-                               <form authority="smd">roll</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='g']">
-                               <form authority="smd">sound cartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='s']">
-                               <form authority="smd">sound cassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
-                               <form authority="smd">sound disc</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
-                               <form authority="smd">sound-tape reel</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='i']">
-                               <form authority="smd">sound-track film</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='w']">
-                               <form authority="smd">wire recording</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='c']">
-                               <form authority="smd">braille</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='b']">
-                               <form authority="smd">combination</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='a']">
-                               <form authority="smd">moon</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='f'][substring(text(),2,1)='d']">
-                               <form authority="smd">tactile, with no writing system</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='c']">
-                               <form authority="smd">braille</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
-                               <form authority="smd">large print</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
-                               <form authority="smd">regular print</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='d']">
-                               <form authority="smd">text in looseleaf binder</form>
-                       </xsl:if>
-
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='c']">
-                               <form authority="smd">videocartridge</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='f']">
-                               <form authority="smd">videocassette</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
-                               <form authority="smd">videodisc</form>
-                       </xsl:if>
-                       <xsl:if
-                               test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
-                               <form authority="smd">videoreel</form>
-                       </xsl:if>
-
-                       <xsl:for-each
-                               select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)&gt;1]">
-                               <internetMediaType>
-                                       <xsl:value-of select="."/>
-                               </internetMediaType>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=300]">
-                               <extent>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abce</xsl:with-param>
-                                       </xsl:call-template>
-                               </extent>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($physicalDescription))">
-                       <physicalDescription>
-                               <xsl:copy-of select="$physicalDescription"/>
-                       </physicalDescription>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=520]">
-                       <abstract>
-                               <xsl:call-template name="uri"/>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </abstract>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=505]">
-                       <tableOfContents>
-                               <xsl:call-template name="uri"/>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">agrt</xsl:with-param>
-                               </xsl:call-template>
-                       </tableOfContents>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=521]">
-                       <targetAudience>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </targetAudience>
-               </xsl:for-each>
-               <xsl:if test="$typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM'">
-                       <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
-                       <xsl:choose>
-                               <!-- 01/04 fix -->
-                               <xsl:when test="$controlField008-22='d'">
-                                       <targetAudience authority="marctarget">adolescent</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='e'">
-                                       <targetAudience authority="marctarget">adult</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='g'">
-                                       <targetAudience authority="marctarget">general</targetAudience>
-                               </xsl:when>
-                               <xsl:when
-                                       test="$controlField008-22='b' or $controlField008-22='c' or $controlField008-22='j'">
-                                       <targetAudience authority="marctarget">juvenile</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='a'">
-                                       <targetAudience authority="marctarget">preschool</targetAudience>
-                               </xsl:when>
-                               <xsl:when test="$controlField008-22='f'">
-                                       <targetAudience authority="marctarget">specialized</targetAudience>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:if>
-               <xsl:for-each select="marc:datafield[@tag=245]/marc:subfield[@code='c']">
-                       <note type="statement of responsibility">
-                               <xsl:value-of select="."/>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=500]">
-                       <note>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                               <xsl:call-template name="uri"/>
-                       </note>
-               </xsl:for-each>
-
-               <!--3.2 change tmee additional note fields-->
-
-               <xsl:for-each select="marc:datafield[@tag=506]">
-                       <note type="restrictions">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=510]">
-                       <note type="citation/reference">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-
-               <xsl:for-each select="marc:datafield[@tag=511]">
-                       <note type="performers">
-                               <xsl:call-template name="uri"/>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=518]">
-                       <note type="venue">
-                               <xsl:call-template name="uri"/>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=530]">
-                       <note type="additional physical form">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=533]">
-                       <note type="reproduction">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=534]">
-                       <note type="original version">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=538]">
-                       <note type="system details">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=583]">
-                       <note type="action">
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-
-               <xsl:for-each
-                       select="marc:datafield[@tag=501 or @tag=502 or @tag=504 or @tag=507 or @tag=508 or  @tag=513 or @tag=514 or @tag=515 or @tag=516 or @tag=522 or @tag=524 or @tag=525 or @tag=526 or @tag=535 or @tag=536 or @tag=540 or @tag=541 or @tag=544 or @tag=545 or @tag=546 or @tag=547 or @tag=550 or @tag=552 or @tag=555 or @tag=556 or @tag=561 or @tag=562 or @tag=565 or @tag=567 or @tag=580 or @tag=581 or @tag=584 or @tag=585 or @tag=586]">
-                       <note>
-                               <xsl:call-template name="uri"/>
-                               <xsl:variable name="str">
-                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
-                                               <xsl:value-of select="."/>
-                                               <xsl:text> </xsl:text>
-                                       </xsl:for-each>
-                               </xsl:variable>
-                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-                       </note>
-               </xsl:for-each>
-               <xsl:for-each
-                       select="marc:datafield[@tag=034][marc:subfield[@code='d' or @code='e' or @code='f' or @code='g']]">
-                       <subject>
-                               <cartographics>
-                                       <coordinates>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">defg</xsl:with-param>
-                                               </xsl:call-template>
-                                       </coordinates>
-                               </cartographics>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=043]">
-                       <subject>
-                               <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='c']">
-                                       <geographicCode>
-                                               <xsl:attribute name="authority">
-                                                       <xsl:if test="@code='a'">
-                                                               <xsl:text>marcgac</xsl:text>
-                                                       </xsl:if>
-                                                       <xsl:if test="@code='b'">
-                                                               <xsl:value-of select="following-sibling::marc:subfield[@code=2]"/>
-                                                       </xsl:if>
-                                                       <xsl:if test="@code='c'">
-                                                               <xsl:text>iso3166</xsl:text>
-                                                       </xsl:if>
-                                               </xsl:attribute>
-                                               <xsl:value-of select="self::marc:subfield"/>
-                                       </geographicCode>
-                               </xsl:for-each>
-                       </subject>
-               </xsl:for-each>
-               <!-- tmee 2006/11/27 -->
-               <xsl:for-each select="marc:datafield[@tag=255]">
-                       <subject>
-                               <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='c']">
-                                       <cartographics>
-                                               <xsl:if test="@code='a'">
-                                                       <scale>
-                                                               <xsl:value-of select="."/>
-                                                       </scale>
-                                               </xsl:if>
-                                               <xsl:if test="@code='b'">
-                                                       <projection>
-                                                               <xsl:value-of select="."/>
-                                                       </projection>
-                                               </xsl:if>
-                                               <xsl:if test="@code='c'">
-                                                       <coordinates>
-                                                               <xsl:value-of select="."/>
-                                                       </coordinates>
-                                               </xsl:if>
-                                       </cartographics>
-                               </xsl:for-each>
-                       </subject>
-               </xsl:for-each>
-
-               <xsl:apply-templates select="marc:datafield[653 &gt;= @tag and @tag &gt;= 600]"/>
-               <xsl:apply-templates select="marc:datafield[@tag=656]"/>
-               <xsl:for-each select="marc:datafield[@tag=752 or @tag=662]">
-                       <subject>
-                               <hierarchicalGeographic>
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <country>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </country>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <state>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </state>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='c']">
-                                               <county>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </county>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='d']">
-                                               <city>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </city>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='e']">
-                                               <citySection>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </citySection>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='g']">
-                                               <region>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </region>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='h']">
-                                               <extraterrestrialArea>
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString" select="."/>
-                                                       </xsl:call-template>
-                                               </extraterrestrialArea>
-                                       </xsl:for-each>
-                               </hierarchicalGeographic>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=045][marc:subfield[@code='b']]">
-                       <subject>
-                               <xsl:choose>
-                                       <xsl:when test="@ind1=2">
-                                               <temporal encoding="iso8601" point="start">
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString">
-                                                                       <xsl:value-of select="marc:subfield[@code='b'][1]"/>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </temporal>
-                                               <temporal encoding="iso8601" point="end">
-                                                       <xsl:call-template name="chopPunctuation">
-                                                               <xsl:with-param name="chopString">
-                                                                       <xsl:value-of select="marc:subfield[@code='b'][2]"/>
-                                                               </xsl:with-param>
-                                                       </xsl:call-template>
-                                               </temporal>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:for-each select="marc:subfield[@code='b']">
-                                                       <temporal encoding="iso8601">
-                                                               <xsl:call-template name="chopPunctuation">
-                                                                       <xsl:with-param name="chopString" select="."/>
-                                                               </xsl:call-template>
-                                                       </temporal>
-                                               </xsl:for-each>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </subject>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=050]">
-                       <xsl:for-each select="marc:subfield[@code='b']">
-                               <classification authority="lcc">
-                                       <xsl:if test="../marc:subfield[@code='3']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:value-of select="../marc:subfield[@code='3']"/>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="preceding-sibling::marc:subfield[@code='a'][1]"/>
-                                       <xsl:text> </xsl:text>
-                                       <xsl:value-of select="text()"/>
-                               </classification>
-                       </xsl:for-each>
-                       <xsl:for-each
-                               select="marc:subfield[@code='a'][not(following-sibling::marc:subfield[@code='b'])]">
-                               <classification authority="lcc">
-                                       <xsl:if test="../marc:subfield[@code='3']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:value-of select="../marc:subfield[@code='3']"/>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="text()"/>
-                               </classification>
-                       </xsl:for-each>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=082]">
-                       <classification authority="ddc">
-                               <xsl:if test="marc:subfield[@code='2']">
-                                       <xsl:attribute name="edition">
-                                               <xsl:value-of select="marc:subfield[@code='2']"/>
-                                       </xsl:attribute>
-                               </xsl:if>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=080]">
-                       <classification authority="udc">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abx</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=060]">
-                       <classification authority="nlm">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086][@ind1=0]">
-                       <classification authority="sudocs">
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086][@ind1=1]">
-                       <classification authority="candoc">
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=086]">
-                       <classification>
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                               </xsl:attribute>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=084]">
-                       <classification>
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                               </xsl:attribute>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </classification>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=440]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">av</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">av</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=510]">
-                       <relatedItem type="isReferencedBy">
-                               <note>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abcx3</xsl:with-param>
-                                       </xsl:call-template>
-                               </note>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=534]">
-                       <relatedItem type="original">
-                               <xsl:call-template name="relatedTitle"/>
-                               <xsl:call-template name="relatedName"/>
-                               <xsl:if test="marc:subfield[@code='b' or @code='c']">
-                                       <originInfo>
-                                               <xsl:for-each select="marc:subfield[@code='c']">
-                                                       <publisher>
-                                                               <xsl:value-of select="."/>
-                                                       </publisher>
-                                               </xsl:for-each>
-                                               <xsl:for-each select="marc:subfield[@code='b']">
-                                                       <edition>
-                                                               <xsl:value-of select="."/>
-                                                       </edition>
-                                               </xsl:for-each>
-                                       </originInfo>
-                               </xsl:if>
-                               <xsl:call-template name="relatedIdentifierISSN"/>
-                               <xsl:for-each select="marc:subfield[@code='z']">
-                                       <identifier type="isbn">
-                                               <xsl:value-of select="."/>
-                                       </identifier>
-                               </xsl:for-each>
-                               <xsl:call-template name="relatedNote"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"/>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <name type="personal">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="termsOfAddress"/>
-                                       <xsl:call-template name="nameDate"/>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                               <xsl:call-template name="relatedIdentifierISSN"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=710][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"/>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </titleInfo>
-                               <name type="corporate">
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <namePart>
-                                                       <xsl:value-of select="."/>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <namePart>
-                                                       <xsl:value-of select="."/>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:variable name="tempNamePart">
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:variable>
-                                       <xsl:if test="normalize-space($tempNamePart)">
-                                               <namePart>
-                                                       <xsl:value-of select="$tempNamePart"/>
-                                               </namePart>
-                                       </xsl:if>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                               <xsl:call-template name="relatedIdentifierISSN"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=711][marc:subfield[@code='t']]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"/>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </titleInfo>
-                               <name type="conference">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                               <xsl:call-template name="relatedIdentifierISSN"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=730][@ind2=2]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"/>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"/>
-                               <xsl:call-template name="relatedIdentifierISSN"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=740][@ind2=2]">
-                       <relatedItem>
-                               <xsl:call-template name="constituentOrRelatedType"/>
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=760]|marc:datafield[@tag=762]">
-                       <relatedItem type="series">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each
-                       select="marc:datafield[@tag=765]|marc:datafield[@tag=767]|marc:datafield[@tag=777]|marc:datafield[@tag=787]">
-                       <relatedItem>
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=775]">
-                       <relatedItem type="otherVersion">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=770]|marc:datafield[@tag=774]">
-                       <relatedItem type="constituent">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=772]|marc:datafield[@tag=773]">
-                       <relatedItem type="host">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=776]">
-                       <relatedItem type="otherFormat">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=780]">
-                       <relatedItem type="preceding">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=785]">
-                       <relatedItem type="succeeding">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=786]">
-                       <relatedItem type="original">
-                               <xsl:call-template name="relatedItem76X-78X"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=800]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <name type="personal">
-                                       <namePart>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="termsOfAddress"/>
-                                       <xsl:call-template name="nameDate"/>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=810]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </titleInfo>
-                               <name type="corporate">
-                                       <xsl:for-each select="marc:subfield[@code='a']">
-                                               <namePart>
-                                                       <xsl:value-of select="."/>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <xsl:for-each select="marc:subfield[@code='b']">
-                                               <namePart>
-                                                       <xsl:value-of select="."/>
-                                               </namePart>
-                                       </xsl:for-each>
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=811]">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="specialSubfieldSelect">
-                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
-                                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </titleInfo>
-                               <name type="conference">
-                                       <namePart>
-                                               <xsl:call-template name="specialSubfieldSelect">
-                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
-                                                       <xsl:with-param name="axis">t</xsl:with-param>
-                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                                       <xsl:call-template name="role"/>
-                               </name>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='830']">
-                       <relatedItem type="series">
-                               <titleInfo>
-                                       <title>
-                                               <xsl:call-template name="chopPunctuation">
-                                                       <xsl:with-param name="chopString">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:with-param>
-                                               </xsl:call-template>
-                                       </title>
-                                       <xsl:call-template name="part"/>
-                               </titleInfo>
-                               <xsl:call-template name="relatedForm"/>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='856'][@ind2='2']/marc:subfield[@code='q']">
-                       <relatedItem>
-                               <internetMediaType>
-                                       <xsl:value-of select="."/>
-                               </internetMediaType>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='020']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">isbn</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="isbn">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='0']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">isrc</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="isrc">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='2']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">ismn</xsl:with-param>
-                       </xsl:call-template>
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <identifier type="ismn">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='024'][@ind1='4']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">sici</xsl:with-param>
-                       </xsl:call-template>
-                       <identifier type="sici">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='022']">
-                       <xsl:if test="marc:subfield[@code='a']">
-                               <xsl:call-template name="isInvalid">
-                                       <xsl:with-param name="type">issn</xsl:with-param>
-                               </xsl:call-template>
-                               <identifier type="issn">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </identifier>
-                       </xsl:if>
-                       <xsl:if test="marc:subfield[@code='l']">
-                               <xsl:call-template name="isInvalid">
-                                       <xsl:with-param name="type">issn-l</xsl:with-param>
-                               </xsl:call-template>
-                               <identifier type="issn-l">
-                                       <xsl:value-of select="marc:subfield[@code='l']"/>
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-
-
-
-               <xsl:for-each select="marc:datafield[@tag='010']">
-                       <xsl:call-template name="isInvalid">
-                               <xsl:with-param name="type">lccn</xsl:with-param>
-                       </xsl:call-template>
-                       <identifier type="lccn">
-                               <xsl:value-of select="normalize-space(marc:subfield[@code='a'])"/>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='028']">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:choose>
-                                               <xsl:when test="@ind1='0'">issue number</xsl:when>
-                                               <xsl:when test="@ind1='1'">matrix number</xsl:when>
-                                               <xsl:when test="@ind1='2'">music plate</xsl:when>
-                                               <xsl:when test="@ind1='3'">music publisher</xsl:when>
-                                               <xsl:when test="@ind1='4'">videorecording identifier</xsl:when>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               <!--<xsl:call-template name="isInvalid"/>-->
-                               <!-- no $z in 028 -->
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">
-                                               <xsl:choose>
-                                                       <xsl:when test="@ind1='0'">ba</xsl:when>
-                                                       <xsl:otherwise>ab</xsl:otherwise>
-                                               </xsl:choose>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='037']">
-                       <identifier type="stock number">
-                               <!--<xsl:call-template name="isInvalid"/>-->
-                               <!-- no $z in 037 -->
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">ab</xsl:with-param>
-                               </xsl:call-template>
-                       </identifier>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag='856'][marc:subfield[@code='u']]">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:choose>
-                                               <xsl:when
-                                                       test="starts-with(marc:subfield[@code='u'],'urn:doi') or starts-with(marc:subfield[@code='u'],'doi')"
-                                                       >doi</xsl:when>
-                                               <xsl:when
-                                                       test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov')"
-                                                       >hdl</xsl:when>
-                                               <xsl:otherwise>uri</xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-                               <xsl:choose>
-                                       <xsl:when
-                                               test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov') ">
-                                               <xsl:value-of
-                                                       select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"
-                                               />
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of select="marc:subfield[@code='u']"/>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </identifier>
-                       <xsl:if
-                               test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl')">
-                               <identifier type="hdl">
-                                       <xsl:if test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                               <xsl:attribute name="displayLabel">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">y3z</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of
-                                               select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"
-                                       />
-                               </identifier>
-                       </xsl:if>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=024][@ind1=1]">
-                       <identifier type="upc">
-                               <xsl:call-template name="isInvalid"/>
-                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                       </identifier>
-               </xsl:for-each>
-
-               <!-- 1/04 fix added $y -->
-
-               <!-- 1.21  tmee-->
-               <xsl:for-each select="marc:datafield[@tag=856][@ind2=1][marc:subfield[@code='u']]">
-                       <relatedItem type="otherVersion">
-                               <location>
-                                       <url>
-                                               <xsl:if test="marc:subfield[@code='y' or @code='3']">
-                                                       <xsl:attribute name="displayLabel">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">y3</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:if test="marc:subfield[@code='z' ]">
-                                                       <xsl:attribute name="note">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">z</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of select="marc:subfield[@code='u']"/>
-                                       </url>
-                               </location>
-                       </relatedItem>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=856][@ind2=2][marc:subfield[@code='u']]">
-                       <relatedItem>
-                               <location>
-                                       <url>
-                                               <xsl:if test="marc:subfield[@code='y' or @code='3']">
-                                                       <xsl:attribute name="displayLabel">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">y3</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:if test="marc:subfield[@code='z' ]">
-                                                       <xsl:attribute name="note">
-                                                               <xsl:call-template name="subfieldSelect">
-                                                                       <xsl:with-param name="codes">z</xsl:with-param>
-                                                               </xsl:call-template>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <xsl:value-of select="marc:subfield[@code='u']"/>
-                                       </url>
-                               </location>
-                       </relatedItem>
-               </xsl:for-each>
-
-               <!-- 3.2 change tmee 856z  -->
-
-               <!-- 1.24  tmee  -->
-               <xsl:for-each select="marc:datafield[@tag=852]">
-                       <location>
-                               <xsl:if test="marc:subfield[@code='a' or @code='b' or @code='e']">
-                                       <physicalLocation>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">abe</xsl:with-param>
-                                               </xsl:call-template>
-                                       </physicalLocation>
-                               </xsl:if>
-
-                               <xsl:if test="marc:subfield[@code='u']">
-                                       <physicalLocation>
-                                               <xsl:call-template name="uri"/>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">u</xsl:with-param>
-                                               </xsl:call-template>
-                                       </physicalLocation>
-                               </xsl:if>
-
-                               <xsl:if
-                                       test="marc:subfield[@code='h' or @code='i' or @code='j' or @code='k' or @code='l' or @code='m' or @code='t']">
-                                       <shelfLocation>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">hijklmt</xsl:with-param>
-                                               </xsl:call-template>
-                                       </shelfLocation>
-                               </xsl:if>
-                       </location>
-               </xsl:for-each>
-
-               <xsl:for-each select="marc:datafield[@tag=506]">
-                       <accessCondition type="restrictionOnAccess">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abcd35</xsl:with-param>
-                               </xsl:call-template>
-                       </accessCondition>
-               </xsl:for-each>
-               <xsl:for-each select="marc:datafield[@tag=540]">
-                       <accessCondition type="useAndReproduction">
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">abcde35</xsl:with-param>
-                               </xsl:call-template>
-                       </accessCondition>
-               </xsl:for-each>
-
-               <recordInfo>
-                       <!-- 1.25  tmee-->
-
-
-                       <xsl:for-each select="marc:leader[substring($leader,19,1)='a']">
-                               <descriptionStandard>aacr2</descriptionStandard>
-                       </xsl:for-each>
-
-                       <xsl:for-each select="marc:datafield[@tag=040]">
-                               <xsl:if test="marc:subfield[@code='e']">
-                                       <descriptionStandard>
-                                               <xsl:value-of select="marc:subfield[@code='e']"/>
-                                       </descriptionStandard>
-                               </xsl:if>
-                               <recordContentSource authority="marcorg">
-                                       <xsl:value-of select="marc:subfield[@code='a']"/>
-                               </recordContentSource>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=008]">
-                               <recordCreationDate encoding="marc">
-                                       <xsl:value-of select="substring(.,1,6)"/>
-                               </recordCreationDate>
-                       </xsl:for-each>
-
-                       <xsl:for-each select="marc:controlfield[@tag=005]">
-                               <recordChangeDate encoding="iso8601">
-                                       <xsl:value-of select="."/>
-                               </recordChangeDate>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:controlfield[@tag=001]">
-                               <recordIdentifier>
-                                       <xsl:if test="../marc:controlfield[@tag=003]">
-                                               <xsl:attribute name="source">
-                                                       <xsl:value-of select="../marc:controlfield[@tag=003]"/>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <xsl:value-of select="."/>
-                               </recordIdentifier>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:datafield[@tag=040]/marc:subfield[@code='b']">
-                               <languageOfCataloging>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="."/>
-                                       </languageTerm>
-                               </languageOfCataloging>
-                       </xsl:for-each>
-               </recordInfo>
-       </xsl:template>
-       <xsl:template name="displayForm">
-               <xsl:for-each select="marc:subfield[@code='c']">
-                       <displayForm>
-                               <xsl:value-of select="."/>
-                       </displayForm>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="affiliation">
-               <xsl:for-each select="marc:subfield[@code='u']">
-                       <affiliation>
-                               <xsl:value-of select="."/>
-                       </affiliation>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="uri">
-               <xsl:for-each select="marc:subfield[@code='u']|marc:subfield[@code='0']">
-                       <xsl:attribute name="xlink:href">
-                               <xsl:value-of select="."/>
-                       </xsl:attribute>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="role">
-               <xsl:for-each select="marc:subfield[@code='e']">
-                       <role>
-                               <roleTerm type="text">
-                                       <xsl:value-of select="."/>
-                               </roleTerm>
-                       </role>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='4']">
-                       <role>
-                               <roleTerm authority="marcrelator" type="code">
-                                       <xsl:value-of select="."/>
-                               </roleTerm>
-                       </role>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="part">
-               <xsl:variable name="partNumber">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">n</xsl:with-param>
-                               <xsl:with-param name="anyCodes">n</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:variable name="partName">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">p</xsl:with-param>
-                               <xsl:with-param name="anyCodes">p</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($partNumber))">
-                       <partNumber>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="$partNumber"/>
-                               </xsl:call-template>
-                       </partNumber>
-               </xsl:if>
-               <xsl:if test="string-length(normalize-space($partName))">
-                       <partName>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="$partName"/>
-                               </xsl:call-template>
-                       </partName>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedPart">
-               <xsl:if test="@tag=773">
-                       <xsl:for-each select="marc:subfield[@code='g']">
-                               <part>
-                                       <text>
-                                               <xsl:value-of select="."/>
-                                       </text>
-                               </part>
-                       </xsl:for-each>
-                       <xsl:for-each select="marc:subfield[@code='q']">
-                               <part>
-                                       <xsl:call-template name="parsePart"/>
-                               </part>
-                       </xsl:for-each>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedPartNumName">
-               <xsl:variable name="partNumber">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">g</xsl:with-param>
-                               <xsl:with-param name="anyCodes">g</xsl:with-param>
-                               <xsl:with-param name="afterCodes">pst</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:variable name="partName">
-                       <xsl:call-template name="specialSubfieldSelect">
-                               <xsl:with-param name="axis">p</xsl:with-param>
-                               <xsl:with-param name="anyCodes">p</xsl:with-param>
-                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="string-length(normalize-space($partNumber))">
-                       <partNumber>
-                               <xsl:value-of select="$partNumber"/>
-                       </partNumber>
-               </xsl:if>
-               <xsl:if test="string-length(normalize-space($partName))">
-                       <partName>
-                               <xsl:value-of select="$partName"/>
-                       </partName>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedName">
-               <xsl:for-each select="marc:subfield[@code='a']">
-                       <name>
-                               <namePart>
-                                       <xsl:value-of select="."/>
-                               </namePart>
-                       </name>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedForm">
-               <xsl:for-each select="marc:subfield[@code='h']">
-                       <physicalDescription>
-                               <form>
-                                       <xsl:value-of select="."/>
-                               </form>
-                       </physicalDescription>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedExtent">
-               <xsl:for-each select="marc:subfield[@code='h']">
-                       <physicalDescription>
-                               <extent>
-                                       <xsl:value-of select="."/>
-                               </extent>
-                       </physicalDescription>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedNote">
-               <xsl:for-each select="marc:subfield[@code='n']">
-                       <note>
-                               <xsl:value-of select="."/>
-                       </note>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedSubject">
-               <xsl:for-each select="marc:subfield[@code='j']">
-                       <subject>
-                               <temporal encoding="iso8601">
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString" select="."/>
-                                       </xsl:call-template>
-                               </temporal>
-                       </subject>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifierISSN">
-               <xsl:for-each select="marc:subfield[@code='x']">
-                       <identifier type="issn">
-                               <xsl:value-of select="."/>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifierLocal">
-               <xsl:for-each select="marc:subfield[@code='w']">
-                       <identifier type="local">
-                               <xsl:value-of select="."/>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedIdentifier">
-               <xsl:for-each select="marc:subfield[@code='o']">
-                       <identifier>
-                               <xsl:value-of select="."/>
-                       </identifier>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedItem76X-78X">
-               <xsl:call-template name="displayLabel"/>
-               <xsl:call-template name="relatedTitle76X-78X"/>
-               <xsl:call-template name="relatedName"/>
-               <xsl:call-template name="relatedOriginInfo"/>
-               <xsl:call-template name="relatedLanguage"/>
-               <xsl:call-template name="relatedExtent"/>
-               <xsl:call-template name="relatedNote"/>
-               <xsl:call-template name="relatedSubject"/>
-               <xsl:call-template name="relatedIdentifier"/>
-               <xsl:call-template name="relatedIdentifierISSN"/>
-               <xsl:call-template name="relatedIdentifierLocal"/>
-               <xsl:call-template name="relatedPart"/>
-       </xsl:template>
-       <xsl:template name="subjectGeographicZ">
-               <geographic>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."/>
-                       </xsl:call-template>
-               </geographic>
-       </xsl:template>
-       <xsl:template name="subjectTemporalY">
-               <temporal>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."/>
-                       </xsl:call-template>
-               </temporal>
-       </xsl:template>
-       <xsl:template name="subjectTopic">
-               <topic>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."/>
-                       </xsl:call-template>
-               </topic>
-       </xsl:template>
-       <!-- 3.2 change tmee 6xx $v genre -->
-       <xsl:template name="subjectGenre">
-               <genre>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="."/>
-                       </xsl:call-template>
-               </genre>
-       </xsl:template>
-
-       <xsl:template name="nameABCDN">
-               <xsl:for-each select="marc:subfield[@code='a']">
-                       <namePart>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="."/>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='b']">
-                       <namePart>
-                               <xsl:value-of select="."/>
-                       </namePart>
-               </xsl:for-each>
-               <xsl:if
-                       test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
-                       <namePart>
-                               <xsl:call-template name="subfieldSelect">
-                                       <xsl:with-param name="codes">cdn</xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="nameABCDQ">
-               <namePart>
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString">
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">aq</xsl:with-param>
-                                       </xsl:call-template>
-                               </xsl:with-param>
-                               <xsl:with-param name="punctuation">
-                                       <xsl:text>:,;/ </xsl:text>
-                               </xsl:with-param>
-                       </xsl:call-template>
-               </namePart>
-               <xsl:call-template name="termsOfAddress"/>
-               <xsl:call-template name="nameDate"/>
-       </xsl:template>
-       <xsl:template name="nameACDEQ">
-               <namePart>
-                       <xsl:call-template name="subfieldSelect">
-                               <xsl:with-param name="codes">acdeq</xsl:with-param>
-                       </xsl:call-template>
-               </namePart>
-       </xsl:template>
-       <xsl:template name="constituentOrRelatedType">
-               <xsl:if test="@ind2=2">
-                       <xsl:attribute name="type">constituent</xsl:attribute>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedTitle">
-               <xsl:for-each select="marc:subfield[@code='t']">
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                       </titleInfo>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedTitle76X-78X">
-               <xsl:for-each select="marc:subfield[@code='t']">
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='p']">
-                       <titleInfo type="abbreviated">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-               <xsl:for-each select="marc:subfield[@code='s']">
-                       <titleInfo type="uniform">
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:value-of select="."/>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
-                                       <xsl:call-template name="relatedPartNumName"/>
-                               </xsl:if>
-                       </titleInfo>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="relatedOriginInfo">
-               <xsl:if test="marc:subfield[@code='b' or @code='d'] or marc:subfield[@code='f']">
-                       <originInfo>
-                               <xsl:if test="@tag=775">
-                                       <xsl:for-each select="marc:subfield[@code='f']">
-                                               <place>
-                                                       <placeTerm>
-                                                               <xsl:attribute name="type">code</xsl:attribute>
-                                                               <xsl:attribute name="authority">marcgac</xsl:attribute>
-                                                               <xsl:value-of select="."/>
-                                                       </placeTerm>
-                                               </place>
-                                       </xsl:for-each>
-                               </xsl:if>
-                               <xsl:for-each select="marc:subfield[@code='d']">
-                                       <publisher>
-                                               <xsl:value-of select="."/>
-                                       </publisher>
-                               </xsl:for-each>
-                               <xsl:for-each select="marc:subfield[@code='b']">
-                                       <edition>
-                                               <xsl:value-of select="."/>
-                                       </edition>
-                               </xsl:for-each>
-                       </originInfo>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="relatedLanguage">
-               <xsl:for-each select="marc:subfield[@code='e']">
-                       <xsl:call-template name="getLanguage">
-                               <xsl:with-param name="langString">
-                                       <xsl:value-of select="."/>
-                               </xsl:with-param>
-                       </xsl:call-template>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="nameDate">
-               <xsl:for-each select="marc:subfield[@code='d']">
-                       <namePart type="date">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="."/>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="subjectAuthority">
-               <xsl:if test="@ind2!=4">
-                       <xsl:if test="@ind2!=' '">
-                               <xsl:if test="@ind2!=8">
-                                       <xsl:if test="@ind2!=9">
-                                               <xsl:attribute name="authority">
-                                                       <xsl:choose>
-                                                               <xsl:when test="@ind2=0">lcsh</xsl:when>
-                                                               <xsl:when test="@ind2=1">lcshac</xsl:when>
-                                                               <xsl:when test="@ind2=2">mesh</xsl:when>
-                                                               <!-- 1/04 fix -->
-                                                               <xsl:when test="@ind2=3">nal</xsl:when>
-                                                               <xsl:when test="@ind2=5">csh</xsl:when>
-                                                               <xsl:when test="@ind2=6">rvm</xsl:when>
-                                                               <xsl:when test="@ind2=7">
-                                                                       <xsl:value-of select="marc:subfield[@code='2']"/>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                               </xsl:if>
-                       </xsl:if>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="subjectAnyOrder">
-               <xsl:for-each select="marc:subfield[@code='v' or @code='x' or @code='y' or @code='z']">
-                       <xsl:choose>
-                               <xsl:when test="@code='v'">
-                                       <xsl:call-template name="subjectGenre"/>
-                               </xsl:when>
-                               <xsl:when test="@code='x'">
-                                       <xsl:call-template name="subjectTopic"/>
-                               </xsl:when>
-                               <xsl:when test="@code='y'">
-                                       <xsl:call-template name="subjectTemporalY"/>
-                               </xsl:when>
-                               <xsl:when test="@code='z'">
-                                       <xsl:call-template name="subjectGeographicZ"/>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:for-each>
-       </xsl:template>
-       <xsl:template name="specialSubfieldSelect">
-               <xsl:param name="anyCodes"/>
-               <xsl:param name="axis"/>
-               <xsl:param name="beforeCodes"/>
-               <xsl:param name="afterCodes"/>
-               <xsl:variable name="str">
-                       <xsl:for-each select="marc:subfield">
-                               <xsl:if
-                                       test="contains($anyCodes, @code)      or (contains($beforeCodes,@code) and following-sibling::marc:subfield[@code=$axis])      or (contains($afterCodes,@code) and preceding-sibling::marc:subfield[@code=$axis])">
-                                       <xsl:value-of select="text()"/>
-                                       <xsl:text> </xsl:text>
-                               </xsl:if>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
-       </xsl:template>
-
-       <!-- 3.2 change tmee 6xx $v genre -->
-       <xsl:template match="marc:datafield[@tag=600]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <name type="personal">
-                               <xsl:call-template name="termsOfAddress"/>
-                               <namePart>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">aq</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </namePart>
-                               <xsl:call-template name="nameDate"/>
-                               <xsl:call-template name="affiliation"/>
-                               <xsl:call-template name="role"/>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=610]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <name type="corporate">
-                               <xsl:for-each select="marc:subfield[@code='a']">
-                                       <namePart>
-                                               <xsl:value-of select="."/>
-                                       </namePart>
-                               </xsl:for-each>
-                               <xsl:for-each select="marc:subfield[@code='b']">
-                                       <namePart>
-                                               <xsl:value-of select="."/>
-                                       </namePart>
-                               </xsl:for-each>
-                               <xsl:if test="marc:subfield[@code='c' or @code='d' or @code='n' or @code='p']">
-                                       <namePart>
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">cdnp</xsl:with-param>
-                                               </xsl:call-template>
-                                       </namePart>
-                               </xsl:if>
-                               <xsl:call-template name="role"/>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=611]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <name type="conference">
-                               <namePart>
-                                       <xsl:call-template name="subfieldSelect">
-                                               <xsl:with-param name="codes">abcdeqnp</xsl:with-param>
-                                       </xsl:call-template>
-                               </namePart>
-                               <xsl:for-each select="marc:subfield[@code='4']">
-                                       <role>
-                                               <roleTerm authority="marcrelator" type="code">
-                                                       <xsl:value-of select="."/>
-                                               </roleTerm>
-                                       </role>
-                               </xsl:for-each>
-                       </name>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=630]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <titleInfo>
-                               <title>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString">
-                                                       <xsl:call-template name="subfieldSelect">
-                                                               <xsl:with-param name="codes">adfhklor</xsl:with-param>
-                                                       </xsl:call-template>
-                                               </xsl:with-param>
-                                       </xsl:call-template>
-                               </title>
-                               <xsl:call-template name="part"/>
-                       </titleInfo>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <!-- 1.27 648 tmee-->
-       <xsl:template match="marc:datafield[@tag=648]">
-               <subject>
-                       <xsl:if test="marc:subfield[@code=2]">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code=2]"/>
-                               </xsl:attribute>
-                       </xsl:if>
-                       <xsl:call-template name="uri"/>
-
-                       <xsl:call-template name="subjectAuthority"/>
-                       <temporal>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">abcd</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </temporal>
-                       <xsl:call-template name="subjectAnyOrder"/>
-
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=650]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <topic>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">abcd</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </topic>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=651]">
-               <subject>
-                       <xsl:call-template name="subjectAuthority"/>
-                       <xsl:for-each select="marc:subfield[@code='a']">
-                               <geographic>
-                                       <xsl:call-template name="chopPunctuation">
-                                               <xsl:with-param name="chopString" select="."/>
-                                       </xsl:call-template>
-                               </geographic>
-                       </xsl:for-each>
-                       <xsl:call-template name="subjectAnyOrder"/>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=653]">
-               <subject>
-                       <xsl:for-each select="marc:subfield[@code='a']">
-                               <topic>
-                                       <xsl:value-of select="."/>
-                               </topic>
-                       </xsl:for-each>
-               </subject>
-       </xsl:template>
-       <xsl:template match="marc:datafield[@tag=656]">
-               <subject>
-                       <xsl:if test="marc:subfield[@code=2]">
-                               <xsl:attribute name="authority">
-                                       <xsl:value-of select="marc:subfield[@code=2]"/>
-                               </xsl:attribute>
-                       </xsl:if>
-                       <occupation>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:value-of select="marc:subfield[@code='a']"/>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </occupation>
-               </subject>
-       </xsl:template>
-       <xsl:template name="termsOfAddress">
-               <xsl:if test="marc:subfield[@code='b' or @code='c']">
-                       <namePart type="termsOfAddress">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">bc</xsl:with-param>
-                                               </xsl:call-template>
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </namePart>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="displayLabel">
-               <xsl:if test="marc:subfield[@code='i']">
-                       <xsl:attribute name="displayLabel">
-                               <xsl:value-of select="marc:subfield[@code='i']"/>
-                       </xsl:attribute>
-               </xsl:if>
-               <xsl:if test="marc:subfield[@code='3']">
-                       <xsl:attribute name="displayLabel">
-                               <xsl:value-of select="marc:subfield[@code='3']"/>
-                       </xsl:attribute>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="isInvalid">
-               <xsl:param name="type"/>
-               <xsl:if
-                       test="marc:subfield[@code='z'] or marc:subfield[@code='y']  or marc:subfield[@code='m']">
-                       <identifier>
-                               <xsl:attribute name="type">
-                                       <xsl:value-of select="$type"/>
-                               </xsl:attribute>
-                               <xsl:attribute name="invalid">
-                                       <xsl:text>yes</xsl:text>
-                               </xsl:attribute>
-                               <xsl:if test="marc:subfield[@code='z']">
-                                       <xsl:value-of select="marc:subfield[@code='z']"/>
-                               </xsl:if>
-                               <xsl:if test="marc:subfield[@code='y']">
-                                       <xsl:value-of select="marc:subfield[@code='y']"/>
-                               </xsl:if>
-                               <xsl:if test="marc:subfield[@code='m']">
-                                       <xsl:value-of select="marc:subfield[@code='m']"/>
-                               </xsl:if>
-                       </identifier>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="subtitle">
-               <xsl:if test="marc:subfield[@code='b']">
-                       <subTitle>
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString">
-                                               <xsl:value-of select="marc:subfield[@code='b']"/>
-                                               <!--<xsl:call-template name="subfieldSelect">
-                                                       <xsl:with-param name="codes">b</xsl:with-param>                                                                 
-                                               </xsl:call-template>-->
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </subTitle>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="script">
-               <xsl:param name="scriptCode"/>
-               <xsl:attribute name="script">
-                       <xsl:choose>
-                               <xsl:when test="$scriptCode='(3'">Arabic</xsl:when>
-                               <xsl:when test="$scriptCode='(B'">Latin</xsl:when>
-                               <xsl:when test="$scriptCode='$1'">Chinese, Japanese, Korean</xsl:when>
-                               <xsl:when test="$scriptCode='(N'">Cyrillic</xsl:when>
-                               <xsl:when test="$scriptCode='(2'">Hebrew</xsl:when>
-                               <xsl:when test="$scriptCode='(S'">Greek</xsl:when>
-                       </xsl:choose>
-               </xsl:attribute>
-       </xsl:template>
-       <xsl:template name="parsePart">
-               <!-- assumes 773$q= 1:2:3<4
-                    with up to 3 levels and one optional start page
-               -->
-               <xsl:variable name="level1">
-                       <xsl:choose>
-                               <xsl:when test="contains(text(),':')">
-                                       <!-- 1:2 -->
-                                       <xsl:value-of select="substring-before(text(),':')"/>
-                               </xsl:when>
-                               <xsl:when test="not(contains(text(),':'))">
-                                       <!-- 1 or 1<3 -->
-                                       <xsl:if test="contains(text(),'&lt;')">
-                                               <!-- 1<3 -->
-                                               <xsl:value-of select="substring-before(text(),'&lt;')"/>
-                                       </xsl:if>
-                                       <xsl:if test="not(contains(text(),'&lt;'))">
-                                               <!-- 1 -->
-                                               <xsl:value-of select="text()"/>
-                                       </xsl:if>
-                               </xsl:when>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="sici2">
-                       <xsl:choose>
-                               <xsl:when test="starts-with(substring-after(text(),$level1),':')">
-                                       <xsl:value-of select="substring(substring-after(text(),$level1),2)"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="substring-after(text(),$level1)"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="level2">
-                       <xsl:choose>
-                               <xsl:when test="contains($sici2,':')">
-                                       <!--  2:3<4  -->
-                                       <xsl:value-of select="substring-before($sici2,':')"/>
-                               </xsl:when>
-                               <xsl:when test="contains($sici2,'&lt;')">
-                                       <!-- 1: 2<4 -->
-                                       <xsl:value-of select="substring-before($sici2,'&lt;')"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="$sici2"/>
-                                       <!-- 1:2 -->
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="sici3">
-                       <xsl:choose>
-                               <xsl:when test="starts-with(substring-after($sici2,$level2),':')">
-                                       <xsl:value-of select="substring(substring-after($sici2,$level2),2)"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="substring-after($sici2,$level2)"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="level3">
-                       <xsl:choose>
-                               <xsl:when test="contains($sici3,'&lt;')">
-                                       <!-- 2<4 -->
-                                       <xsl:value-of select="substring-before($sici3,'&lt;')"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="$sici3"/>
-                                       <!-- 3 -->
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:variable>
-               <xsl:variable name="page">
-                       <xsl:if test="contains(text(),'&lt;')">
-                               <xsl:value-of select="substring-after(text(),'&lt;')"/>
-                       </xsl:if>
-               </xsl:variable>
-               <xsl:if test="$level1">
-                       <detail level="1">
-                               <number>
-                                       <xsl:value-of select="$level1"/>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$level2">
-                       <detail level="2">
-                               <number>
-                                       <xsl:value-of select="$level2"/>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$level3">
-                       <detail level="3">
-                               <number>
-                                       <xsl:value-of select="$level3"/>
-                               </number>
-                       </detail>
-               </xsl:if>
-               <xsl:if test="$page">
-                       <extent unit="page">
-                               <start>
-                                       <xsl:value-of select="$page"/>
-                               </start>
-                       </extent>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="getLanguage">
-               <xsl:param name="langString"/>
-               <xsl:param name="controlField008-35-37"/>
-               <xsl:variable name="length" select="string-length($langString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="$controlField008-35-37=substring($langString,1,3)">
-                               <xsl:call-template name="getLanguage">
-                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"/>
-                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"/>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <language>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="substring($langString,1,3)"/>
-                                       </languageTerm>
-                               </language>
-                               <xsl:call-template name="getLanguage">
-                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"/>
-                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"/>
-                               </xsl:call-template>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="isoLanguage">
-               <xsl:param name="currentLanguage"/>
-               <xsl:param name="usedLanguages"/>
-               <xsl:param name="remainingLanguages"/>
-               <xsl:choose>
-                       <xsl:when test="string-length($currentLanguage)=0"/>
-                       <xsl:when test="not(contains($usedLanguages, $currentLanguage))">
-                               <language>
-                                       <xsl:if test="@code!='a'">
-                                               <xsl:attribute name="objectPart">
-                                                       <xsl:choose>
-                                                               <xsl:when test="@code='b'">summary or subtitle</xsl:when>
-                                                               <xsl:when test="@code='d'">sung or spoken text</xsl:when>
-                                                               <xsl:when test="@code='e'">libretto</xsl:when>
-                                                               <xsl:when test="@code='f'">table of contents</xsl:when>
-                                                               <xsl:when test="@code='g'">accompanying material</xsl:when>
-                                                               <xsl:when test="@code='h'">translation</xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                                       <languageTerm authority="iso639-2b" type="code">
-                                               <xsl:value-of select="$currentLanguage"/>
-                                       </languageTerm>
-                               </language>
-                               <xsl:call-template name="isoLanguage">
-                                       <xsl:with-param name="currentLanguage">
-                                               <xsl:value-of select="substring($remainingLanguages,1,3)"/>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="usedLanguages">
-                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"/>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="remainingLanguages">
-                                               <xsl:value-of
-                                                       select="substring($remainingLanguages,4,string-length($remainingLanguages))"
-                                               />
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:call-template name="isoLanguage">
-                                       <xsl:with-param name="currentLanguage">
-                                               <xsl:value-of select="substring($remainingLanguages,1,3)"/>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="usedLanguages">
-                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"/>
-                                       </xsl:with-param>
-                                       <xsl:with-param name="remainingLanguages">
-                                               <xsl:value-of
-                                                       select="substring($remainingLanguages,4,string-length($remainingLanguages))"
-                                               />
-                                       </xsl:with-param>
-                               </xsl:call-template>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       <xsl:template name="chopBrackets">
-               <xsl:param name="chopString"/>
-               <xsl:variable name="string">
-                       <xsl:call-template name="chopPunctuation">
-                               <xsl:with-param name="chopString" select="$chopString"/>
-                       </xsl:call-template>
-               </xsl:variable>
-               <xsl:if test="substring($string, 1,1)='['">
-                       <xsl:value-of select="substring($string,2, string-length($string)-2)"/>
-               </xsl:if>
-               <xsl:if test="substring($string, 1,1)!='['">
-                       <xsl:value-of select="$string"/>
-               </xsl:if>
-       </xsl:template>
-       <xsl:template name="rfcLanguages">
-               <xsl:param name="nodeNum"/>
-               <xsl:param name="usedLanguages"/>
-               <xsl:param name="controlField008-35-37"/>
-               <xsl:variable name="currentLanguage" select="."/>
-               <xsl:choose>
-                       <xsl:when test="not($currentLanguage)"/>
-                       <xsl:when
-                               test="$currentLanguage!=$controlField008-35-37 and $currentLanguage!='rfc3066'">
-                               <xsl:if test="not(contains($usedLanguages,$currentLanguage))">
-                                       <language>
-                                               <xsl:if test="@code!='a'">
-                                                       <xsl:attribute name="objectPart">
-                                                               <xsl:choose>
-                                                                       <xsl:when test="@code='b'">summary or subtitle</xsl:when>
-                                                                       <xsl:when test="@code='d'">sung or spoken text</xsl:when>
-                                                                       <xsl:when test="@code='e'">libretto</xsl:when>
-                                                                       <xsl:when test="@code='f'">table of contents</xsl:when>
-                                                                       <xsl:when test="@code='g'">accompanying material</xsl:when>
-                                                                       <xsl:when test="@code='h'">translation</xsl:when>
-                                                               </xsl:choose>
-                                                       </xsl:attribute>
-                                               </xsl:if>
-                                               <languageTerm authority="rfc3066" type="code">
-                                                       <xsl:value-of select="$currentLanguage"/>
-                                               </languageTerm>
-                                       </language>
-                               </xsl:if>
-                       </xsl:when>
-                       <xsl:otherwise> </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-
-    <xsl:template name="datafield">
-               <xsl:param name="tag"/>
-               <xsl:param name="ind1">
-                       <xsl:text> </xsl:text>
-               </xsl:param>
-               <xsl:param name="ind2">
-                       <xsl:text> </xsl:text>
-               </xsl:param>
-               <xsl:param name="subfields"/>
-               <xsl:element name="marc:datafield">
-                       <xsl:attribute name="tag">
-                               <xsl:value-of select="$tag"/>
-                       </xsl:attribute>
-                       <xsl:attribute name="ind1">
-                               <xsl:value-of select="$ind1"/>
-                       </xsl:attribute>
-                       <xsl:attribute name="ind2">
-                               <xsl:value-of select="$ind2"/>
-                       </xsl:attribute>
-                       <xsl:copy-of select="$subfields"/>
-               </xsl:element>
-       </xsl:template>
-
-       <xsl:template name="subfieldSelect">
-               <xsl:param name="codes">abcdefghijklmnopqrstuvwxyz</xsl:param>
-               <xsl:param name="delimeter">
-                       <xsl:text> </xsl:text>
-               </xsl:param>
-               <xsl:variable name="str">
-                       <xsl:for-each select="marc:subfield">
-                               <xsl:if test="contains($codes, @code)">
-                                       <xsl:value-of select="text()"/>
-                                       <xsl:value-of select="$delimeter"/>
-                               </xsl:if>
-                       </xsl:for-each>
-               </xsl:variable>
-               <xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
-       </xsl:template>
-
-       <xsl:template name="buildSpaces">
-               <xsl:param name="spaces"/>
-               <xsl:param name="char">
-                       <xsl:text> </xsl:text>
-               </xsl:param>
-               <xsl:if test="$spaces>0">
-                       <xsl:value-of select="$char"/>
-                       <xsl:call-template name="buildSpaces">
-                               <xsl:with-param name="spaces" select="$spaces - 1"/>
-                               <xsl:with-param name="char" select="$char"/>
-                       </xsl:call-template>
-               </xsl:if>
-       </xsl:template>
-
-       <xsl:template name="chopPunctuation">
-               <xsl:param name="chopString"/>
-               <xsl:param name="punctuation">
-                       <xsl:text>.:,;/ </xsl:text>
-               </xsl:param>
-               <xsl:variable name="length" select="string-length($chopString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="contains($punctuation, substring($chopString,$length,1))">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
-                                       <xsl:with-param name="punctuation" select="$punctuation"/>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:when test="not($chopString)"/>
-                       <xsl:otherwise>
-                               <xsl:value-of select="$chopString"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-
-       <xsl:template name="chopPunctuationFront">
-               <xsl:param name="chopString"/>
-               <xsl:variable name="length" select="string-length($chopString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="contains('.:,;/[ ', substring($chopString,1,1))">
-                               <xsl:call-template name="chopPunctuationFront">
-                                       <xsl:with-param name="chopString" select="substring($chopString,2,$length - 1)"
-                                       />
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:when test="not($chopString)"/>
-                       <xsl:otherwise>
-                               <xsl:value-of select="$chopString"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-
-       <xsl:template name="chopPunctuationBack">
-               <xsl:param name="chopString"/>
-               <xsl:param name="punctuation">
-                       <xsl:text>.:,;/] </xsl:text>
-               </xsl:param>
-               <xsl:variable name="length" select="string-length($chopString)"/>
-               <xsl:choose>
-                       <xsl:when test="$length=0"/>
-                       <xsl:when test="contains($punctuation, substring($chopString,$length,1))">
-                               <xsl:call-template name="chopPunctuation">
-                                       <xsl:with-param name="chopString" select="substring($chopString,1,$length - 1)"/>
-                                       <xsl:with-param name="punctuation" select="$punctuation"/>
-                               </xsl:call-template>
-                       </xsl:when>
-                       <xsl:when test="not($chopString)"/>
-                       <xsl:otherwise>
-                               <xsl:value-of select="$chopString"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-
-       <!-- nate added 12/14/2007 for lccn.loc.gov: url encode ampersand, etc. -->
-       <xsl:template name="url-encode">
-
-               <xsl:param name="str"/>
-
-               <xsl:if test="$str">
-                       <xsl:variable name="first-char" select="substring($str,1,1)"/>
-                       <xsl:choose>
-                               <xsl:when test="contains($safe,$first-char)">
-                                       <xsl:value-of select="$first-char"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:variable name="codepoint">
-                                               <xsl:choose>
-                                                       <xsl:when test="contains($ascii,$first-char)">
-                                                               <xsl:value-of
-                                                                       select="string-length(substring-before($ascii,$first-char)) + 32"
-                                                               />
-                                                       </xsl:when>
-                                                       <xsl:when test="contains($latin1,$first-char)">
-                                                               <xsl:value-of
-                                                                       select="string-length(substring-before($latin1,$first-char)) + 160"/>
-                                                               <!-- was 160 -->
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               <xsl:message terminate="no">Warning: string contains a character
-                                                                       that is out of range! Substituting "?".</xsl:message>
-                                                               <xsl:text>63</xsl:text>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </xsl:variable>
-                                       <xsl:variable name="hex-digit1"
-                                               select="substring($hex,floor($codepoint div 16) + 1,1)"/>
-                                       <xsl:variable name="hex-digit2" select="substring($hex,$codepoint mod 16 + 1,1)"/>
-                                       <!-- <xsl:value-of select="concat('%',$hex-digit2)"/> -->
-                                       <xsl:value-of select="concat('%',$hex-digit1,$hex-digit2)"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-                       <xsl:if test="string-length($str) &gt; 1">
-                               <xsl:call-template name="url-encode">
-                                       <xsl:with-param name="str" select="substring($str,2)"/>
-                               </xsl:call-template>
-                       </xsl:if>
-               </xsl:if>
-       </xsl:template>
-</xsl:stylesheet>$$ WHERE name = 'mods33';
-
-ALTER TABLE actor.usr ALTER COLUMN juvenile SET NOT NULL;
-ALTER TABLE actor.usr_address ALTER COLUMN pending SET NOT NULL;
-ALTER TABLE config.circ_matrix_matchpoint ALTER COLUMN duration_rule SET NOT NULL;
-ALTER TABLE config.circ_matrix_matchpoint ALTER COLUMN recurring_fine_rule SET NOT NULL;
-ALTER TABLE config.circ_matrix_matchpoint ALTER COLUMN max_fine_rule SET NOT NULL;
-
--- We're updating the IDL, so flush cached mods slim records to avoid field mismatches
-UPDATE metabib.metarecord SET mods = NULL;
@@ -1,16 +1,25 @@
+-- 0498
+-- Rather than polluting the public schema with general Evergreen
+-- functions, carve out a dedicated schema.  It might already exist,
+-- so do it before the transaction starts
+CREATE SCHEMA evergreen;
+
 BEGIN;
 
 -- 0425
 ALTER TABLE permission.grp_tree
         ADD COLUMN hold_priority INT NOT NULL DEFAULT 0;
 
--- 0430
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN strict_ou_match BOOL NOT NULL DEFAULT FALSE;
+-- 0430 and friends
+ALTER TABLE config.hold_matrix_matchpoint
+    ADD COLUMN strict_ou_match BOOL NOT NULL DEFAULT FALSE,
+    ADD COLUMN marc_bib_level text,
+    DROP CONSTRAINT hous_once_per_grp_loc_mod_marc,
+    DROP CONSTRAINT hold_matrix_matchpoint_marc_form_fkey,
+    DROP CONSTRAINT hold_matrix_matchpoint_marc_type_fkey,
+    DROP CONSTRAINT hold_matrix_matchpoint_marc_vr_format_fkey;
+
 
--- 0498
--- Rather than polluting the public schema with general Evergreen
--- functions, carve out a dedicated schema
-CREATE SCHEMA evergreen;
 
 -- Replace all uses of PostgreSQL's built-in LOWER() function with
 -- a more locale-savvy PLPERLU evergreen.lowercase() function
@@ -37,7 +46,7 @@ $func$ LANGUAGE PLPERLU;
 
 CREATE OR REPLACE FUNCTION evergreen.facet_force_nfc() RETURNS TRIGGER AS $$
 BEGIN
-    NEW.value := force_unicode_normal_form(NEW.value,'NFC');
+    NEW.value := evergreen.force_unicode_normal_form(NEW.value,'NFC');
     RETURN NEW;
 END;
 $$ LANGUAGE PLPGSQL;
@@ -240,9 +249,6 @@ CREATE OR REPLACE FUNCTION actor.org_unit_descendants_distance( INT ) RETURNS TA
     SELECT * FROM org_unit_descendants_distance;
 $$ LANGUAGE SQL STABLE;
 
-ALTER TABLE config.circ_matrix_matchpoint
-    ADD COLUMN user_home_ou         INT     REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED;
-
 CREATE TABLE config.circ_matrix_weights (
     id                      SERIAL  PRIMARY KEY,
     name                    TEXT    NOT NULL UNIQUE,
@@ -629,14 +635,22 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
--- 0482
--- Drop old (non-functional) constraints
-
+-- 0482, 0487, and parts of others
+-- Circ matchpoint table changes
 ALTER TABLE config.circ_matrix_matchpoint
-    DROP CONSTRAINT ep_once_per_grp_loc_mod_marc;
-
-ALTER TABLE config.hold_matrix_matchpoint
-    DROP CONSTRAINT hous_once_per_grp_loc_mod_marc;
+    ALTER COLUMN circulate DROP NOT NULL, -- Fallthrough enable
+    ALTER COLUMN circulate DROP DEFAULT, -- Stop defaulting to true to enable default to fallthrough
+    ALTER COLUMN duration_rule DROP NOT NULL, -- Fallthrough enable
+    ALTER COLUMN recurring_fine_rule DROP NOT NULL, -- Fallthrough enable
+    ALTER COLUMN max_fine_rule DROP NOT NULL, -- Fallthrough enable
+    ADD COLUMN renewals INT, -- Renewals override
+    ADD COLUMN user_home_ou INT REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN grace_period INTERVAL,
+    ADD COLUMN marc_bib_level text,
+    DROP CONSTRAINT ep_once_per_grp_loc_mod_marc,
+    DROP CONSTRAINT circ_matrix_matchpoint_marc_form_fkey,
+    DROP CONSTRAINT circ_matrix_matchpoint_marc_type_fkey,
+    DROP CONSTRAINT circ_matrix_matchpoint_marc_vr_format_fkey;
 
 -- Clean up tables before making normalized index
 
@@ -949,16 +963,6 @@ SELECT  r.id,
 -- 0486
 ALTER TABLE money.credit_card_payment ADD COLUMN cc_order_number TEXT;
 
--- 0487
--- Circ matchpoint table changes
-ALTER TABLE config.circ_matrix_matchpoint
-    ALTER COLUMN circulate DROP NOT NULL, -- Fallthrough enable
-    ALTER COLUMN circulate DROP DEFAULT, -- Stop defaulting to true to enable default to fallthrough
-    ALTER COLUMN duration_rule DROP NOT NULL, -- Fallthrough enable
-    ALTER COLUMN recurring_fine_rule DROP NOT NULL, -- Fallthrough enable
-    ALTER COLUMN max_fine_rule DROP NOT NULL, -- Fallthrough enable
-    ADD COLUMN renewals INT; -- Renewals override
-
 -- Changing return types requires explicit dropping of old versions
 DROP FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL );
 DROP FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL );
@@ -1404,6 +1408,15 @@ INSERT INTO config.record_attr_definition (name,label,phys_char_sf) values ('vr_
 INSERT INTO config.record_attr_definition (name,label,sorter,filter,tag) values ('titlesort','Title',TRUE,FALSE,'tnf');
 INSERT INTO config.record_attr_definition (name,label,sorter,filter,tag) values ('authorsort','Author',TRUE,FALSE,'1%');
 
+INSERT INTO config.upgrade_log (version) VALUES ('0624'); -- miker/tsbere
+-- Cont was typod as Conf. Update the old entries.
+UPDATE config.marc21_ff_pos_map SET fixed_field = 'Cont' WHERE fixed_field = 'Conf' AND length > 1;
+-- Conf thus didn't exist. Add it.
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'BKS', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'SER', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'BKS', 29, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'SER', 29, 1, ' ');
+
 INSERT INTO config.coded_value_map (ctype,code,value,description)
     SELECT 'item_lang' AS ctype, code, value, NULL FROM config.language_map
         UNION
@@ -1421,14 +1434,6 @@ INSERT INTO config.coded_value_map (ctype,code,value,description)
 
 ALTER TABLE config.i18n_locale DROP CONSTRAINT i18n_locale_marc_code_fkey;
 
-ALTER TABLE config.circ_matrix_matchpoint DROP CONSTRAINT circ_matrix_matchpoint_marc_form_fkey;
-ALTER TABLE config.circ_matrix_matchpoint DROP CONSTRAINT circ_matrix_matchpoint_marc_type_fkey;
-ALTER TABLE config.circ_matrix_matchpoint DROP CONSTRAINT circ_matrix_matchpoint_marc_vr_format_fkey;
-
-ALTER TABLE config.hold_matrix_matchpoint DROP CONSTRAINT hold_matrix_matchpoint_marc_form_fkey;
-ALTER TABLE config.hold_matrix_matchpoint DROP CONSTRAINT hold_matrix_matchpoint_marc_type_fkey;
-ALTER TABLE config.hold_matrix_matchpoint DROP CONSTRAINT hold_matrix_matchpoint_marc_vr_format_fkey;
-
 DROP TABLE config.language_map;
 DROP TABLE config.bib_level_map;
 DROP TABLE config.item_form_map;
@@ -1465,7 +1470,7 @@ CREATE INDEX metabib_svf_date1_idx ON metabib.record_attr ( (attrs->'date1') );
 CREATE INDEX metabib_svf_dates_idx ON metabib.record_attr ( (attrs->'date1'), (attrs->'date2') );
 
 INSERT INTO metabib.record_attr (id,attrs)
-    SELECT mrd.record, hstore(mrd) - '{id,record}'::TEXT[] FROM metabib.rec_descriptor mrd;
+    SELECT DISTINCT ON (mrd.record) mrd.record, hstore(mrd) - '{id,record}'::TEXT[] FROM metabib.rec_descriptor mrd;
 
 -- Back-compat view ... we're moving to an HSTORE world
 CREATE TYPE metabib.rec_desc_type AS (
@@ -2265,9 +2270,6 @@ UPDATE asset.call_number_class
 -- 0503
 -- New Columns
 
-ALTER TABLE config.circ_matrix_matchpoint
-    ADD COLUMN grace_period INTERVAL;
-
 ALTER TABLE config.rule_recurring_fine
     ADD COLUMN grace_period INTERVAL NOT NULL DEFAULT '1 day';
 
@@ -2657,6 +2659,7 @@ ALTER FUNCTION permission.usr_has_perm_at ( INT, TEXT ) ROWS 1;
 ALTER FUNCTION permission.usr_has_perm_at_all ( INT, TEXT ) ROWS 1;
 
 
+DROP TRIGGER IF EXISTS facet_force_nfc_tgr ON metabib.facet_entry;
 CREATE TRIGGER facet_force_nfc_tgr
     BEFORE UPDATE OR INSERT ON metabib.facet_entry
     FOR EACH ROW EXECUTE PROCEDURE evergreen.facet_force_nfc();
@@ -3454,6 +3457,7 @@ BEGIN
 END;
 $F$ LANGUAGE PLPGSQL;
 
+DROP TRIGGER IF EXISTS action_circulation_target_copy_trig ON action.circulation;
 CREATE TRIGGER action_circulation_target_copy_trig AFTER INSERT OR UPDATE ON action.circulation FOR EACH ROW EXECUTE PROCEDURE evergreen.fake_fkey_tgr('target_copy');
 
 -- 0512
@@ -3488,2530 +3492,5394 @@ INSERT INTO biblio.peer_type (id,name) VALUES
 
 SELECT SETVAL('biblio.peer_type_id_seq'::TEXT, 100);
 
-CREATE OR REPLACE FUNCTION search.query_parser_fts (
-
-    param_search_ou INT,
-    param_depth     INT,
-    param_query     TEXT,
-    param_statuses  INT[],
-    param_locations INT[],
-    param_offset    INT,
-    param_check     INT,
-    param_limit     INT,
-    metarecord      BOOL,
-    staff           BOOL
-) RETURNS SETOF search.search_result AS $func$
-DECLARE
-
-    current_res         search.search_result%ROWTYPE;
-    search_org_list     INT[];
-
-    check_limit         INT;
-    core_limit          INT;
-    core_offset         INT;
-    tmp_int             INT;
-
-    core_result         RECORD;
-    core_cursor         REFCURSOR;
-    core_rel_query      TEXT;
-
-    total_count         INT := 0;
-    check_count         INT := 0;
-    deleted_count       INT := 0;
-    visible_count       INT := 0;
-    excluded_count      INT := 0;
-
-BEGIN
-
-    check_limit := COALESCE( param_check, 1000 );
-    core_limit  := COALESCE( param_limit, 25000 );
-    core_offset := COALESCE( param_offset, 0 );
-
-    -- core_skip_chk := COALESCE( param_skip_chk, 1 );
+CREATE OR REPLACE FUNCTION unapi.holdings_xml (bid BIGINT, ouid INT, org TEXT, depth INT DEFAULT NULL, includes TEXT[] DEFAULT NULL::TEXT[], slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE) RETURNS XML AS $F$
+     SELECT  XMLELEMENT(
+                 name holdings,
+                 XMLATTRIBUTES(
+                    CASE WHEN $8 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    CASE WHEN ('bre' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN 'tag:open-ils.org:U2@bre/' || $1 || '/' || $3 ELSE NULL END AS id
+                 ),
+                 XMLELEMENT(
+                     name counts,
+                     (SELECT  XMLAGG(XMLELEMENT::XML) FROM (
+                         SELECT  XMLELEMENT(
+                                     name count,
+                                     XMLATTRIBUTES('public' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+                                 )::text
+                           FROM  asset.opac_ou_record_copy_count($2,  $1)
+                                     UNION
+                         SELECT  XMLELEMENT(
+                                     name count,
+                                     XMLATTRIBUTES('staff' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+                                 )::text
+                           FROM  asset.staff_ou_record_copy_count($2, $1)
+                                     ORDER BY 1
+                     )x)
+                 ),
+                 CASE
+                     WHEN ('bmp' = ANY ($5)) THEN
+                        XMLELEMENT( name monograph_parts,
+                            XMLAGG((SELECT unapi.bmp( id, 'xml', 'monograph_part', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'bre'), 'holdings_xml'), $3, $4, $6, $7, FALSE) FROM biblio.monograph_part WHERE record = $1))
+                        )
+                     ELSE NULL
+                 END,
+                 CASE WHEN ('acn' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN
+                     XMLELEMENT(
+                         name volumes,
+                         (SELECT XMLAGG(acn) FROM (
+                            SELECT  unapi.acn(acn.id,'xml','volume',evergreen.array_remove_item_by_value(evergreen.array_remove_item_by_value('{acn,auri}'::TEXT[] || $5,'holdings_xml'),'bre'), $3, $4, $6, $7, FALSE)
+                              FROM  asset.call_number acn
+                              WHERE acn.record = $1
+                                    AND EXISTS (
+                                        SELECT  1
+                                          FROM  asset.copy acp
+                                                JOIN actor.org_unit_descendants(
+                                                    $2,
+                                                    (COALESCE(
+                                                        $4,
+                                                        (SELECT aout.depth
+                                                          FROM  actor.org_unit_type aout
+                                                                JOIN actor.org_unit aou ON (aou.ou_type = aout.id AND aou.id = $2)
+                                                        )
+                                                    ))
+                                                ) aoud ON (acp.circ_lib = aoud.id)
+                                          LIMIT 1
+                                    )
+                              ORDER BY label_sortkey
+                              LIMIT $6
+                              OFFSET $7
+                         )x)
+                     )
+                 ELSE NULL END,
+                 CASE WHEN ('ssub' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN
+                     XMLELEMENT(
+                         name subscriptions,
+                         (SELECT XMLAGG(ssub) FROM (
+                            SELECT  unapi.ssub(id,'xml','subscription','{}'::TEXT[], $3, $4, $6, $7, FALSE)
+                              FROM  serial.subscription
+                              WHERE record_entry = $1
+                        )x)
+                     )
+                 ELSE NULL END,
+                 CASE WHEN ('acp' = ANY ($5)) THEN
+                     XMLELEMENT(
+                         name foreign_copies,
+                         (SELECT XMLAGG(acp) FROM (
+                            SELECT  unapi.acp(p.target_copy,'xml','copy','{}'::TEXT[], $3, $4, $6, $7, FALSE)
+                              FROM  biblio.peer_bib_copy_map p
+                                    JOIN asset.copy c ON (p.target_copy = c.id)
+                              WHERE NOT c.deleted AND peer_record = $1
+                        )x)
+                     )
+                 ELSE NULL END
+             );
+$F$ LANGUAGE SQL;
 
-    IF param_search_ou > 0 THEN
-        IF param_depth IS NOT NULL THEN
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
-        ELSE
-            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
-        END IF;
-    ELSIF param_search_ou < 0 THEN
-        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
-    ELSIF param_search_ou = 0 THEN
-        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
-    END IF;
+CREATE OR REPLACE FUNCTION unapi.acp ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name copy,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@acp/' || id AS id,
+                        create_date, edit_date, copy_number, circulate, deposit,
+                        ref, holdable, deleted, deposit_amount, price, barcode,
+                        circ_modifier, circ_as_type, opac_visible
+                    ),
+                    unapi.ccs( status, $2, 'status', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
+                    unapi.acl( location, $2, 'location', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
+                    unapi.aou( circ_lib, $2, 'circ_lib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
+                    unapi.aou( circ_lib, $2, 'circlib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
+                    CASE WHEN ('acn' = ANY ($4)) THEN unapi.acn( call_number, $2, 'call_number', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    XMLELEMENT( name copy_notes,
+                        CASE
+                            WHEN ('acpn' = ANY ($4)) THEN
+                                XMLAGG((SELECT unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.copy_note WHERE owning_copy = cp.id AND pub))
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name statcats,
+                        CASE
+                            WHEN ('ascecm' = ANY ($4)) THEN
+                                XMLAGG((SELECT unapi.ascecm( stat_cat_entry, 'xml', 'statcat', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.stat_cat_entry_copy_map WHERE owning_copy = cp.id))
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name foreign_records,
+                        CASE
+                            WHEN ('bre' = ANY ($4)) THEN
+                                XMLAGG((SELECT unapi.bre(peer_record,'marcxml','record','{}'::TEXT[], $5, $6, $7, $8, FALSE) FROM biblio.peer_bib_copy_map WHERE target_copy = cp.id))
+                            ELSE NULL
+                        END
 
-    OPEN core_cursor FOR EXECUTE param_query;
+                    ),
+                    CASE
+                        WHEN ('bmp' = ANY ($4)) THEN
+                            XMLELEMENT( name monograph_parts,
+                                XMLAGG((SELECT unapi.bmp( part, 'xml', 'monograph_part', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.copy_part_map WHERE target_copy = cp.id))
+                            )
+                        ELSE NULL
+                    END
+                )
+          FROM  asset.copy cp
+          WHERE id = $1
+          GROUP BY id, status, location, circ_lib, call_number, create_date, edit_date, copy_number, circulate, deposit, ref, holdable, deleted, deposit_amount, price, barcode, circ_modifier, circ_as_type, opac_visible;
+$F$ LANGUAGE SQL;
 
-    LOOP
+CREATE OR REPLACE FUNCTION asset.refresh_opac_visible_copies_mat_view () RETURNS VOID AS $$
 
-        FETCH core_cursor INTO core_result;
-        EXIT WHEN NOT FOUND;
-        EXIT WHEN total_count >= core_limit;
+    TRUNCATE TABLE asset.opac_visible_copies;
 
-        total_count := total_count + 1;
+    INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+    SELECT  cp.id, cp.circ_lib, cn.record
+    FROM  asset.copy cp
+        JOIN asset.call_number cn ON (cn.id = cp.call_number)
+        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+        JOIN asset.copy_location cl ON (cp.location = cl.id)
+        JOIN config.copy_status cs ON (cp.status = cs.id)
+        JOIN biblio.record_entry b ON (cn.record = b.id)
+    WHERE NOT cp.deleted
+        AND NOT cn.deleted
+        AND NOT b.deleted
+        AND cs.opac_visible
+        AND cl.opac_visible
+        AND cp.opac_visible
+        AND a.opac_visible
+            UNION
+    SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record
+    FROM  asset.copy cp
+        JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+        JOIN asset.copy_location cl ON (cp.location = cl.id)
+        JOIN config.copy_status cs ON (cp.status = cs.id)
+    WHERE NOT cp.deleted
+        AND cs.opac_visible
+        AND cl.opac_visible
+        AND cp.opac_visible
+        AND a.opac_visible;
 
-        CONTINUE WHEN total_count NOT BETWEEN  core_offset + 1 AND check_limit + core_offset;
+$$ LANGUAGE SQL;
+COMMENT ON FUNCTION asset.refresh_opac_visible_copies_mat_view() IS $$
+Rebuild the copy OPAC visibility cache.  Useful during migrations.
+$$;
 
-        check_count := check_count + 1;
-
-        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
-        IF NOT FOUND THEN
-            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
-            deleted_count := deleted_count + 1;
-            CONTINUE;
-        END IF;
-
-        PERFORM 1
-          FROM  biblio.record_entry b
-                JOIN config.bib_source s ON (b.source = s.id)
-          WHERE s.transcendant
-                AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
-
-        IF FOUND THEN
-            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
-            visible_count := visible_count + 1;
-
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
+SELECT asset.refresh_opac_visible_copies_mat_view();
+CREATE INDEX opac_visible_copies_idx1 on asset.opac_visible_copies (record, circ_lib);
+CREATE INDEX opac_visible_copies_copy_id_idx on asset.opac_visible_copies (copy_id);
+CREATE UNIQUE INDEX opac_visible_copies_once_per_record_idx on asset.opac_visible_copies (copy_id, record);
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+DECLARE
+    add_query       TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
+BEGIN
+    add_query := $$
+            INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+              SELECT id, circ_lib, record FROM (
+                SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number
+                  FROM  asset.copy cp
+                        JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                        JOIN asset.copy_location cl ON (cp.location = cl.id)
+                        JOIN config.copy_status cs ON (cp.status = cs.id)
+                        JOIN biblio.record_entry b ON (cn.record = b.id)
+                  WHERE NOT cp.deleted
+                        AND NOT cn.deleted
+                        AND NOT b.deleted
+                        AND cs.opac_visible
+                        AND cl.opac_visible
+                        AND cp.opac_visible
+                        AND a.opac_visible
+                            UNION
+                SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number
+                  FROM  asset.copy cp
+                        JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                        JOIN asset.copy_location cl ON (cp.location = cl.id)
+                        JOIN config.copy_status cs ON (cp.status = cs.id)
+                  WHERE NOT cp.deleted
+                        AND cs.opac_visible
+                        AND cl.opac_visible
+                        AND cp.opac_visible
+                        AND a.opac_visible
+                    ) AS x 
 
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-            END IF;
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
 
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
-            END IF;
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.target_copy || ' AND x.record = ' || NEW.peer_record || ';';
+            EXECUTE add_query;
+            RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
+        END IF;
+    END IF;
 
-            RETURN NEXT current_res;
+    IF TG_OP = 'INSERT' THEN
 
-            CONTINUE;
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            EXECUTE add_query;
         END IF;
 
-        PERFORM 1
-          FROM  asset.call_number cn
-                JOIN asset.uri_call_number_map map ON (map.call_number = cn.id)
-                JOIN asset.uri uri ON (map.uri = uri.id)
-          WHERE NOT cn.deleted
-                AND cn.label = '##URI##'
-                AND uri.active
-                AND ( param_locations IS NULL OR array_upper(param_locations, 1) IS NULL )
-                AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
-                AND cn.owning_lib IN ( SELECT * FROM unnest( search_org_list ) )
-          LIMIT 1;
+        RETURN NEW;
 
-        IF FOUND THEN
-            -- RAISE NOTICE ' % have at least one URI ... ', core_result.records;
-            visible_count := visible_count + 1;
+    END IF;
 
-            current_res.id = core_result.id;
-            current_res.rel = core_result.rel;
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
 
-            tmp_int := 1;
-            IF metarecord THEN
-                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
+
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
             END IF;
 
-            IF tmp_int = 1 THEN
-                current_res.record = core_result.records[1];
-            ELSE
-                current_res.record = NULL;
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
             END IF;
 
-            RETURN NEXT current_res;
+        END IF;
 
-            CONTINUE;
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            EXECUTE add_query;
         END IF;
 
-        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
+        RETURN NEW;
 
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
-                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-              LIMIT 1;
+    END IF;
 
-            IF NOT FOUND THEN
-                PERFORM 1
-                  FROM  biblio.peer_bib_copy_map pr
-                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
-                  WHERE NOT cp.deleted
-                        AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
-                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
-                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                  LIMIT 1;
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
 
-                IF NOT FOUND THEN
-                -- RAISE NOTICE ' % and multi-home linked records were all status-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
             END IF;
-
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME IN ('copy','unit') THEN
+                add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            ELSIF TG_TABLE_NAME = 'call_number' THEN
+                add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_query := add_query || 'WHERE x.record = ' || NEW.id || ';';
+            END IF;
+            EXECUTE add_query;
+            RETURN NEW;
         END IF;
+    END IF;
 
-        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
+    IF TG_TABLE_NAME = 'call_number' THEN
 
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
-                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
-                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-              LIMIT 1;
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
+            EXECUTE add_query;
+        END IF;
 
-            IF NOT FOUND THEN
-                PERFORM 1
-                  FROM  biblio.peer_bib_copy_map pr
-                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
-                  WHERE NOT cp.deleted
-                        AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
-                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
-                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                  LIMIT 1;
+        RETURN NEW;
 
-                IF NOT FOUND THEN
-                    -- RAISE NOTICE ' % and multi-home linked records were all copy_location-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-            END IF;
+    END IF;
 
-        END IF;
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
+    END IF;
 
-        IF staff IS NULL OR NOT staff THEN
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
 
-            PERFORM 1
-              FROM  asset.opac_visible_copies
-              WHERE circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                    AND record IN ( SELECT * FROM unnest( core_result.records ) )
-              LIMIT 1;
+        RETURN NEW;
 
-            IF NOT FOUND THEN
-                PERFORM 1
-                  FROM  biblio.peer_bib_copy_map pr
-                        JOIN asset.opac_visible_copies cp ON (cp.copy_id = pr.target_copy)
-                  WHERE cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
-                  LIMIT 1;
+    ELSIF NEW.opac_visible THEN -- add rows
 
-                IF NOT FOUND THEN
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_query := add_query || 'AND cp.circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_query := add_query || 'AND cp.location = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_query := add_query || 'AND cp.status = ' || NEW.id || ';';
+        END IF;
+        EXECUTE add_query;
+    ELSE -- delete rows
 
-                    -- RAISE NOTICE ' % and multi-home linked records were all visibility-excluded ... ', core_result.records;
-                    excluded_count := excluded_count + 1;
-                    CONTINUE;
-                END IF;
-            END IF;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+COMMENT ON FUNCTION asset.cache_copy_visibility() IS $$
+Trigger function to update the copy OPAC visiblity cache.
+$$;
 
-        ELSE
+CREATE TRIGGER a_opac_vis_mat_view_tgr AFTER INSERT OR DELETE ON biblio.peer_bib_copy_map FOR EACH ROW EXECUTE PROCEDURE asset.cache_copy_visibility();
 
-            PERFORM 1
-              FROM  asset.call_number cn
-                    JOIN asset.copy cp ON (cp.call_number = cn.id)
-              WHERE NOT cn.deleted
-                    AND NOT cp.deleted
-                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
-              LIMIT 1;
+CREATE OR REPLACE FUNCTION biblio.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
+DECLARE
+    transformed_xml TEXT;
+    prev_xfrm       TEXT;
+    normalizer      RECORD;
+    xfrm            config.xml_transform%ROWTYPE;
+    attr_value      TEXT;
+    new_attrs       HSTORE := ''::HSTORE;
+    attr_def        config.record_attr_definition%ROWTYPE;
+BEGIN
 
-            IF NOT FOUND THEN
+    IF NEW.deleted IS TRUE THEN -- If this bib is deleted
+        DELETE FROM metabib.metarecord_source_map WHERE source = NEW.id; -- Rid ourselves of the search-estimate-killing linkage
+        DELETE FROM metabib.record_attr WHERE id = NEW.id; -- Kill the attrs hash, useless on deleted records
+        DELETE FROM authority.bib_linking WHERE bib = NEW.id; -- Avoid updating fields in bibs that are no longer visible
+        DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = NEW.id; -- Separate any multi-homed items
+        RETURN NEW; -- and we're done
+    END IF;
 
-                PERFORM 1
-                  FROM  biblio.peer_bib_copy_map pr
-                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
-                  WHERE NOT cp.deleted
-                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
-                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
-                  LIMIT 1;
+    IF TG_OP = 'UPDATE' THEN -- re-ingest?
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
 
-                IF NOT FOUND THEN
+        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+            RETURN NEW;
+        END IF;
+    END IF;
 
-                    PERFORM 1
-                      FROM  asset.call_number cn
-                      WHERE cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+    -- Record authority linking
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_linking' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM biblio.map_authority_linking( NEW.id, NEW.marc );
+    END IF;
+
+    -- Flatten and insert the mfr data
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_full_rec' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM metabib.reingest_metabib_full_rec(NEW.id);
+
+        -- Now we pull out attribute data, which is dependent on the mfr for all but XPath-based fields
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_rec_descriptor' AND enabled;
+        IF NOT FOUND THEN
+            FOR attr_def IN SELECT * FROM config.record_attr_definition ORDER BY format LOOP
+
+                IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
+                    SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(value), COALESCE(attr_def.joiner,' ')) INTO attr_value
+                      FROM  (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
+                      WHERE record = NEW.id
+                            AND tag LIKE attr_def.tag
+                            AND CASE
+                                WHEN attr_def.sf_list IS NOT NULL 
+                                    THEN POSITION(subfield IN attr_def.sf_list) > 0
+                                ELSE TRUE
+                                END
+                      GROUP BY tag
+                      ORDER BY tag
                       LIMIT 1;
 
-                    IF FOUND THEN
-                        -- RAISE NOTICE ' % and multi-home linked records were all visibility-excluded ... ', core_result.records;
-                        excluded_count := excluded_count + 1;
-                        CONTINUE;
+                ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
+                    attr_value := biblio.marc21_extract_fixed_field(NEW.id, attr_def.fixed_field);
+
+                ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+
+                    SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
+            
+                    -- See if we can skip the XSLT ... it's expensive
+                    IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+                        -- Can't skip the transform
+                        IF xfrm.xslt <> '---' THEN
+                            transformed_xml := oils_xslt_process(NEW.marc,xfrm.xslt);
+                        ELSE
+                            transformed_xml := NEW.marc;
+                        END IF;
+            
+                        prev_xfrm := xfrm.name;
                     END IF;
-                END IF;
 
-            END IF;
+                    IF xfrm.name IS NULL THEN
+                        -- just grab the marcxml (empty) transform
+                        SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
+                        prev_xfrm := xfrm.name;
+                    END IF;
 
-        END IF;
+                    attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
 
-        visible_count := visible_count + 1;
+                ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
+                    SELECT  value::TEXT INTO attr_value
+                      FROM  biblio.marc21_physical_characteristics(NEW.id)
+                      WHERE subfield = attr_def.phys_char_sf
+                      LIMIT 1; -- Just in case ...
 
-        current_res.id = core_result.id;
-        current_res.rel = core_result.rel;
+                END IF;
 
-        tmp_int := 1;
-        IF metarecord THEN
-            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
-        END IF;
+                -- apply index normalizers to attr_value
+                FOR normalizer IN
+                    SELECT  n.func AS func,
+                            n.param_count AS param_count,
+                            m.params AS params
+                      FROM  config.index_normalizer n
+                            JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
+                      WHERE attr = attr_def.name
+                      ORDER BY m.pos LOOP
+                        EXECUTE 'SELECT ' || normalizer.func || '(' ||
+                            quote_literal( attr_value ) ||
+                            CASE
+                                WHEN normalizer.param_count > 0
+                                    THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+                                    ELSE ''
+                                END ||
+                            ')' INTO attr_value;
+        
+                END LOOP;
 
-        IF tmp_int = 1 THEN
-            current_res.record = core_result.records[1];
-        ELSE
-            current_res.record = NULL;
-        END IF;
+                -- Add the new value to the hstore
+                new_attrs := new_attrs || hstore( attr_def.name, attr_value );
 
-        RETURN NEXT current_res;
+            END LOOP;
 
-        IF visible_count % 1000 = 0 THEN
-            -- RAISE NOTICE ' % visible so far ... ', visible_count;
-        END IF;
+            IF TG_OP = 'INSERT' OR OLD.deleted THEN -- initial insert OR revivication
+                INSERT INTO metabib.record_attr (id, attrs) VALUES (NEW.id, new_attrs);
+            ELSE
+                UPDATE metabib.record_attr SET attrs = attrs || new_attrs WHERE id = NEW.id;
+            END IF;
 
-    END LOOP;
+        END IF;
+    END IF;
 
-    current_res.id = NULL;
-    current_res.rel = NULL;
-    current_res.record = NULL;
-    current_res.total = total_count;
-    current_res.checked = check_count;
-    current_res.deleted = deleted_count;
-    current_res.visible = visible_count;
-    current_res.excluded = excluded_count;
+    -- Gather and insert the field entry data
+    PERFORM metabib.reingest_metabib_field_entries(NEW.id);
 
-    CLOSE core_cursor;
+    -- Located URI magic
+    IF TG_OP = 'INSERT' THEN
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        END IF;
+    ELSE
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        END IF;
+    END IF;
 
-    RETURN NEXT current_res;
+    -- (re)map metarecord-bib linking
+    IF TG_OP = 'INSERT' THEN -- if not deleted and performing an insert, check for the flag
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_insert' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    ELSE -- we're doing an update, and we're not deleted, remap
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_update' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    END IF;
 
+    RETURN NEW;
 END;
 $func$ LANGUAGE PLPGSQL;
 
-CREATE OR REPLACE FUNCTION unapi.holdings_xml (bid BIGINT, ouid INT, org TEXT, depth INT DEFAULT NULL, includes TEXT[] DEFAULT NULL::TEXT[], slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE) RETURNS XML AS $F$
-     SELECT  XMLELEMENT(
-                 name holdings,
-                 XMLATTRIBUTES(
-                    CASE WHEN $8 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
-                    CASE WHEN ('bre' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN 'tag:open-ils.org:U2@bre/' || $1 || '/' || $3 ELSE NULL END AS id
-                 ),
-                 XMLELEMENT(
-                     name counts,
-                     (SELECT  XMLAGG(XMLELEMENT::XML) FROM (
-                         SELECT  XMLELEMENT(
-                                     name count,
-                                     XMLATTRIBUTES('public' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
-                                 )::text
-                           FROM  asset.opac_ou_record_copy_count($2,  $1)
-                                     UNION
-                         SELECT  XMLELEMENT(
-                                     name count,
-                                     XMLATTRIBUTES('staff' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
-                                 )::text
-                           FROM  asset.staff_ou_record_copy_count($2, $1)
-                                     ORDER BY 1
-                     )x)
-                 ),
-                 CASE
-                     WHEN ('bmp' = ANY ($5)) THEN
-                        XMLELEMENT( name monograph_parts,
-                            XMLAGG((SELECT unapi.bmp( id, 'xml', 'monograph_part', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'bre'), 'holdings_xml'), $3, $4, $6, $7, FALSE) FROM biblio.monograph_part WHERE record = $1))
-                        )
-                     ELSE NULL
-                 END,
-                 CASE WHEN ('acn' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN
-                     XMLELEMENT(
-                         name volumes,
-                         (SELECT XMLAGG(acn) FROM (
-                            SELECT  unapi.acn(acn.id,'xml','volume',evergreen.array_remove_item_by_value(evergreen.array_remove_item_by_value('{acn,auri}'::TEXT[] || $5,'holdings_xml'),'bre'), $3, $4, $6, $7, FALSE)
-                              FROM  asset.call_number acn
-                              WHERE acn.record = $1
-                                    AND EXISTS (
-                                        SELECT  1
-                                          FROM  asset.copy acp
-                                                JOIN actor.org_unit_descendants(
-                                                    $2,
-                                                    (COALESCE(
-                                                        $4,
-                                                        (SELECT aout.depth
-                                                          FROM  actor.org_unit_type aout
-                                                                JOIN actor.org_unit aou ON (aou.ou_type = aout.id AND aou.id = $2)
-                                                        )
-                                                    ))
-                                                ) aoud ON (acp.circ_lib = aoud.id)
-                                          LIMIT 1
-                                    )
-                              ORDER BY label_sortkey
-                              LIMIT $6
-                              OFFSET $7
-                         )x)
-                     )
-                 ELSE NULL END,
-                 CASE WHEN ('ssub' = ANY ('{acn,auri}'::TEXT[] || $5)) THEN
-                     XMLELEMENT(
-                         name subscriptions,
-                         (SELECT XMLAGG(ssub) FROM (
-                            SELECT  unapi.ssub(id,'xml','subscription','{}'::TEXT[], $3, $4, $6, $7, FALSE)
-                              FROM  serial.subscription
-                              WHERE record_entry = $1
-                        )x)
-                     )
-                 ELSE NULL END,
-                 CASE WHEN ('acp' = ANY ($5)) THEN
-                     XMLELEMENT(
-                         name foreign_copies,
-                         (SELECT XMLAGG(acp) FROM (
-                            SELECT  unapi.acp(p.target_copy,'xml','copy','{}'::TEXT[], $3, $4, $6, $7, FALSE)
-                              FROM  biblio.peer_bib_copy_map p
-                                    JOIN asset.copy c ON (p.target_copy = c.id)
-                              WHERE NOT c.deleted AND peer_record = $1
-                        )x)
-                     )
-                 ELSE NULL END
-             );
-$F$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION unapi.acp ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+-- 0513
+CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
         SELECT  XMLELEMENT(
-                    name copy,
+                    name attributes,
                     XMLATTRIBUTES(
-                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
-                        'tag:open-ils.org:U2@acp/' || id AS id,
-                        create_date, edit_date, copy_number, circulate, deposit,
-                        ref, holdable, deleted, deposit_amount, price, barcode,
-                        circ_modifier, circ_as_type, opac_visible
-                    ),
-                    unapi.ccs( status, $2, 'status', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
-                    unapi.acl( location, $2, 'location', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
-                    unapi.aou( circ_lib, $2, 'circ_lib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
-                    unapi.aou( circ_lib, $2, 'circlib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
-                    CASE WHEN ('acn' = ANY ($4)) THEN unapi.acn( call_number, $2, 'call_number', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) ELSE NULL END,
-                    XMLELEMENT( name copy_notes,
-                        CASE
-                            WHEN ('acpn' = ANY ($4)) THEN
-                                XMLAGG((SELECT unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.copy_note WHERE owning_copy = cp.id AND pub))
-                            ELSE NULL
-                        END
-                    ),
-                    XMLELEMENT( name statcats,
-                        CASE
-                            WHEN ('ascecm' = ANY ($4)) THEN
-                                XMLAGG((SELECT unapi.ascecm( stat_cat_entry, 'xml', 'statcat', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.stat_cat_entry_copy_map WHERE owning_copy = cp.id))
-                            ELSE NULL
-                        END
-                    ),
-                    XMLELEMENT( name foreign_records,
-                        CASE
-                            WHEN ('bre' = ANY ($4)) THEN
-                                XMLAGG((SELECT unapi.bre(peer_record,'marcxml','record','{}'::TEXT[], $5, $6, $7, $8, FALSE) FROM biblio.peer_bib_copy_map WHERE target_copy = cp.id))
-                            ELSE NULL
-                        END
-
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/indexing/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@mra/' || mra.id AS id,
+                        'tag:open-ils.org:U2@bre/' || mra.id AS record
                     ),
-                    CASE
-                        WHEN ('bmp' = ANY ($4)) THEN
-                            XMLELEMENT( name monograph_parts,
-                                XMLAGG((SELECT unapi.bmp( part, 'xml', 'monograph_part', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) FROM asset.copy_part_map WHERE target_copy = cp.id))
+                    (SELECT XMLAGG(foo.y)
+                      FROM (SELECT XMLELEMENT(
+                                name field,
+                                XMLATTRIBUTES(
+                                    key AS name,
+                                    cvm.value AS "coded-value",
+                                    rad.filter,
+                                    rad.sorter
+                                ),
+                                x.value
                             )
-                        ELSE NULL
-                    END
+                           FROM EACH(mra.attrs) AS x
+                                JOIN config.record_attr_definition rad ON (x.key = rad.name)
+                                LEFT JOIN config.coded_value_map cvm ON (cvm.ctype = x.key AND code = x.value)
+                        )foo(y)
+                    )
                 )
-          FROM  asset.copy cp
-          WHERE id = $1
-          GROUP BY id, status, location, circ_lib, call_number, create_date, edit_date, copy_number, circulate, deposit, ref, holdable, deleted, deposit_amount, price, barcode, circ_modifier, circ_as_type, opac_visible;
+          FROM  metabib.record_attr mra
+          WHERE mra.id = $1;
 $F$ LANGUAGE SQL;
 
-CREATE OR REPLACE FUNCTION asset.refresh_opac_visible_copies_mat_view () RETURNS VOID AS $$
-
-    TRUNCATE TABLE asset.opac_visible_copies;
-
-    INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
-    SELECT  cp.id, cp.circ_lib, cn.record
-    FROM  asset.copy cp
-        JOIN asset.call_number cn ON (cn.id = cp.call_number)
-        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-        JOIN asset.copy_location cl ON (cp.location = cl.id)
-        JOIN config.copy_status cs ON (cp.status = cs.id)
-        JOIN biblio.record_entry b ON (cn.record = b.id)
-    WHERE NOT cp.deleted
-        AND NOT cn.deleted
-        AND NOT b.deleted
-        AND cs.opac_visible
-        AND cl.opac_visible
-        AND cp.opac_visible
-        AND a.opac_visible
-            UNION
-    SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record
-    FROM  asset.copy cp
-        JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
-        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-        JOIN asset.copy_location cl ON (cp.location = cl.id)
-        JOIN config.copy_status cs ON (cp.status = cs.id)
-    WHERE NOT cp.deleted
-        AND cs.opac_visible
-        AND cl.opac_visible
-        AND cp.opac_visible
-        AND a.opac_visible;
-
-$$ LANGUAGE SQL;
-COMMENT ON FUNCTION asset.refresh_opac_visible_copies_mat_view() IS $$
-Rebuild the copy OPAC visibility cache.  Useful during migrations.
-$$;
-
-SELECT asset.refresh_opac_visible_copies_mat_view();
-CREATE INDEX opac_visible_copies_idx1 on asset.opac_visible_copies (record, circ_lib);
-CREATE INDEX opac_visible_copies_copy_id_idx on asset.opac_visible_copies (copy_id);
-CREATE UNIQUE INDEX opac_visible_copies_once_per_record_idx on asset.opac_visible_copies (copy_id, record);
-CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
 DECLARE
-    add_query       TEXT;
-    remove_query    TEXT;
-    do_add          BOOLEAN := false;
-    do_remove       BOOLEAN := false;
+    me      biblio.record_entry%ROWTYPE;
+    layout  unapi.bre_output_layout%ROWTYPE;
+    xfrm    config.xml_transform%ROWTYPE;
+    ouid    INT;
+    tmp_xml TEXT;
+    top_el  TEXT;
+    output  XML;
+    hxml    XML;
+    axml    XML;
 BEGIN
-    add_query := $$
-            INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
-              SELECT id, circ_lib, record FROM (
-                SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number
-                  FROM  asset.copy cp
-                        JOIN asset.call_number cn ON (cn.id = cp.call_number)
-                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                        JOIN asset.copy_location cl ON (cp.location = cl.id)
-                        JOIN config.copy_status cs ON (cp.status = cs.id)
-                        JOIN biblio.record_entry b ON (cn.record = b.id)
-                  WHERE NOT cp.deleted
-                        AND NOT cn.deleted
-                        AND NOT b.deleted
-                        AND cs.opac_visible
-                        AND cl.opac_visible
-                        AND cp.opac_visible
-                        AND a.opac_visible
-                            UNION
-                SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number
-                  FROM  asset.copy cp
-                        JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
-                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
-                        JOIN asset.copy_location cl ON (cp.location = cl.id)
-                        JOIN config.copy_status cs ON (cp.status = cs.id)
-                  WHERE NOT cp.deleted
-                        AND cs.opac_visible
-                        AND cl.opac_visible
-                        AND cp.opac_visible
-                        AND a.opac_visible
-                    ) AS x 
 
-    $$;
-    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
+    SELECT id INTO ouid FROM actor.org_unit WHERE shortname = org;
 
-    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
-        IF TG_OP = 'INSERT' THEN
-            add_query := add_query || 'WHERE x.id = ' || NEW.target_copy || ' AND x.record = ' || NEW.peer_record || ';';
-            EXECUTE add_query;
-            RETURN NEW;
-        ELSE
-            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
-            EXECUTE remove_query;
-            RETURN OLD;
-        END IF;
+    IF ouid IS NULL THEN
+        RETURN NULL::XML;
     END IF;
 
-    IF TG_OP = 'INSERT' THEN
-
-        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
-            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
-            EXECUTE add_query;
-        END IF;
+    IF format = 'holdings_xml' THEN -- the special case
+        output := unapi.holdings_xml( obj_id, ouid, org, depth, includes, slimit, soffset, include_xmlns);
+        RETURN output;
+    END IF;
 
-        RETURN NEW;
+    SELECT * INTO layout FROM unapi.bre_output_layout WHERE name = format;
 
+    IF layout.name IS NULL THEN
+        RETURN NULL::XML;
     END IF;
 
-    -- handle items first, since with circulation activity
-    -- their statuses change frequently
-    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+    SELECT * INTO xfrm FROM config.xml_transform WHERE name = layout.transform;
 
-        IF OLD.location    <> NEW.location OR
-           OLD.call_number <> NEW.call_number OR
-           OLD.status      <> NEW.status OR
-           OLD.circ_lib    <> NEW.circ_lib THEN
-            -- any of these could change visibility, but
-            -- we'll save some queries and not try to calculate
-            -- the change directly
-            do_remove := true;
-            do_add := true;
-        ELSE
+    SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
 
-            IF OLD.deleted <> NEW.deleted THEN
-                IF NEW.deleted THEN
-                    do_remove := true;
-                ELSE
-                    do_add := true;
-                END IF;
-            END IF;
+    -- grab SVF if we need them
+    IF ('mra' = ANY (includes)) THEN
+        axml := unapi.mra(obj_id,NULL,NULL,NULL,NULL);
+    ELSE
+        axml := NULL::XML;
+    END IF;
 
-            IF OLD.opac_visible <> NEW.opac_visible THEN
-                IF OLD.opac_visible THEN
-                    do_remove := true;
-                ELSIF NOT do_remove THEN -- handle edge case where deleted item
-                                        -- is also marked opac_visible
-                    do_add := true;
-                END IF;
-            END IF;
+    -- grab hodlings if we need them
+    IF ('holdings_xml' = ANY (includes)) THEN
+        hxml := unapi.holdings_xml(obj_id, ouid, org, depth, evergreen.array_remove_item_by_value(includes,'holdings_xml'), slimit, soffset, include_xmlns);
+    ELSE
+        hxml := NULL::XML;
+    END IF;
 
-        END IF;
 
-        IF do_remove THEN
-            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
-        END IF;
-        IF do_add THEN
-            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
-            EXECUTE add_query;
+    -- generate our item node
+
+
+    IF format = 'marcxml' THEN
+        tmp_xml := me.marc;
+        IF tmp_xml !~ E'<marc:' THEN -- If we're not using the prefixed namespace in this record, then remove all declarations of it
+           tmp_xml := REGEXP_REPLACE(tmp_xml, ' xmlns:marc="http://www.loc.gov/MARC21/slim"', '', 'g');
         END IF;
+    ELSE
+        tmp_xml := oils_xslt_process(me.marc, xfrm.xslt)::XML;
+    END IF;
 
-        RETURN NEW;
+    top_el := REGEXP_REPLACE(tmp_xml, E'^.*?<((?:\\S+:)?' || layout.holdings_element || ').*$', E'\\1');
 
+    IF axml IS NOT NULL THEN
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', axml || '</' || top_el || E'>\\1');
     END IF;
 
-    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
-        IF OLD.deleted AND NEW.deleted THEN -- do nothing
+    IF hxml IS NOT NULL THEN -- XXX how do we configure the holdings position?
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', hxml || '</' || top_el || E'>\\1');
+    END IF;
 
-            RETURN NEW;
-        ELSIF NEW.deleted THEN -- remove rows
-            IF TG_TABLE_NAME = 'call_number' THEN
-                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
-            ELSIF TG_TABLE_NAME = 'record_entry' THEN
-                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
-            END IF;
-            RETURN NEW;
-        ELSIF OLD.deleted THEN -- add rows
-            IF TG_TABLE_NAME IN ('copy','unit') THEN
-                add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
-            ELSIF TG_TABLE_NAME = 'call_number' THEN
-                add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
-            ELSIF TG_TABLE_NAME = 'record_entry' THEN
-                add_query := add_query || 'WHERE x.record = ' || NEW.id || ';';
-            END IF;
-            EXECUTE add_query;
-            RETURN NEW;
-        END IF;
+    IF ('bre.unapi' = ANY (includes)) THEN
+        output := REGEXP_REPLACE(
+            tmp_xml,
+            '</' || top_el || '>(.*?)',
+            XMLELEMENT(
+                name abbr,
+                XMLATTRIBUTES(
+                    'http://www.w3.org/1999/xhtml' AS xmlns,
+                    'unapi-id' AS class,
+                    'tag:open-ils.org:U2@bre/' || obj_id || '/' || org AS title
+                )
+            )::TEXT || '</' || top_el || E'>\\1'
+        );
+    ELSE
+        output := tmp_xml;
     END IF;
 
-    IF TG_TABLE_NAME = 'call_number' THEN
+    RETURN output;
+END;
+$F$ LANGUAGE PLPGSQL;
 
-        IF OLD.record <> NEW.record THEN
-            -- call number is linked to different bib
-            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
-            EXECUTE remove_query;
-            add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
-            EXECUTE add_query;
-        END IF;
 
-        RETURN NEW;
+-- 0514
+CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+DECLARE
+    me      biblio.record_entry%ROWTYPE;
+    layout  unapi.bre_output_layout%ROWTYPE;
+    xfrm    config.xml_transform%ROWTYPE;
+    ouid    INT;
+    tmp_xml TEXT;
+    top_el  TEXT;
+    output  XML;
+    hxml    XML;
+    axml    XML;
+BEGIN
 
+    SELECT id INTO ouid FROM actor.org_unit WHERE shortname = org;
+
+    IF ouid IS NULL THEN
+        RETURN NULL::XML;
     END IF;
 
-    IF TG_TABLE_NAME IN ('record_entry') THEN
-        RETURN NEW; -- don't have 'opac_visible'
+    IF format = 'holdings_xml' THEN -- the special case
+        output := unapi.holdings_xml( obj_id, ouid, org, depth, includes, slimit, soffset, include_xmlns);
+        RETURN output;
     END IF;
 
-    -- actor.org_unit, asset.copy_location, asset.copy_status
-    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
+    SELECT * INTO layout FROM unapi.bre_output_layout WHERE name = format;
 
-        RETURN NEW;
+    IF layout.name IS NULL THEN
+        RETURN NULL::XML;
+    END IF;
 
-    ELSIF NEW.opac_visible THEN -- add rows
+    SELECT * INTO xfrm FROM config.xml_transform WHERE name = layout.transform;
 
-        IF TG_TABLE_NAME = 'org_unit' THEN
-            add_query := add_query || 'AND cp.circ_lib = ' || NEW.id || ';';
-        ELSIF TG_TABLE_NAME = 'copy_location' THEN
-            add_query := add_query || 'AND cp.location = ' || NEW.id || ';';
-        ELSIF TG_TABLE_NAME = 'copy_status' THEN
-            add_query := add_query || 'AND cp.status = ' || NEW.id || ';';
-        END IF;
-        EXECUTE add_query;
-    ELSE -- delete rows
+    SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
 
-        IF TG_TABLE_NAME = 'org_unit' THEN
-            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
-        ELSIF TG_TABLE_NAME = 'copy_location' THEN
-            remove_query := remove_query || 'location = ' || NEW.id || ');';
-        ELSIF TG_TABLE_NAME = 'copy_status' THEN
-            remove_query := remove_query || 'status = ' || NEW.id || ');';
-        END IF;
-        EXECUTE remove_query;
+    -- grab SVF if we need them
+    IF ('mra' = ANY (includes)) THEN
+        axml := unapi.mra(obj_id,NULL,NULL,NULL,NULL);
+    ELSE
+        axml := NULL::XML;
     END IF;
-    RETURN NEW;
-END;
-$func$ LANGUAGE PLPGSQL;
-COMMENT ON FUNCTION asset.cache_copy_visibility() IS $$
-Trigger function to update the copy OPAC visiblity cache.
-$$;
 
-CREATE TRIGGER a_opac_vis_mat_view_tgr AFTER INSERT OR DELETE ON biblio.peer_bib_copy_map FOR EACH ROW EXECUTE PROCEDURE asset.cache_copy_visibility();
+    -- grab hodlings if we need them
+    IF ('holdings_xml' = ANY (includes)) THEN
+        hxml := unapi.holdings_xml(obj_id, ouid, org, depth, evergreen.array_remove_item_by_value(includes,'holdings_xml'), slimit, soffset, include_xmlns);
+    ELSE
+        hxml := NULL::XML;
+    END IF;
 
-CREATE OR REPLACE FUNCTION biblio.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
-DECLARE
-    transformed_xml TEXT;
-    prev_xfrm       TEXT;
-    normalizer      RECORD;
-    xfrm            config.xml_transform%ROWTYPE;
-    attr_value      TEXT;
-    new_attrs       HSTORE := ''::HSTORE;
-    attr_def        config.record_attr_definition%ROWTYPE;
-BEGIN
 
-    IF NEW.deleted IS TRUE THEN -- If this bib is deleted
-        DELETE FROM metabib.metarecord_source_map WHERE source = NEW.id; -- Rid ourselves of the search-estimate-killing linkage
-        DELETE FROM metabib.record_attr WHERE id = NEW.id; -- Kill the attrs hash, useless on deleted records
-        DELETE FROM authority.bib_linking WHERE bib = NEW.id; -- Avoid updating fields in bibs that are no longer visible
-        DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = NEW.id; -- Separate any multi-homed items
-        RETURN NEW; -- and we're done
-    END IF;
+    -- generate our item node
 
-    IF TG_OP = 'UPDATE' THEN -- re-ingest?
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
 
-        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
-            RETURN NEW;
+    IF format = 'marcxml' THEN
+        tmp_xml := me.marc;
+        IF tmp_xml !~ E'<marc:' THEN -- If we're not using the prefixed namespace in this record, then remove all declarations of it
+           tmp_xml := REGEXP_REPLACE(tmp_xml, ' xmlns:marc="http://www.loc.gov/MARC21/slim"', '', 'g');
         END IF;
+    ELSE
+        tmp_xml := oils_xslt_process(me.marc, xfrm.xslt)::XML;
     END IF;
 
-    -- Record authority linking
-    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_linking' AND enabled;
-    IF NOT FOUND THEN
-        PERFORM biblio.map_authority_linking( NEW.id, NEW.marc );
+    top_el := REGEXP_REPLACE(tmp_xml, E'^.*?<((?:\\S+:)?' || layout.holdings_element || ').*$', E'\\1');
+
+    IF axml IS NOT NULL THEN
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', axml || '</' || top_el || E'>\\1');
     END IF;
 
-    -- Flatten and insert the mfr data
-    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_full_rec' AND enabled;
-    IF NOT FOUND THEN
-        PERFORM metabib.reingest_metabib_full_rec(NEW.id);
+    IF hxml IS NOT NULL THEN -- XXX how do we configure the holdings position?
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', hxml || '</' || top_el || E'>\\1');
+    END IF;
 
-        -- Now we pull out attribute data, which is dependent on the mfr for all but XPath-based fields
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_rec_descriptor' AND enabled;
-        IF NOT FOUND THEN
-            FOR attr_def IN SELECT * FROM config.record_attr_definition ORDER BY format LOOP
+    IF ('bre.unapi' = ANY (includes)) THEN
+        output := REGEXP_REPLACE(
+            tmp_xml,
+            '</' || top_el || '>(.*?)',
+            XMLELEMENT(
+                name abbr,
+                XMLATTRIBUTES(
+                    'http://www.w3.org/1999/xhtml' AS xmlns,
+                    'unapi-id' AS class,
+                    'tag:open-ils.org:U2@bre/' || obj_id || '/' || org AS title
+                )
+            )::TEXT || '</' || top_el || E'>\\1'
+        );
+    ELSE
+        output := tmp_xml;
+    END IF;
 
-                IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
-                    SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(value), COALESCE(attr_def.joiner,' ')) INTO attr_value
-                      FROM  (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
-                      WHERE record = NEW.id
-                            AND tag LIKE attr_def.tag
-                            AND CASE
-                                WHEN attr_def.sf_list IS NOT NULL 
-                                    THEN POSITION(subfield IN attr_def.sf_list) > 0
-                                ELSE TRUE
-                                END
-                      GROUP BY tag
-                      ORDER BY tag
-                      LIMIT 1;
-
-                ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
-                    attr_value := biblio.marc21_extract_fixed_field(NEW.id, attr_def.fixed_field);
-
-                ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
-
-                    SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
-            
-                    -- See if we can skip the XSLT ... it's expensive
-                    IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
-                        -- Can't skip the transform
-                        IF xfrm.xslt <> '---' THEN
-                            transformed_xml := oils_xslt_process(NEW.marc,xfrm.xslt);
-                        ELSE
-                            transformed_xml := NEW.marc;
-                        END IF;
-            
-                        prev_xfrm := xfrm.name;
-                    END IF;
-
-                    IF xfrm.name IS NULL THEN
-                        -- just grab the marcxml (empty) transform
-                        SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
-                        prev_xfrm := xfrm.name;
-                    END IF;
-
-                    attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
-
-                ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
-                    SELECT  value::TEXT INTO attr_value
-                      FROM  biblio.marc21_physical_characteristics(NEW.id)
-                      WHERE subfield = attr_def.phys_char_sf
-                      LIMIT 1; -- Just in case ...
+    output := REGEXP_REPLACE(output::TEXT,E'>\\s+<','><','gs')::XML;
+    RETURN output;
+END;
+$F$ LANGUAGE PLPGSQL;
 
-                END IF;
 
-                -- apply index normalizers to attr_value
-                FOR normalizer IN
-                    SELECT  n.func AS func,
-                            n.param_count AS param_count,
-                            m.params AS params
-                      FROM  config.index_normalizer n
-                            JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
-                      WHERE attr = attr_def.name
-                      ORDER BY m.pos LOOP
-                        EXECUTE 'SELECT ' || normalizer.func || '(' ||
-                            quote_literal( attr_value ) ||
-                            CASE
-                                WHEN normalizer.param_count > 0
-                                    THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
-                                    ELSE ''
-                                END ||
-                            ')' INTO attr_value;
-        
-                END LOOP;
 
-                -- Add the new value to the hstore
-                new_attrs := new_attrs || hstore( attr_def.name, attr_value );
+-- 0516
+CREATE OR REPLACE FUNCTION public.extract_acq_marc_field ( BIGINT, TEXT, TEXT) RETURNS TEXT AS $$    
+    SELECT extract_marc_field('acq.lineitem', $1, $2, $3);
+$$ LANGUAGE SQL;
 
+-- 0518
+CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field( marc TEXT, ff TEXT ) RETURNS TEXT AS $func$
+DECLARE
+    rtype       TEXT;
+    ff_pos      RECORD;
+    tag_data    RECORD;
+    val         TEXT;
+BEGIN
+    rtype := (vandelay.marc21_record_type( marc )).code;
+    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE fixed_field = ff AND rec_type = rtype ORDER BY tag DESC LOOP
+        IF ff_pos.tag = 'ldr' THEN
+            val := oils_xpath_string('//*[local-name()="leader"]', marc);
+            IF val IS NOT NULL THEN
+                val := SUBSTRING( val, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN val;
+            END IF;
+        ELSE 
+            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
+                val := SUBSTRING( tag_data.value, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN val;
             END LOOP;
+        END IF;
+        val := REPEAT( ff_pos.default_val, ff_pos.length );
+        RETURN val;
+    END LOOP;
 
-            IF TG_OP = 'INSERT' OR OLD.deleted THEN -- initial insert OR revivication
-                INSERT INTO metabib.record_attr (id, attrs) VALUES (NEW.id, new_attrs);
-            ELSE
-                UPDATE metabib.record_attr SET attrs = attrs || new_attrs WHERE id = NEW.id;
-            END IF;
+    RETURN NULL;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-        END IF;
-    END IF;
 
-    -- Gather and insert the field entry data
-    PERFORM metabib.reingest_metabib_field_entries(NEW.id);
+-- 0519
+CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT ) RETURNS SETOF biblio.record_ff_map AS $func$
+DECLARE
+    tag_data    TEXT;
+    rtype       TEXT;
+    ff_pos      RECORD;
+    output      biblio.record_ff_map%ROWTYPE;
+BEGIN
+    rtype := (vandelay.marc21_record_type( marc )).code;
 
-    -- Located URI magic
-    IF TG_OP = 'INSERT' THEN
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
-        END IF;
-    ELSE
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
-        END IF;
-    END IF;
+    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE rec_type = rtype ORDER BY tag DESC LOOP
+        output.ff_name  := ff_pos.fixed_field;
+        output.ff_value := NULL;
 
-    -- (re)map metarecord-bib linking
-    IF TG_OP = 'INSERT' THEN -- if not deleted and performing an insert, check for the flag
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_insert' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
-        END IF;
-    ELSE -- we're doing an update, and we're not deleted, remap
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_update' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        IF ff_pos.tag = 'ldr' THEN
+            output.ff_value := oils_xpath_string('//*[local-name()="leader"]', marc);
+            IF output.ff_value IS NOT NULL THEN
+                output.ff_value := SUBSTRING( output.ff_value, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN NEXT output;
+                output.ff_value := NULL;
+            END IF;
+        ELSE
+            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
+                output.ff_value := SUBSTRING( tag_data, ff_pos.start_pos + 1, ff_pos.length );
+                IF output.ff_value IS NULL THEN output.ff_value := REPEAT( ff_pos.default_val, ff_pos.length ); END IF;
+                RETURN NEXT output;
+                output.ff_value := NULL;
+            END LOOP;
         END IF;
-    END IF;
+    
+    END LOOP;
 
-    RETURN NEW;
+    RETURN;
 END;
 $func$ LANGUAGE PLPGSQL;
 
--- 0513
-CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
-        SELECT  XMLELEMENT(
-                    name attributes,
-                    XMLATTRIBUTES(
-                        CASE WHEN $9 THEN 'http://open-ils.org/spec/indexing/v1' ELSE NULL END AS xmlns,
-                        'tag:open-ils.org:U2@mra/' || mra.id AS id,
-                        'tag:open-ils.org:U2@bre/' || mra.id AS record
-                    ),
-                    (SELECT XMLAGG(foo.y)
-                      FROM (SELECT XMLELEMENT(
-                                name field,
-                                XMLATTRIBUTES(
-                                    key AS name,
-                                    cvm.value AS "coded-value",
-                                    rad.filter,
-                                    rad.sorter
-                                ),
-                                x.value
-                            )
-                           FROM EACH(mra.attrs) AS x
-                                JOIN config.record_attr_definition rad ON (x.key = rad.name)
-                                LEFT JOIN config.coded_value_map cvm ON (cvm.ctype = x.key AND code = x.value)
-                        )foo(y)
-                    )
-                )
-          FROM  metabib.record_attr mra
-          WHERE mra.id = $1;
-$F$ LANGUAGE SQL;
 
-CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+-- 0521
+CREATE OR REPLACE FUNCTION biblio.extract_located_uris( bib_id BIGINT, marcxml TEXT, editor_id INT ) RETURNS VOID AS $func$
 DECLARE
-    me      biblio.record_entry%ROWTYPE;
-    layout  unapi.bre_output_layout%ROWTYPE;
-    xfrm    config.xml_transform%ROWTYPE;
-    ouid    INT;
-    tmp_xml TEXT;
-    top_el  TEXT;
-    output  XML;
-    hxml    XML;
-    axml    XML;
+    uris            TEXT[];
+    uri_xml         TEXT;
+    uri_label       TEXT;
+    uri_href        TEXT;
+    uri_use         TEXT;
+    uri_owner_list  TEXT[];
+    uri_owner       TEXT;
+    uri_owner_id    INT;
+    uri_id          INT;
+    uri_cn_id       INT;
+    uri_map_id      INT;
 BEGIN
 
-    SELECT id INTO ouid FROM actor.org_unit WHERE shortname = org;
-
-    IF ouid IS NULL THEN
-        RETURN NULL::XML;
-    END IF;
-
-    IF format = 'holdings_xml' THEN -- the special case
-        output := unapi.holdings_xml( obj_id, ouid, org, depth, includes, slimit, soffset, include_xmlns);
-        RETURN output;
-    END IF;
+    -- Clear any URI mappings and call numbers for this bib.
+    -- This leads to acn / auricnm inflation, but also enables
+    -- old acn/auricnm's to go away and for bibs to be deleted.
+    FOR uri_cn_id IN SELECT id FROM asset.call_number WHERE record = bib_id AND label = '##URI##' AND NOT deleted LOOP
+        DELETE FROM asset.uri_call_number_map WHERE call_number = uri_cn_id;
+        DELETE FROM asset.call_number WHERE id = uri_cn_id;
+    END LOOP;
 
-    SELECT * INTO layout FROM unapi.bre_output_layout WHERE name = format;
+    uris := oils_xpath('//*[@tag="856" and (@ind1="4" or @ind1="1") and (@ind2="0" or @ind2="1")]',marcxml);
+    IF ARRAY_UPPER(uris,1) > 0 THEN
+        FOR i IN 1 .. ARRAY_UPPER(uris, 1) LOOP
+            -- First we pull info out of the 856
+            uri_xml     := uris[i];
 
-    IF layout.name IS NULL THEN
-        RETURN NULL::XML;
-    END IF;
+            uri_href    := (oils_xpath('//*[@code="u"]/text()',uri_xml))[1];
+            uri_label   := (oils_xpath('//*[@code="y"]/text()|//*[@code="3"]/text()|//*[@code="u"]/text()',uri_xml))[1];
+            uri_use     := (oils_xpath('//*[@code="z"]/text()|//*[@code="2"]/text()|//*[@code="n"]/text()',uri_xml))[1];
+            CONTINUE WHEN uri_href IS NULL OR uri_label IS NULL;
 
-    SELECT * INTO xfrm FROM config.xml_transform WHERE name = layout.transform;
+            -- Get the distinct list of libraries wanting to use 
+            SELECT  ARRAY_ACCUM(
+                        DISTINCT REGEXP_REPLACE(
+                            x,
+                            $re$^.*?\((\w+)\).*$$re$,
+                            E'\\1'
+                        )
+                    ) INTO uri_owner_list
+              FROM  UNNEST(
+                        oils_xpath(
+                            '//*[@code="9"]/text()|//*[@code="w"]/text()|//*[@code="n"]/text()',
+                            uri_xml
+                        )
+                    )x;
 
-    SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
+            IF ARRAY_UPPER(uri_owner_list,1) > 0 THEN
 
-    -- grab SVF if we need them
-    IF ('mra' = ANY (includes)) THEN
-        axml := unapi.mra(obj_id,NULL,NULL,NULL,NULL);
-    ELSE
-        axml := NULL::XML;
+                -- look for a matching uri
+                SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                IF NOT FOUND THEN -- create one
+                    INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
+                    IF uri_use IS NULL THEN
+                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction IS NULL AND active;
+                    ELSE
+                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                    END IF;
+                END IF;
+
+                FOR j IN 1 .. ARRAY_UPPER(uri_owner_list, 1) LOOP
+                    uri_owner := uri_owner_list[j];
+
+                    SELECT id INTO uri_owner_id FROM actor.org_unit WHERE shortname = uri_owner;
+                    CONTINUE WHEN NOT FOUND;
+
+                    -- we need a call number to link through
+                    SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.call_number (owning_lib, record, create_date, edit_date, creator, editor, label)
+                            VALUES (uri_owner_id, bib_id, 'now', 'now', editor_id, editor_id, '##URI##');
+                        SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    END IF;
+
+                    -- now, link them if they're not already
+                    SELECT id INTO uri_map_id FROM asset.uri_call_number_map WHERE call_number = uri_cn_id AND uri = uri_id;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.uri_call_number_map (call_number, uri) VALUES (uri_cn_id, uri_id);
+                    END IF;
+
+                END LOOP;
+
+            END IF;
+
+        END LOOP;
     END IF;
 
-    -- grab hodlings if we need them
-    IF ('holdings_xml' = ANY (includes)) THEN
-        hxml := unapi.holdings_xml(obj_id, ouid, org, depth, evergreen.array_remove_item_by_value(includes,'holdings_xml'), slimit, soffset, include_xmlns);
-    ELSE
-        hxml := NULL::XML;
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+-- 0522
+UPDATE config.org_unit_setting_type SET datatype = 'string' WHERE name = 'ui.general.button_bar';
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype) VALUES ('ui.general.hotkeyset', 'GUI: Default Hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset).  Examples: Default, Minimal, and None', 'string');
+
+UPDATE actor.org_unit_setting SET value='"circ"' WHERE name = 'ui.general.button_bar' AND value='true';
+
+UPDATE actor.org_unit_setting SET value='"none"' WHERE name = 'ui.general.button_bar' AND value='false';
+
+
+-- 0523
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype, fm_class ) VALUES
+( 'cat.default_copy_status_fast',
+  oils_i18n_gettext( 'cat.default_copy_status_fast', 'Cataloging: Default copy status (fast add)', 'coust', 'label'),
+  oils_i18n_gettext( 'cat.default_copy_status_fast', 'Default status when a copy is created using the "Fast Add" interface.', 'coust', 'description'),
+  'link', 'ccs'
+);
+
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype, fm_class ) VALUES
+( 'cat.default_copy_status_normal',
+  oils_i18n_gettext( 'cat.default_copy_status_normal', 'Cataloging: Default copy status (normal)', 'coust', 'label'),
+  oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal volume/copy creator interface.', 'coust', 'description'),
+  'link', 'ccs'
+);
+
+-- 0524
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype ) VALUES
+( 'ui.unified_volume_copy_editor',
+  oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Volume/Item Creator/Editor', 'coust', 'label'),
+  oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'),
+  'bool'
+);
+
+-- 0525
+CREATE OR REPLACE FUNCTION biblio.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
+DECLARE
+    transformed_xml TEXT;
+    prev_xfrm       TEXT;
+    normalizer      RECORD;
+    xfrm            config.xml_transform%ROWTYPE;
+    attr_value      TEXT;
+    new_attrs       HSTORE := ''::HSTORE;
+    attr_def        config.record_attr_definition%ROWTYPE;
+BEGIN
+
+    IF NEW.deleted IS TRUE THEN -- If this bib is deleted
+        DELETE FROM metabib.metarecord_source_map WHERE source = NEW.id; -- Rid ourselves of the search-estimate-killing linkage
+        DELETE FROM metabib.record_attr WHERE id = NEW.id; -- Kill the attrs hash, useless on deleted records
+        DELETE FROM authority.bib_linking WHERE bib = NEW.id; -- Avoid updating fields in bibs that are no longer visible
+        DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = NEW.id; -- Separate any multi-homed items
+        RETURN NEW; -- and we're done
     END IF;
 
+    IF TG_OP = 'UPDATE' THEN -- re-ingest?
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
+
+        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+            RETURN NEW;
+        END IF;
+    END IF;
 
-    -- generate our item node
+    -- Record authority linking
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_linking' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM biblio.map_authority_linking( NEW.id, NEW.marc );
+    END IF;
 
+    -- Flatten and insert the mfr data
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_full_rec' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM metabib.reingest_metabib_full_rec(NEW.id);
 
-    IF format = 'marcxml' THEN
-        tmp_xml := me.marc;
-        IF tmp_xml !~ E'<marc:' THEN -- If we're not using the prefixed namespace in this record, then remove all declarations of it
-           tmp_xml := REGEXP_REPLACE(tmp_xml, ' xmlns:marc="http://www.loc.gov/MARC21/slim"', '', 'g');
+        -- Now we pull out attribute data, which is dependent on the mfr for all but XPath-based fields
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_rec_descriptor' AND enabled;
+        IF NOT FOUND THEN
+            FOR attr_def IN SELECT * FROM config.record_attr_definition ORDER BY format LOOP
+
+                IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
+                    SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(value), COALESCE(attr_def.joiner,' ')) INTO attr_value
+                      FROM  (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
+                      WHERE record = NEW.id
+                            AND tag LIKE attr_def.tag
+                            AND CASE
+                                WHEN attr_def.sf_list IS NOT NULL 
+                                    THEN POSITION(subfield IN attr_def.sf_list) > 0
+                                ELSE TRUE
+                                END
+                      GROUP BY tag
+                      ORDER BY tag
+                      LIMIT 1;
+
+                ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
+                    attr_value := biblio.marc21_extract_fixed_field(NEW.id, attr_def.fixed_field);
+
+                ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+
+                    SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
+            
+                    -- See if we can skip the XSLT ... it's expensive
+                    IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+                        -- Can't skip the transform
+                        IF xfrm.xslt <> '---' THEN
+                            transformed_xml := oils_xslt_process(NEW.marc,xfrm.xslt);
+                        ELSE
+                            transformed_xml := NEW.marc;
+                        END IF;
+            
+                        prev_xfrm := xfrm.name;
+                    END IF;
+
+                    IF xfrm.name IS NULL THEN
+                        -- just grab the marcxml (empty) transform
+                        SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
+                        prev_xfrm := xfrm.name;
+                    END IF;
+
+                    attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
+
+                ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
+                    SELECT  m.value INTO attr_value
+                      FROM  biblio.marc21_physical_characteristics(NEW.id) v
+                            JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value)
+                      WHERE v.subfield = attr_def.phys_char_sf
+                      LIMIT 1; -- Just in case ...
+
+                END IF;
+
+                -- apply index normalizers to attr_value
+                FOR normalizer IN
+                    SELECT  n.func AS func,
+                            n.param_count AS param_count,
+                            m.params AS params
+                      FROM  config.index_normalizer n
+                            JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
+                      WHERE attr = attr_def.name
+                      ORDER BY m.pos LOOP
+                        EXECUTE 'SELECT ' || normalizer.func || '(' ||
+                            quote_literal( attr_value ) ||
+                            CASE
+                                WHEN normalizer.param_count > 0
+                                    THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+                                    ELSE ''
+                                END ||
+                            ')' INTO attr_value;
+        
+                END LOOP;
+
+                -- Add the new value to the hstore
+                new_attrs := new_attrs || hstore( attr_def.name, attr_value );
+
+            END LOOP;
+
+            IF TG_OP = 'INSERT' OR OLD.deleted THEN -- initial insert OR revivication
+                INSERT INTO metabib.record_attr (id, attrs) VALUES (NEW.id, new_attrs);
+            ELSE
+                UPDATE metabib.record_attr SET attrs = attrs || new_attrs WHERE id = NEW.id;
+            END IF;
+
+        END IF;
+    END IF;
+
+    -- Gather and insert the field entry data
+    PERFORM metabib.reingest_metabib_field_entries(NEW.id);
+
+    -- Located URI magic
+    IF TG_OP = 'INSERT' THEN
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
         END IF;
     ELSE
-        tmp_xml := oils_xslt_process(me.marc, xfrm.xslt)::XML;
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        END IF;
     END IF;
 
-    top_el := REGEXP_REPLACE(tmp_xml, E'^.*?<((?:\\S+:)?' || layout.holdings_element || ').*$', E'\\1');
+    -- (re)map metarecord-bib linking
+    IF TG_OP = 'INSERT' THEN -- if not deleted and performing an insert, check for the flag
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_insert' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    ELSE -- we're doing an update, and we're not deleted, remap
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_update' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+ALTER TABLE config.circ_matrix_weights ADD COLUMN marc_bib_level NUMERIC(6,2) NOT NULL DEFAULT 0.0;
+
+UPDATE config.circ_matrix_weights
+SET marc_bib_level = marc_vr_format;
+
+ALTER TABLE config.hold_matrix_weights ADD COLUMN marc_bib_level NUMERIC(6, 2) NOT NULL DEFAULT 0.0;
+
+UPDATE config.hold_matrix_weights
+SET marc_bib_level = marc_vr_format;
+
+ALTER TABLE config.circ_matrix_weights ALTER COLUMN marc_bib_level DROP DEFAULT;
+
+ALTER TABLE config.hold_matrix_weights ALTER COLUMN marc_bib_level DROP DEFAULT;
+
+CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, item_object asset.copy, user_object actor.usr, renewal BOOL ) RETURNS action.found_circ_matrix_matchpoint AS $func$
+DECLARE
+    cn_object       asset.call_number%ROWTYPE;
+    rec_descriptor  metabib.rec_descriptor%ROWTYPE;
+    cur_matchpoint  config.circ_matrix_matchpoint%ROWTYPE;
+    matchpoint      config.circ_matrix_matchpoint%ROWTYPE;
+    weights         config.circ_matrix_weights%ROWTYPE;
+    user_age        INTERVAL;
+    denominator     NUMERIC(6,2);
+    row_list        INT[];
+    result          action.found_circ_matrix_matchpoint;
+BEGIN
+    -- Assume failure
+    result.success = false;
+
+    -- Fetch useful data
+    SELECT INTO cn_object       * FROM asset.call_number        WHERE id = item_object.call_number;
+    SELECT INTO rec_descriptor  * FROM metabib.rec_descriptor   WHERE record = cn_object.record;
+
+    -- Pre-generate this so we only calc it once
+    IF user_object.dob IS NOT NULL THEN
+        SELECT INTO user_age age(user_object.dob);
+    END IF;
+
+    -- Grab the closest set circ weight setting.
+    SELECT INTO weights cw.*
+      FROM config.weight_assoc wa
+           JOIN config.circ_matrix_weights cw ON (cw.id = wa.circ_weights)
+           JOIN actor.org_unit_ancestors_distance( context_ou ) d ON (wa.org_unit = d.id)
+      WHERE active
+      ORDER BY d.distance
+      LIMIT 1;
+
+    -- No weights? Bad admin! Defaults to handle that anyway.
+    IF weights.id IS NULL THEN
+        weights.grp                 := 11.0;
+        weights.org_unit            := 10.0;
+        weights.circ_modifier       := 5.0;
+        weights.marc_type           := 4.0;
+        weights.marc_form           := 3.0;
+        weights.marc_bib_level      := 2.0;
+        weights.marc_vr_format      := 2.0;
+        weights.copy_circ_lib       := 8.0;
+        weights.copy_owning_lib     := 8.0;
+        weights.user_home_ou        := 8.0;
+        weights.ref_flag            := 1.0;
+        weights.juvenile_flag       := 6.0;
+        weights.is_renewal          := 7.0;
+        weights.usr_age_lower_bound := 0.0;
+        weights.usr_age_upper_bound := 0.0;
+    END IF;
+
+    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
+    -- If you break your org tree with funky parenting this may be wrong
+    -- Note: This CTE is duplicated in the find_hold_matrix_matchpoint function, and it may be a good idea to split it off to a function
+    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
+    WITH all_distance(distance) AS (
+            SELECT depth AS distance FROM actor.org_unit_type
+        UNION
+                   SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
+       )
+    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+
+    -- Loop over all the potential matchpoints
+    FOR cur_matchpoint IN
+        SELECT m.*
+          FROM  config.circ_matrix_matchpoint m
+                /*LEFT*/ JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.grp = upgad.id
+                /*LEFT*/ JOIN actor.org_unit_ancestors_distance( context_ou ) ctoua ON m.org_unit = ctoua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( cn_object.owning_lib ) cnoua ON m.copy_owning_lib = cnoua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.copy_circ_lib = iooua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
+          WHERE m.active
+                -- Permission Groups
+             -- AND (m.grp                      IS NULL OR upgad.id IS NOT NULL) -- Optional Permission Group?
+                -- Org Units
+             -- AND (m.org_unit                 IS NULL OR ctoua.id IS NOT NULL) -- Optional Org Unit?
+                AND (m.copy_owning_lib          IS NULL OR cnoua.id IS NOT NULL)
+                AND (m.copy_circ_lib            IS NULL OR iooua.id IS NOT NULL)
+                AND (m.user_home_ou             IS NULL OR uhoua.id IS NOT NULL)
+                -- Circ Type
+                AND (m.is_renewal               IS NULL OR m.is_renewal = renewal)
+                -- Static User Checks
+                AND (m.juvenile_flag            IS NULL OR m.juvenile_flag = user_object.juvenile)
+                AND (m.usr_age_lower_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_lower_bound < user_age))
+                AND (m.usr_age_upper_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_upper_bound > user_age))
+                -- Static Item Checks
+                AND (m.circ_modifier            IS NULL OR m.circ_modifier = item_object.circ_modifier)
+                AND (m.marc_type                IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
+                AND (m.marc_form                IS NULL OR m.marc_form = rec_descriptor.item_form)
+                AND (m.marc_bib_level           IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
+                AND (m.marc_vr_format           IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
+                AND (m.ref_flag                 IS NULL OR m.ref_flag = item_object.ref)
+          ORDER BY
+                -- Permission Groups
+                CASE WHEN upgad.distance        IS NOT NULL THEN 2^(2*weights.grp - (upgad.distance/denominator)) ELSE 0.0 END +
+                -- Org Units
+                CASE WHEN ctoua.distance        IS NOT NULL THEN 2^(2*weights.org_unit - (ctoua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN cnoua.distance        IS NOT NULL THEN 2^(2*weights.copy_owning_lib - (cnoua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN iooua.distance        IS NOT NULL THEN 2^(2*weights.copy_circ_lib - (iooua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN uhoua.distance        IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
+                -- Circ Type                    -- Note: 4^x is equiv to 2^(2*x)
+                CASE WHEN m.is_renewal          IS NOT NULL THEN 4^weights.is_renewal ELSE 0.0 END +
+                -- Static User Checks
+                CASE WHEN m.juvenile_flag       IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
+                CASE WHEN m.usr_age_lower_bound IS NOT NULL THEN 4^weights.usr_age_lower_bound ELSE 0.0 END +
+                CASE WHEN m.usr_age_upper_bound IS NOT NULL THEN 4^weights.usr_age_upper_bound ELSE 0.0 END +
+                -- Static Item Checks
+                CASE WHEN m.circ_modifier       IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
+                CASE WHEN m.marc_type           IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
+                CASE WHEN m.marc_form           IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
+                CASE WHEN m.marc_vr_format      IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
+                CASE WHEN m.ref_flag            IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END DESC,
+                -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
+                -- This prevents "we changed the table order by updating a rule, and we started getting different results"
+                m.id LOOP
+
+        -- Record the full matching row list
+        row_list := row_list || cur_matchpoint.id;
+
+        -- No matchpoint yet?
+        IF matchpoint.id IS NULL THEN
+            -- Take the entire matchpoint as a starting point
+            matchpoint := cur_matchpoint;
+            CONTINUE; -- No need to look at this row any more.
+        END IF;
+
+        -- Incomplete matchpoint?
+        IF matchpoint.circulate IS NULL THEN
+            matchpoint.circulate := cur_matchpoint.circulate;
+        END IF;
+        IF matchpoint.duration_rule IS NULL THEN
+            matchpoint.duration_rule := cur_matchpoint.duration_rule;
+        END IF;
+        IF matchpoint.recurring_fine_rule IS NULL THEN
+            matchpoint.recurring_fine_rule := cur_matchpoint.recurring_fine_rule;
+        END IF;
+        IF matchpoint.max_fine_rule IS NULL THEN
+            matchpoint.max_fine_rule := cur_matchpoint.max_fine_rule;
+        END IF;
+        IF matchpoint.hard_due_date IS NULL THEN
+            matchpoint.hard_due_date := cur_matchpoint.hard_due_date;
+        END IF;
+        IF matchpoint.total_copy_hold_ratio IS NULL THEN
+            matchpoint.total_copy_hold_ratio := cur_matchpoint.total_copy_hold_ratio;
+        END IF;
+        IF matchpoint.available_copy_hold_ratio IS NULL THEN
+            matchpoint.available_copy_hold_ratio := cur_matchpoint.available_copy_hold_ratio;
+        END IF;
+        IF matchpoint.renewals IS NULL THEN
+            matchpoint.renewals := cur_matchpoint.renewals;
+        END IF;
+        IF matchpoint.grace_period IS NULL THEN
+            matchpoint.grace_period := cur_matchpoint.grace_period;
+        END IF;
+    END LOOP;
+
+    -- Check required fields
+    IF matchpoint.circulate             IS NOT NULL AND
+       matchpoint.duration_rule         IS NOT NULL AND
+       matchpoint.recurring_fine_rule   IS NOT NULL AND
+       matchpoint.max_fine_rule         IS NOT NULL THEN
+        -- All there? We have a completed match.
+        result.success := true;
+    END IF;
+
+    -- Include the assembled matchpoint, even if it isn't complete
+    result.matchpoint := matchpoint;
+
+    -- Include (for debugging) the full list of matching rows
+    result.buildrows := row_list;
+
+    -- Hand the result back to caller
+    RETURN result;
+END;
+$func$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION action.find_hold_matrix_matchpoint(pickup_ou integer, request_ou integer, match_item bigint, match_user integer, match_requestor integer)
+  RETURNS integer AS
+$func$
+DECLARE
+    requestor_object    actor.usr%ROWTYPE;
+    user_object         actor.usr%ROWTYPE;
+    item_object         asset.copy%ROWTYPE;
+    item_cn_object      asset.call_number%ROWTYPE;
+    rec_descriptor      metabib.rec_descriptor%ROWTYPE;
+    matchpoint          config.hold_matrix_matchpoint%ROWTYPE;
+    weights             config.hold_matrix_weights%ROWTYPE;
+    denominator         NUMERIC(6,2);
+BEGIN
+    SELECT INTO user_object         * FROM actor.usr                WHERE id = match_user;
+    SELECT INTO requestor_object    * FROM actor.usr                WHERE id = match_requestor;
+    SELECT INTO item_object         * FROM asset.copy               WHERE id = match_item;
+    SELECT INTO item_cn_object      * FROM asset.call_number        WHERE id = item_object.call_number;
+    SELECT INTO rec_descriptor      * FROM metabib.rec_descriptor   WHERE record = item_cn_object.record;
+
+    -- The item's owner should probably be the one determining if the item is holdable
+    -- How to decide that is debatable. Decided to default to the circ library (where the item lives)
+    -- This flag will allow for setting it to the owning library (where the call number "lives")
+    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.weight_owner_not_circ' AND enabled;
+
+    -- Grab the closest set circ weight setting.
+    IF NOT FOUND THEN
+        -- Default to circ library
+        SELECT INTO weights hw.*
+          FROM config.weight_assoc wa
+               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
+               JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) d ON (wa.org_unit = d.id)
+          WHERE active
+          ORDER BY d.distance
+          LIMIT 1;
+    ELSE
+        -- Flag is set, use owning library
+        SELECT INTO weights hw.*
+          FROM config.weight_assoc wa
+               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
+               JOIN actor.org_unit_ancestors_distance( cn_object.owning_lib ) d ON (wa.org_unit = d.id)
+          WHERE active
+          ORDER BY d.distance
+          LIMIT 1;
+    END IF;
+
+    -- No weights? Bad admin! Defaults to handle that anyway.
+    IF weights.id IS NULL THEN
+        weights.user_home_ou    := 5.0;
+        weights.request_ou      := 5.0;
+        weights.pickup_ou       := 5.0;
+        weights.item_owning_ou  := 5.0;
+        weights.item_circ_ou    := 5.0;
+        weights.usr_grp         := 7.0;
+        weights.requestor_grp   := 8.0;
+        weights.circ_modifier   := 4.0;
+        weights.marc_type       := 3.0;
+        weights.marc_form       := 2.0;
+        weights.marc_bib_level  := 1.0;
+        weights.marc_vr_format  := 1.0;
+        weights.juvenile_flag   := 4.0;
+        weights.ref_flag        := 0.0;
+    END IF;
+
+    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
+    -- If you break your org tree with funky parenting this may be wrong
+    -- Note: This CTE is duplicated in the find_circ_matrix_matchpoint function, and it may be a good idea to split it off to a function
+    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
+    WITH all_distance(distance) AS (
+            SELECT depth AS distance FROM actor.org_unit_type
+        UNION
+            SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
+       )
+    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+
+    -- To ATTEMPT to make this work like it used to, make it reverse the user/requestor profile ids.
+    -- This may be better implemented as part of the upgrade script?
+    -- Set usr_grp = requestor_grp, requestor_grp = 1 or something when this flag is already set
+    -- Then remove this flag, of course.
+    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.usr_not_requestor' AND enabled;
+
+    IF FOUND THEN
+        -- Note: This, to me, is REALLY hacky. I put it in anyway.
+        -- If you can't tell, this is a single call swap on two variables.
+        SELECT INTO user_object.profile, requestor_object.profile
+                    requestor_object.profile, user_object.profile;
+    END IF;
+
+    -- Select the winning matchpoint into the matchpoint variable for returning
+    SELECT INTO matchpoint m.*
+      FROM  config.hold_matrix_matchpoint m
+            /*LEFT*/ JOIN permission.grp_ancestors_distance( requestor_object.profile ) rpgad ON m.requestor_grp = rpgad.id
+            LEFT JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.usr_grp = upgad.id
+            LEFT JOIN actor.org_unit_ancestors_distance( pickup_ou ) puoua ON m.pickup_ou = puoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( request_ou ) rqoua ON m.request_ou = rqoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( item_cn_object.owning_lib ) cnoua ON m.item_owning_ou = cnoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.item_circ_ou = iooua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
+      WHERE m.active
+            -- Permission Groups
+         -- AND (m.requestor_grp        IS NULL OR upgad.id IS NOT NULL) -- Optional Requestor Group?
+            AND (m.usr_grp              IS NULL OR upgad.id IS NOT NULL)
+            -- Org Units
+            AND (m.pickup_ou            IS NULL OR (puoua.id IS NOT NULL AND (puoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.request_ou           IS NULL OR (rqoua.id IS NOT NULL AND (rqoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.item_owning_ou       IS NULL OR (cnoua.id IS NOT NULL AND (cnoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.item_circ_ou         IS NULL OR (iooua.id IS NOT NULL AND (iooua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.user_home_ou         IS NULL OR (uhoua.id IS NOT NULL AND (uhoua.distance = 0 OR NOT m.strict_ou_match)))
+            -- Static User Checks
+            AND (m.juvenile_flag        IS NULL OR m.juvenile_flag = user_object.juvenile)
+            -- Static Item Checks
+            AND (m.circ_modifier        IS NULL OR m.circ_modifier = item_object.circ_modifier)
+            AND (m.marc_type            IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
+            AND (m.marc_form            IS NULL OR m.marc_form = rec_descriptor.item_form)
+            AND (m.marc_bib_level       IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
+            AND (m.marc_vr_format       IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
+            AND (m.ref_flag             IS NULL OR m.ref_flag = item_object.ref)
+      ORDER BY
+            -- Permission Groups
+            CASE WHEN rpgad.distance    IS NOT NULL THEN 2^(2*weights.requestor_grp - (rpgad.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN upgad.distance    IS NOT NULL THEN 2^(2*weights.usr_grp - (upgad.distance/denominator)) ELSE 0.0 END +
+            -- Org Units
+            CASE WHEN puoua.distance    IS NOT NULL THEN 2^(2*weights.pickup_ou - (puoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN rqoua.distance    IS NOT NULL THEN 2^(2*weights.request_ou - (rqoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN cnoua.distance    IS NOT NULL THEN 2^(2*weights.item_owning_ou - (cnoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN iooua.distance    IS NOT NULL THEN 2^(2*weights.item_circ_ou - (iooua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN uhoua.distance    IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
+            -- Static User Checks       -- Note: 4^x is equiv to 2^(2*x)
+            CASE WHEN m.juvenile_flag   IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
+            -- Static Item Checks
+            CASE WHEN m.circ_modifier   IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
+            CASE WHEN m.marc_type       IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
+            CASE WHEN m.marc_form       IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
+            CASE WHEN m.marc_vr_format  IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
+            CASE WHEN m.ref_flag        IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END DESC,
+            -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
+            -- This prevents "we changed the table order by updating a rule, and we started getting different results"
+            m.id;
+
+    -- Return just the ID for now
+    RETURN matchpoint.id;
+END;
+$func$ LANGUAGE 'plpgsql';
+
+-- 0528
+CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$
+use strict;
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+use Encode;
+use Unicode::Normalize;
+
+MARC::Charset->assume_unicode(1);
+
+my $record = MARC::Record->new_from_xml($_TD->{new}{marc});
+my $schema = $_TD->{table_schema};
+my $rec_id = $_TD->{new}{id};
+
+# Short-circuit if maintaining control numbers per MARC21 spec is not enabled
+my $enable = spi_exec_query("SELECT enabled FROM config.global_flag WHERE name = 'cat.maintain_control_numbers'");
+if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') {
+    return;
+}
+
+# Get the control number identifier from an OU setting based on $_TD->{new}{owner}
+my $ou_cni = 'EVRGRN';
+
+my $owner;
+if ($schema eq 'serial') {
+    $owner = $_TD->{new}{owning_lib};
+} else {
+    # are.owner and bre.owner can be null, so fall back to the consortial setting
+    $owner = $_TD->{new}{owner} || 1;
+}
+
+my $ous_rv = spi_exec_query("SELECT value FROM actor.org_unit_ancestor_setting('cat.marc_control_number_identifier', $owner)");
+if ($ous_rv->{processed}) {
+    $ou_cni = $ous_rv->{rows}[0]->{value};
+    $ou_cni =~ s/"//g; # Stupid VIM syntax highlighting"
+} else {
+    # Fall back to the shortname of the OU if there was no OU setting
+    $ous_rv = spi_exec_query("SELECT shortname FROM actor.org_unit WHERE id = $owner");
+    if ($ous_rv->{processed}) {
+        $ou_cni = $ous_rv->{rows}[0]->{shortname};
+    }
+}
+
+my ($create, $munge) = (0, 0);
+
+my @scns = $record->field('035');
+
+foreach my $id_field ('001', '003') {
+    my $spec_value;
+    my @controls = $record->field($id_field);
+
+    if ($id_field eq '001') {
+        $spec_value = $rec_id;
+    } else {
+        $spec_value = $ou_cni;
+    }
+
+    # Create the 001/003 if none exist
+    if (scalar(@controls) == 1) {
+        # Only one field; check to see if we need to munge it
+        unless (grep $_->data() eq $spec_value, @controls) {
+            $munge = 1;
+        }
+    } else {
+        # Delete the other fields, as with more than 1 001/003 we do not know which 003/001 to match
+        foreach my $control (@controls) {
+            unless ($control->data() eq $spec_value) {
+                $record->delete_field($control);
+            }
+        }
+        $record->insert_fields_ordered(MARC::Field->new($id_field, $spec_value));
+        $create = 1;
+    }
+}
+
+# Now, if we need to munge the 001, we will first push the existing 001/003
+# into the 035; but if the record did not have one (and one only) 001 and 003
+# to begin with, skip this process
+if ($munge and not $create) {
+    my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data();
+
+    # Do not create duplicate 035 fields
+    unless (grep $_->subfield('a') eq $scn, @scns) {
+        $record->insert_fields_ordered(MARC::Field->new('035', '', '', 'a' => $scn));
+    }
+}
+
+# Set the 001/003 and update the MARC
+if ($create or $munge) {
+    $record->field('001')->data($rec_id);
+    $record->field('003')->data($ou_cni);
+
+    my $xml = $record->as_xml_record();
+    $xml =~ s/\n//sgo;
+    $xml =~ s/^<\?xml.+\?\s*>//go;
+    $xml =~ s/>\s+</></go;
+    $xml =~ s/\p{Cc}//go;
+
+    # Embed a version of OpenILS::Application::AppUtils->entityize()
+    # to avoid having to set PERL5LIB for PostgreSQL as well
+
+    # If we are going to convert non-ASCII characters to XML entities,
+    # we had better be dealing with a UTF8 string to begin with
+    $xml = decode_utf8($xml);
+
+    $xml = NFC($xml);
+
+    # Convert raw ampersands to entities
+    $xml =~ s/&(?!\S+;)/&amp;/gso;
+
+    # Convert Unicode characters to entities
+    $xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
+
+    $xml =~ s/[\x00-\x1f]//go;
+    $_TD->{new}{marc} = $xml;
+
+    return "MODIFY";
+}
+
+return;
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.generate_overlay_template ( TEXT, BIGINT ) RETURNS TEXT AS $func$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift;
+    my $r = MARC::Record->new_from_xml( $xml );
+
+    return undef unless ($r);
+
+    my $id = shift() || $r->subfield( '901' => 'c' );
+    $id =~ s/^\s*(?:\([^)]+\))?\s*(.+)\s*?$/$1/;
+    return undef unless ($id); # We need an ID!
+
+    my $tmpl = MARC::Record->new();
+    $tmpl->encoding( 'UTF-8' );
+
+    my @rule_fields;
+    for my $field ( $r->field( '1..' ) ) { # Get main entry fields from the authority record
+
+        my $tag = $field->tag;
+        my $i1 = $field->indicator(1);
+        my $i2 = $field->indicator(2);
+        my $sf = join '', map { $_->[0] } $field->subfields;
+        my @data = map { @$_ } $field->subfields;
+
+        my @replace_them;
+
+        # Map the authority field to bib fields it can control.
+        if ($tag >= 100 and $tag <= 111) {       # names
+            @replace_them = map { $tag + $_ } (0, 300, 500, 600, 700);
+        } elsif ($tag eq '130') {                # uniform title
+            @replace_them = qw/130 240 440 730 830/;
+        } elsif ($tag >= 150 and $tag <= 155) {  # subjects
+            @replace_them = ($tag + 500);
+        } elsif ($tag >= 180 and $tag <= 185) {  # floating subdivisions
+            @replace_them = qw/100 400 600 700 800 110 410 610 710 810 111 411 611 711 811 130 240 440 730 830 650 651 655/;
+        } else {
+            next;
+        }
+
+        # Dummy up the bib-side data
+        $tmpl->append_fields(
+            map {
+                MARC::Field->new( $_, $i1, $i2, @data )
+            } @replace_them
+        );
+
+        # Construct some 'replace' rules
+        push @rule_fields, map { $_ . $sf . '[0~\)' .$id . '$]' } @replace_them;
+    }
+
+    # Insert the replace rules into the template
+    $tmpl->append_fields(
+        MARC::Field->new( '905' => ' ' => ' ' => 'r' => join(',', @rule_fields ) )
+    );
+
+    $xml = $tmpl->as_xml_record;
+    $xml =~ s/^<\?.+?\?>$//mo;
+    $xml =~ s/\n//sgo;
+    $xml =~ s/>\s+</></sgo;
+
+    return $xml;
+
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+    use strict;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $target_xml = shift;
+    my $source_xml = shift;
+    my $field_spec = shift;
+    my $force_add = shift || 0;
+
+    my $target_r = MARC::Record->new_from_xml( $target_xml );
+    my $source_r = MARC::Record->new_from_xml( $source_xml );
+
+    return $target_xml unless ($target_r && $source_r);
+
+    my @field_list = split(',', $field_spec);
+
+    my %fields;
+    for my $f (@field_list) {
+        $f =~ s/^\s*//; $f =~ s/\s*$//;
+        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
+            my $field = $1;
+            $field =~ s/\s+//;
+            my $sf = $2;
+            $sf =~ s/\s+//;
+            my $match = $3;
+            $match =~ s/^\s*//; $match =~ s/\s*$//;
+            $fields{$field} = { sf => [ split('', $sf) ] };
+            if ($match) {
+                my ($msf,$mre) = split('~', $match);
+                if (length($msf) > 0 and length($mre) > 0) {
+                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
+                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
+                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
+                }
+            }
+        }
+    }
+
+    for my $f ( keys %fields) {
+        if ( @{$fields{$f}{sf}} ) {
+            for my $from_field ($source_r->field( $f )) {
+                my @tos = $target_r->field( $f );
+                if (!@tos) {
+                    next if (exists($fields{$f}{match}) and !$force_add);
+                    my @new_fields = map { $_->clone } $source_r->field( $f );
+                    $target_r->insert_fields_ordered( @new_fields );
+                } else {
+                    for my $to_field (@tos) {
+                        if (exists($fields{$f}{match})) {
+                            next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
+                        }
+                        my @new_sf = map { ($_ => $from_field->subfield($_)) } @{$fields{$f}{sf}};
+                        $to_field->add_subfields( @new_sf );
+                    }
+                }
+            }
+        } else {
+            my @new_fields = map { $_->clone } $source_r->field( $f );
+            $target_r->insert_fields_ordered( @new_fields );
+        }
+    }
+
+    $target_xml = $target_r->as_xml_record;
+    $target_xml =~ s/^<\?.+?\?>$//mo;
+    $target_xml =~ s/\n//sgo;
+    $target_xml =~ s/>\s+</></sgo;
+
+    return $target_xml;
+
+$_$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( TEXT ) RETURNS TEXT AS $func$
+    use strict;
+    use warnings;
+
+    use utf8;
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF8');
+    use MARC::Charset;
+    use UUID::Tiny ':std';
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift() or return undef;
+
+    my $r;
+
+    # Prevent errors in XML parsing from blowing out ungracefully
+    eval {
+        $r = MARC::Record->new_from_xml( $xml );
+        1;
+    } or do {
+       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
+    };
+
+    if (!$r) {
+       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
+    }
+
+    # From http://www.loc.gov/standards/sourcelist/subject.html
+    my $thes_code_map = {
+        a => 'lcsh',
+        b => 'lcshac',
+        c => 'mesh',
+        d => 'nal',
+        k => 'cash',
+        n => 'notapplicable',
+        r => 'aat',
+        s => 'sears',
+        v => 'rvm',
+    };
+
+    # Default to "No attempt to code" if the leader is horribly broken
+    my $fixed_field = $r->field('008');
+    my $thes_char = '|';
+    if ($fixed_field) { 
+        $thes_char = substr($fixed_field->data(), 11, 1) || '|';
+    }
+
+    my $thes_code = 'UNDEFINED';
+
+    if ($thes_char eq 'z') {
+        # Grab the 040 $f per http://www.loc.gov/marc/authority/ad040.html
+        $thes_code = $r->subfield('040', 'f') || 'UNDEFINED';
+    } elsif ($thes_code_map->{$thes_char}) {
+        $thes_code = $thes_code_map->{$thes_char};
+    }
+
+    my $auth_txt = '';
+    my $head = $r->field('1..');
+    if ($head) {
+        # Concatenate all of these subfields together, prefixed by their code
+        # to prevent collisions along the lines of "Fiction, North Carolina"
+        foreach my $sf ($head->subfields()) {
+            $auth_txt .= '‡' . $sf->[0] . ' ' . $sf->[1];
+        }
+    }
+    
+    if ($auth_txt) {
+        my $stmt = spi_prepare('SELECT public.naco_normalize($1) AS norm_text', 'TEXT');
+        my $result = spi_exec_prepared($stmt, $auth_txt);
+        my $norm_txt = $result->{rows}[0]->{norm_text};
+        spi_freeplan($stmt);
+        undef($stmt);
+        return $head->tag() . "_" . $thes_code . " " . $norm_txt;
+    }
+
+    return 'NOHEADING_' . $thes_code . ' ' . create_uuid_as_string(UUID_MD5, $xml);
+$func$ LANGUAGE 'plperlu' IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION vandelay.strip_field ( xml TEXT, field TEXT ) RETURNS TEXT AS $_$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+    use strict;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift;
+    my $r = MARC::Record->new_from_xml( $xml );
+
+    return $xml unless ($r);
+
+    my $field_spec = shift;
+    my @field_list = split(',', $field_spec);
+
+    my %fields;
+    for my $f (@field_list) {
+        $f =~ s/^\s*//; $f =~ s/\s*$//;
+        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
+            my $field = $1;
+            $field =~ s/\s+//;
+            my $sf = $2;
+            $sf =~ s/\s+//;
+            my $match = $3;
+            $match =~ s/^\s*//; $match =~ s/\s*$//;
+            $fields{$field} = { sf => [ split('', $sf) ] };
+            if ($match) {
+                my ($msf,$mre) = split('~', $match);
+                if (length($msf) > 0 and length($mre) > 0) {
+                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
+                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
+                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
+                }
+            }
+        }
+    }
+
+    for my $f ( keys %fields) {
+        for my $to_field ($r->field( $f )) {
+            if (exists($fields{$f}{match})) {
+                next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
+            }
+
+            if ( @{$fields{$f}{sf}} ) {
+                $to_field->delete_subfield(code => $fields{$f}{sf});
+            } else {
+                $r->delete_field( $to_field );
+            }
+        }
+    }
+
+    $xml = $r->as_xml_record;
+    $xml =~ s/^<\?.+?\?>$//mo;
+    $xml =~ s/\n//sgo;
+    $xml =~ s/>\s+</></sgo;
+
+    return $xml;
+
+$_$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION biblio.flatten_marc ( TEXT ) RETURNS SETOF metabib.full_rec AS $func$
+
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+
+MARC::Charset->assume_unicode(1);
+
+my $xml = shift;
+my $r = MARC::Record->new_from_xml( $xml );
+
+return_next( { tag => 'LDR', value => $r->leader } );
+
+for my $f ( $r->fields ) {
+       if ($f->is_control_field) {
+               return_next({ tag => $f->tag, value => $f->data });
+       } else {
+               for my $s ($f->subfields) {
+                       return_next({
+                               tag      => $f->tag,
+                               ind1     => $f->indicator(1),
+                               ind2     => $f->indicator(2),
+                               subfield => $s->[0],
+                               value    => $s->[1]
+                       });
+
+                       if ( $f->tag eq '245' and $s->[0] eq 'a' ) {
+                               my $trim = $f->indicator(2) || 0;
+                               return_next({
+                                       tag      => 'tnf',
+                                       ind1     => $f->indicator(1),
+                                       ind2     => $f->indicator(2),
+                                       subfield => 'a',
+                                       value    => substr( $s->[1], $trim )
+                               });
+                       }
+               }
+       }
+}
+
+return undef;
+
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.flatten_marc ( TEXT ) RETURNS SETOF authority.full_rec AS $func$
+
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+
+MARC::Charset->assume_unicode(1);
+
+my $xml = shift;
+my $r = MARC::Record->new_from_xml( $xml );
+
+return_next( { tag => 'LDR', value => $r->leader } );
+
+for my $f ( $r->fields ) {
+    if ($f->is_control_field) {
+        return_next({ tag => $f->tag, value => $f->data });
+    } else {
+        for my $s ($f->subfields) {
+            return_next({
+                tag      => $f->tag,
+                ind1     => $f->indicator(1),
+                ind2     => $f->indicator(2),
+                subfield => $s->[0],
+                value    => $s->[1]
+            });
+
+        }
+    }
+}
+
+return undef;
+
+$func$ LANGUAGE PLPERLU;
+
+-- 0530
+CREATE INDEX actor_usr_day_phone_idx_numeric ON actor.usr USING BTREE 
+    (evergreen.lowercase(REGEXP_REPLACE(day_phone, '[^0-9]', '', 'g')));
+
+CREATE INDEX actor_usr_evening_phone_idx_numeric ON actor.usr USING BTREE 
+    (evergreen.lowercase(REGEXP_REPLACE(evening_phone, '[^0-9]', '', 'g')));
+
+CREATE INDEX actor_usr_other_phone_idx_numeric ON actor.usr USING BTREE 
+    (evergreen.lowercase(REGEXP_REPLACE(other_phone, '[^0-9]', '', 'g')));
+
+-- 0533
+CREATE OR REPLACE FUNCTION action.age_circ_on_delete () RETURNS TRIGGER AS $$
+DECLARE
+found char := 'N';
+BEGIN
+
+    -- If there are any renewals for this circulation, don't archive or delete
+    -- it yet.   We'll do so later, when we archive and delete the renewals.
+
+    SELECT 'Y' INTO found
+    FROM action.circulation
+    WHERE parent_circ = OLD.id
+    LIMIT 1;
+
+    IF found = 'Y' THEN
+        RETURN NULL;  -- don't delete
+       END IF;
+
+    -- Archive a copy of the old row to action.aged_circulation
+
+    INSERT INTO action.aged_circulation
+        (id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, grace_period, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
+        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ)
+      SELECT
+        id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, grace_period, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
+        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ
+        FROM action.all_circulation WHERE id = OLD.id;
+
+    RETURN OLD;
+END;
+$$ LANGUAGE 'plpgsql';
+
+-- 0534
+CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
+DECLARE
+    matchpoint_id        INT;
+    user_object        actor.usr%ROWTYPE;
+    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
+    standing_penalty    config.standing_penalty%ROWTYPE;
+    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
+    transit_source        actor.org_unit%ROWTYPE;
+    item_object        asset.copy%ROWTYPE;
+    item_cn_object     asset.call_number%ROWTYPE;
+    ou_skip              actor.org_unit_setting%ROWTYPE;
+    result            action.matrix_test_result;
+    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
+    hold_count        INT;
+    hold_transit_prox    INT;
+    frozen_hold_count    INT;
+    context_org_list    INT[];
+    done            BOOL := FALSE;
+BEGIN
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
+
+    result.success := TRUE;
+
+    -- Fail if we couldn't find a user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
+
+    -- Fail if we couldn't find a copy
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
+    result.matchpoint := matchpoint_id;
+
+    SELECT INTO ou_skip * FROM actor.org_unit_setting WHERE name = 'circ.holds.target_skip_me' AND org_unit = item_object.circ_lib;
+
+    -- Fail if the circ_lib for the item has circ.holds.target_skip_me set to true
+    IF ou_skip.id IS NOT NULL AND ou_skip.value = 'true' THEN
+        result.fail_part := 'circ.holds.target_skip_me';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if we couldn't find any matchpoint (requires a default)
+    IF matchpoint_id IS NULL THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
+
+    IF hold_test.holdable IS FALSE THEN
+        result.fail_part := 'config.hold_matrix_test.holdable';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    IF hold_test.transit_range IS NOT NULL THEN
+        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
+        ELSE
+            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
+        END IF;
+
+        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
+
+        IF NOT FOUND THEN
+            result.fail_part := 'transit_range';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE '%HOLD%' LOOP
+
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
+
+    IF hold_test.stop_blocked_user IS TRUE THEN
+        FOR standing_penalty IN
+            SELECT  DISTINCT csp.*
+              FROM  actor.usr_standing_penalty usp
+                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+              WHERE usr = match_user
+                    AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                    AND csp.block_list LIKE '%CIRC%' LOOP
+    
+            result.fail_part := standing_penalty.name;
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END LOOP;
+    END IF;
+
+    IF hold_test.max_holds IS NOT NULL AND NOT retargetting THEN
+        SELECT    INTO hold_count COUNT(*)
+          FROM    action.hold_request
+          WHERE    usr = match_user
+            AND fulfillment_time IS NULL
+            AND cancel_time IS NULL
+            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
+
+        IF hold_count >= hold_test.max_holds THEN
+            result.fail_part := 'config.hold_matrix_test.max_holds';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    IF item_object.age_protect IS NOT NULL THEN
+        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
+
+        IF item_object.create_date + age_protect_object.age > NOW() THEN
+            IF hold_test.distance_is_from_owner THEN
+                SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
+            ELSE
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
+            END IF;
+
+            IF hold_transit_prox > age_protect_object.prox THEN
+                result.fail_part := 'config.rule_age_hold_protect.prox';
+                result.success := FALSE;
+                done := TRUE;
+                RETURN NEXT result;
+            END IF;
+        END IF;
+    END IF;
+
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
+
+-- do potentially large updates last to save time if upgrader needs
+-- to manually tweak the upgrade script to resolve errors
+
+-- 0505
+UPDATE metabib.facet_entry SET value = evergreen.force_unicode_normal_form(value,'NFC');
+
+UPDATE asset.call_number SET id = id;
+
+-- Update reporter.materialized_simple_record with normalized ISBN values
+-- This might not get all of them, but most ISBNs will have more than one hyphen
+DELETE FROM reporter.materialized_simple_record WHERE id IN (
+    SELECT record FROM metabib.full_rec WHERE tag = '020' AND subfield IN ('a', 'z') AND value LIKE '%-%-%'
+);
+
+INSERT INTO reporter.materialized_simple_record
+    SELECT DISTINCT rossr.* FROM reporter.old_super_simple_record rossr INNER JOIN metabib.full_rec mfr ON mfr.record = rossr.id
+        WHERE mfr.tag = '020' AND mfr.subfield IN ('a', 'z') AND mfr.value LIKE '%-%-%'
+;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0542'); -- phasefx
+
+INSERT INTO permission.perm_list
+    SELECT  np.*
+      FROM  (VALUES
+                (485, 'CREATE_VOLUME_SUFFIX', oils_i18n_gettext(485, 'Create suffix label definition.', 'ppl', 'description'))
+                ,(486, 'UPDATE_VOLUME_SUFFIX', oils_i18n_gettext(486, 'Update suffix label definition.', 'ppl', 'description'))
+                ,(487, 'DELETE_VOLUME_SUFFIX', oils_i18n_gettext(487, 'Delete suffix label definition.', 'ppl', 'description'))
+                ,(488, 'CREATE_VOLUME_PREFIX', oils_i18n_gettext(488, 'Create prefix label definition.', 'ppl', 'description'))
+                ,(489, 'UPDATE_VOLUME_PREFIX', oils_i18n_gettext(489, 'Update prefix label definition.', 'ppl', 'description'))
+                ,(490, 'DELETE_VOLUME_PREFIX', oils_i18n_gettext(490, 'Delete prefix label definition.', 'ppl', 'description'))
+                ,(491, 'CREATE_MONOGRAPH_PART', oils_i18n_gettext(491, 'Create monograph part definition.', 'ppl', 'description'))
+                ,(492, 'UPDATE_MONOGRAPH_PART', oils_i18n_gettext(492, 'Update monograph part definition.', 'ppl', 'description'))
+                ,(493, 'DELETE_MONOGRAPH_PART', oils_i18n_gettext(493, 'Delete monograph part definition.', 'ppl', 'description'))
+                ,(494, 'ADMIN_CODED_VALUE', oils_i18n_gettext(494, 'Create/Update/Delete SVF Record Attribute Coded Value Map', 'ppl', 'description'))
+                ,(495, 'ADMIN_SERIAL_ITEM', oils_i18n_gettext(495, 'Create/Retrieve/Update/Delete Serial Item', 'ppl', 'description'))
+                ,(496, 'ADMIN_SVF', oils_i18n_gettext(496, 'Create/Update/Delete SVF Record Attribute Defintion', 'ppl', 'description'))
+                ,(497, 'CREATE_BIB_PTYPE', oils_i18n_gettext(497, 'Create Bibliographic Record Peer Type', 'ppl', 'description'))
+                ,(498, 'CREATE_PURCHASE_REQUEST', oils_i18n_gettext(498, 'Create User Purchase Request', 'ppl', 'description'))
+                ,(499, 'DELETE_BIB_PTYPE', oils_i18n_gettext(499, 'Delete Bibliographic Record Peer Type', 'ppl', 'description'))
+                ,(500, 'MAP_MONOGRAPH_PART', oils_i18n_gettext(500, 'Create/Update/Delete Copy Monograph Part Map', 'ppl', 'description'))
+                ,(501, 'MARK_ITEM_MISSING_PIECES', oils_i18n_gettext(501, 'Allows the Mark Item Missing Pieces action.', 'ppl', 'description'))
+                ,(502, 'UPDATE_BIB_PTYPE', oils_i18n_gettext(502, 'Update Bibliographic Record Peer Type', 'ppl', 'description'))
+                ,(503, 'UPDATE_HOLD_REQUEST_TIME', oils_i18n_gettext(503, 'Allows editing of a hold''s request time, and/or its Cut-in-line/Top-of-queue flag.', 'ppl', 'description'))
+                ,(504, 'UPDATE_PICKLIST', oils_i18n_gettext(504, 'Allows update/re-use of an acquisitions pick/selection list.', 'ppl', 'description'))
+                ,(505, 'UPDATE_WORKSTATION', oils_i18n_gettext(505, 'Allows update of a workstation during workstation registration override.', 'ppl', 'description'))
+                ,(506, 'VIEW_USER_SETTING_TYPE', oils_i18n_gettext(506, 'Allows viewing of configurable user setting types.', 'ppl', 'description'))
+            ) AS np(id,code,description)
+            LEFT JOIN permission.perm_list pl USING (code)
+      WHERE pl.id IS NULL;
+;
+
+
+-- add new perms AND catch up on some missed upgrade data, if needed
+
+-- we could get away from these fixed-id inserts here, but then this
+-- upgrade would be ahead of the mainline, I think
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 8, oils_i18n_gettext(8, 'Cataloging Administrator', 'pgt', 'name'), 3, NULL, '3 years', TRUE, 'group_application.user.staff.cat_admin'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 8
+       );
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 9, oils_i18n_gettext(9, 'Circulation Administrator', 'pgt', 'name'), 3, NULL, '3 years', TRUE, 'group_application.user.staff.circ_admin'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 9
+       );
+
+UPDATE permission.grp_tree SET description = oils_i18n_gettext(10, 'Can do anything at the Branch level', 'pgt', 'description') WHERE id = 10;
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 11, oils_i18n_gettext(11, 'Serials', 'pgt', 'name'), 3, oils_i18n_gettext(11, 'Serials (includes admin features)', 'pgt', 'description'), '3 years', TRUE, 'group_application.user.staff.serials'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 11
+       );
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 12, oils_i18n_gettext(12, 'System Administrator', 'pgt', 'name'), 3, oils_i18n_gettext(12, 'Can do anything at the System level', 'pgt', 'description'), '3 years', TRUE, 'group_application.user.staff.admin.system_admin'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 12
+       );
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 13, oils_i18n_gettext(13, 'Global Administrator', 'pgt', 'name'), 3, oils_i18n_gettext(13, 'Can do anything at the Consortium level', 'pgt', 'description'), '3 years', TRUE, 'group_application.user.staff.admin.global_admin'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 13
+       );
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 14, oils_i18n_gettext(14, 'Data Review', 'pgt', 'name'), 3, NULL, '3 years', TRUE, 'group_application.user.staff.data_review'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 14
+       );
+
+INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm)
+       SELECT 15, oils_i18n_gettext(15, 'Volunteers', 'pgt', 'name'), 3, NULL, '3 years', TRUE, 'group_application.user.staff.volunteers'
+       WHERE NOT EXISTS (
+               SELECT 1
+               FROM permission.grp_tree
+               WHERE
+                       id = 15
+       );
+
+
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Cataloging Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'ADMIN_IMPORT_ITEM_ATTR_DEF',
+                       'ADMIN_MERGE_PROFILE',
+                       'CREATE_AUTHORITY_IMPORT_IMPORT_DEF',
+                       'CREATE_BIB_IMPORT_FIELD_DEF',
+                       'CREATE_BIB_PTYPE',
+                       'CREATE_BIB_SOURCE',
+                       'CREATE_IMPORT_ITEM_ATTR_DEF',
+                       'CREATE_IMPORT_TRASH_FIELD',
+                       'CREATE_MERGE_PROFILE',
+                       'CREATE_MONOGRAPH_PART',
+                       'CREATE_VOLUME_PREFIX',
+                       'CREATE_VOLUME_SUFFIX',
+                       'DELETE_AUTHORITY_IMPORT_IMPORT_FIELD_DEF',
+                       'DELETE_BIB_PTYPE',
+                       'DELETE_BIB_SOURCE',
+                       'DELETE_IMPORT_ITEM_ATTR_DEF',
+                       'DELETE_IMPORT_TRASH_FIELD',
+                       'DELETE_MERGE_PROFILE',
+                       'DELETE_MONOGRAPH_PART',
+                       'DELETE_VOLUME_PREFIX',
+                       'DELETE_VOLUME_SUFFIX',
+                       'MAP_MONOGRAPH_PART',
+                       'UPDATE_AUTHORITY_IMPORT_IMPORT_FIELD_DEF',
+                       'UPDATE_BIB_IMPORT_IMPORT_FIELD_DEF',
+                       'UPDATE_BIB_PTYPE',
+                       'UPDATE_IMPORT_ITEM_ATTR_DEF',
+                       'UPDATE_IMPORT_TRASH_FIELD',
+                       'UPDATE_MERGE_PROFILE',
+                       'UPDATE_MONOGRAPH_PART',
+                       'UPDATE_VOLUME_PREFIX',
+                       'UPDATE_VOLUME_SUFFIX'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'Branch' AND
+               perm.code IN (
+                       'DELETE_USER'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'ADMIN_MAX_FINE_RULE',
+                       'CREATE_CIRC_DURATION',
+                       'DELETE_CIRC_DURATION',
+                       'MARK_ITEM_MISSING_PIECES',
+                       'UPDATE_CIRC_DURATION',
+                       'UPDATE_HOLD_REQUEST_TIME',
+                       'UPDATE_NET_ACCESS_LEVEL',
+                       'VIEW_CIRC_MATRIX_MATCHPOINT',
+                       'VIEW_HOLD_MATRIX_MATCHPOINT'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'ADMIN_BOOKING_RESERVATION',
+                       'ADMIN_BOOKING_RESERVATION_ATTR_MAP',
+                       'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP',
+                       'ADMIN_BOOKING_RESOURCE',
+                       'ADMIN_BOOKING_RESOURCE_ATTR',
+                       'ADMIN_BOOKING_RESOURCE_ATTR_MAP',
+                       'ADMIN_BOOKING_RESOURCE_ATTR_VALUE',
+                       'ADMIN_BOOKING_RESOURCE_TYPE',
+                       'ADMIN_COPY_LOCATION_ORDER',
+                       'ADMIN_HOLD_CANCEL_CAUSE',
+                       'ASSIGN_GROUP_PERM',
+                       'BAR_PATRON',
+                       'COPY_HOLDS',
+                       'COPY_TRANSIT_RECEIVE',
+                       'CREATE_BILL',
+                       'CREATE_BILLING_TYPE',
+                       'CREATE_NON_CAT_TYPE',
+                       'CREATE_PATRON_STAT_CAT',
+                       'CREATE_PATRON_STAT_CAT_ENTRY',
+                       'CREATE_PATRON_STAT_CAT_ENTRY_MAP',
+                       'CREATE_USER_GROUP_LINK',
+                       'DELETE_BILLING_TYPE',
+                       'DELETE_NON_CAT_TYPE',
+                       'DELETE_PATRON_STAT_CAT',
+                       'DELETE_PATRON_STAT_CAT_ENTRY',
+                       'DELETE_PATRON_STAT_CAT_ENTRY_MAP',
+                       'DELETE_TRANSIT',
+                       'group_application.user.staff',
+                       'MANAGE_BAD_DEBT',
+                       'MARK_ITEM_AVAILABLE',
+                       'MARK_ITEM_BINDERY',
+                       'MARK_ITEM_CHECKED_OUT',
+                       'MARK_ITEM_ILL',
+                       'MARK_ITEM_IN_PROCESS',
+                       'MARK_ITEM_IN_TRANSIT',
+                       'MARK_ITEM_LOST',
+                       'MARK_ITEM_MISSING',
+                       'MARK_ITEM_ON_HOLDS_SHELF',
+                       'MARK_ITEM_ON_ORDER',
+                       'MARK_ITEM_RESHELVING',
+                       'MERGE_USERS',
+                       'money.collections_tracker.create',
+                       'money.collections_tracker.delete',
+                       'OFFLINE_EXECUTE',
+                       'OFFLINE_UPLOAD',
+                       'OFFLINE_VIEW',
+                       'REMOVE_USER_GROUP_LINK',
+                       'SET_CIRC_CLAIMS_RETURNED',
+                       'SET_CIRC_CLAIMS_RETURNED.override',
+                       'SET_CIRC_LOST',
+                       'SET_CIRC_MISSING',
+                       'UNBAR_PATRON',
+                       'UPDATE_BILL_NOTE',
+                       'UPDATE_NON_CAT_TYPE',
+                       'UPDATE_PATRON_CLAIM_NEVER_CHECKED_OUT_COUNT',
+                       'UPDATE_PATRON_CLAIM_RETURN_COUNT',
+                       'UPDATE_PICKUP_LIB_FROM_HOLDS_SHELF',
+                       'UPDATE_PICKUP_LIB_FROM_TRANSIT',
+                       'UPDATE_USER',
+                       'VIEW_REPORT_OUTPUT',
+                       'VIEW_STANDING_PENALTY',
+                       'VOID_BILLING',
+                       'VOLUME_HOLDS'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Local Administrator' AND
+               aout.name = 'Branch' AND
+               perm.code IN (
+                       'EVERYTHING'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Serials' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'ADMIN_ASSET_COPY_TEMPLATE',
+                       'ADMIN_SERIAL_CAPTION_PATTERN',
+                       'ADMIN_SERIAL_DISTRIBUTION',
+                       'ADMIN_SERIAL_ITEM',
+                       'ADMIN_SERIAL_STREAM',
+                       'ADMIN_SERIAL_SUBSCRIPTION',
+                       'ISSUANCE_HOLDS',
+                       'RECEIVE_SERIAL'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'System Administrator' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'EVERYTHING'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'System Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code ~ '^VIEW_TRIGGER'
+               AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Global Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'EVERYTHING'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Data Review' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'CREATE_COPY_TRANSIT',
+                       'VIEW_BILLING_TYPE',
+                       'VIEW_CIRCULATIONS',
+                       'VIEW_COPY_NOTES',
+                       'VIEW_HOLD',
+                       'VIEW_ORG_SETTINGS',
+                       'VIEW_TITLE_NOTES',
+                       'VIEW_TRANSACTION',
+                       'VIEW_USER',
+                       'VIEW_USER_FINES_SUMMARY',
+                       'VIEW_USER_TRANSACTIONS',
+                       'VIEW_VOLUME_NOTES',
+                       'VIEW_ZIP_DATA'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Data Review' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'COPY_CHECKOUT',
+                       'COPY_HOLDS',
+                       'CREATE_IN_HOUSE_USE',
+                       'CREATE_TRANSACTION',
+                       'OFFLINE_EXECUTE',
+                       'OFFLINE_VIEW',
+                       'STAFF_LOGIN',
+                       'VOLUME_HOLDS'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Volunteers' AND
+               aout.name = 'Branch' AND
+               perm.code IN (
+                       'COPY_CHECKOUT',
+                       'CREATE_BILL',
+                       'CREATE_IN_HOUSE_USE',
+                       'CREATE_PAYMENT',
+                       'VIEW_BILLING_TYPE',
+                       'VIEW_CIRCS',
+                       'VIEW_COPY_CHECKOUT',
+                       'VIEW_HOLD',
+                       'VIEW_TITLE_HOLDS',
+                       'VIEW_TRANSACTION',
+                       'VIEW_USER',
+                       'VIEW_USER_FINES_SUMMARY',
+                       'VIEW_USER_TRANSACTIONS'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Volunteers' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'CREATE_COPY_TRANSIT',
+                       'CREATE_TRANSACTION',
+                       'CREATE_TRANSIT',
+                       'STAFF_LOGIN',
+                       'TRANSIT_COPY',
+                       'VIEW_ORG_SETTINGS'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+
+-- stock Users group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Users' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'CREATE_PURCHASE_REQUEST'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- stock Staff group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Staff' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'VIEW_USER_SETTING_TYPE'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- stock Circulators group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulators' AND
+               aout.name = 'Branch' AND
+               perm.code IN (
+                       'MARK_ITEM_MISSING_PIECES'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- stock Catalogers group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Catalogers' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'MAP_MONOGRAPH_PART'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- stock Acquisitions group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, FALSE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Acquisitions' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'UPDATE_PICKLIST'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- stock Acq Admin group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Acquisitions Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'UPDATE_PICKLIST'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO config.upgrade_log (version) VALUES ('0547'); -- dbwells
+
+-- account for spelling errors (Admin != Administrator)
+\qecho This might not insert much if you passed through 0542 on your way here,
+\qecho but one group was missed there as well
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Cataloging Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'ADMIN_IMPORT_ITEM_ATTR_DEF',
+                       'ADMIN_MERGE_PROFILE',
+                       'CREATE_AUTHORITY_IMPORT_IMPORT_DEF',
+                       'CREATE_BIB_IMPORT_FIELD_DEF',
+                       'CREATE_BIB_PTYPE',
+                       'CREATE_BIB_SOURCE',
+                       'CREATE_IMPORT_ITEM_ATTR_DEF',
+                       'CREATE_IMPORT_TRASH_FIELD',
+                       'CREATE_MERGE_PROFILE',
+                       'CREATE_MONOGRAPH_PART',
+                       'CREATE_VOLUME_PREFIX',
+                       'CREATE_VOLUME_SUFFIX',
+                       'DELETE_AUTHORITY_IMPORT_IMPORT_FIELD_DEF',
+                       'DELETE_BIB_PTYPE',
+                       'DELETE_BIB_SOURCE',
+                       'DELETE_IMPORT_ITEM_ATTR_DEF',
+                       'DELETE_IMPORT_TRASH_FIELD',
+                       'DELETE_MERGE_PROFILE',
+                       'DELETE_MONOGRAPH_PART',
+                       'DELETE_VOLUME_PREFIX',
+                       'DELETE_VOLUME_SUFFIX',
+                       'MAP_MONOGRAPH_PART',
+                       'UPDATE_AUTHORITY_IMPORT_IMPORT_FIELD_DEF',
+                       'UPDATE_BIB_IMPORT_IMPORT_FIELD_DEF',
+                       'UPDATE_BIB_PTYPE',
+                       'UPDATE_IMPORT_ITEM_ATTR_DEF',
+                       'UPDATE_IMPORT_TRASH_FIELD',
+                       'UPDATE_MERGE_PROFILE',
+                       'UPDATE_MONOGRAPH_PART',
+                       'UPDATE_VOLUME_PREFIX',
+                       'UPDATE_VOLUME_SUFFIX'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+    SELECT
+        pgt.id, perm.id, aout.depth, TRUE
+    FROM
+        permission.grp_tree pgt,
+        permission.perm_list perm,
+        actor.org_unit_type aout
+    WHERE
+        pgt.name = 'Cataloging Administrator' AND
+        aout.name = 'System' AND
+        perm.code IN (
+            'CREATE_COPY_STAT_CAT',
+            'CREATE_COPY_STAT_CAT_ENTRY',
+            'CREATE_COPY_STAT_CAT_ENTRY_MAP',
+            'RUN_REPORTS',
+            'SHARE_REPORT_FOLDER',
+            'UPDATE_COPY_LOCATION',
+            'UPDATE_COPY_STAT_CAT',
+            'UPDATE_COPY_STAT_CAT_ENTRY',
+            'VIEW_REPORT_OUTPUT'
+        ) AND NOT EXISTS (
+            SELECT 1
+            FROM permission.grp_perm_map AS map
+            WHERE
+                map.grp = pgt.id
+                AND map.perm = perm.id
+        );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'Branch' AND
+               perm.code IN (
+                       'DELETE_USER'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'ADMIN_MAX_FINE_RULE',
+                       'CREATE_CIRC_DURATION',
+                       'DELETE_CIRC_DURATION',
+                       'MARK_ITEM_MISSING_PIECES',
+                       'UPDATE_CIRC_DURATION',
+                       'UPDATE_HOLD_REQUEST_TIME',
+                       'UPDATE_NET_ACCESS_LEVEL',
+                       'VIEW_CIRC_MATRIX_MATCHPOINT',
+                       'VIEW_HOLD_MATRIX_MATCHPOINT'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'System' AND
+               perm.code IN (
+                       'ADMIN_BOOKING_RESERVATION',
+                       'ADMIN_BOOKING_RESERVATION_ATTR_MAP',
+                       'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP',
+                       'ADMIN_BOOKING_RESOURCE',
+                       'ADMIN_BOOKING_RESOURCE_ATTR',
+                       'ADMIN_BOOKING_RESOURCE_ATTR_MAP',
+                       'ADMIN_BOOKING_RESOURCE_ATTR_VALUE',
+                       'ADMIN_BOOKING_RESOURCE_TYPE',
+                       'ADMIN_COPY_LOCATION_ORDER',
+                       'ADMIN_HOLD_CANCEL_CAUSE',
+                       'ASSIGN_GROUP_PERM',
+                       'BAR_PATRON',
+                       'COPY_HOLDS',
+                       'COPY_TRANSIT_RECEIVE',
+                       'CREATE_BILL',
+                       'CREATE_BILLING_TYPE',
+                       'CREATE_NON_CAT_TYPE',
+                       'CREATE_PATRON_STAT_CAT',
+                       'CREATE_PATRON_STAT_CAT_ENTRY',
+                       'CREATE_PATRON_STAT_CAT_ENTRY_MAP',
+                       'CREATE_USER_GROUP_LINK',
+                       'DELETE_BILLING_TYPE',
+                       'DELETE_NON_CAT_TYPE',
+                       'DELETE_PATRON_STAT_CAT',
+                       'DELETE_PATRON_STAT_CAT_ENTRY',
+                       'DELETE_PATRON_STAT_CAT_ENTRY_MAP',
+                       'DELETE_TRANSIT',
+                       'group_application.user.staff',
+                       'MANAGE_BAD_DEBT',
+                       'MARK_ITEM_AVAILABLE',
+                       'MARK_ITEM_BINDERY',
+                       'MARK_ITEM_CHECKED_OUT',
+                       'MARK_ITEM_ILL',
+                       'MARK_ITEM_IN_PROCESS',
+                       'MARK_ITEM_IN_TRANSIT',
+                       'MARK_ITEM_LOST',
+                       'MARK_ITEM_MISSING',
+                       'MARK_ITEM_ON_HOLDS_SHELF',
+                       'MARK_ITEM_ON_ORDER',
+                       'MARK_ITEM_RESHELVING',
+                       'MERGE_USERS',
+                       'money.collections_tracker.create',
+                       'money.collections_tracker.delete',
+                       'OFFLINE_EXECUTE',
+                       'OFFLINE_UPLOAD',
+                       'OFFLINE_VIEW',
+                       'REMOVE_USER_GROUP_LINK',
+                       'SET_CIRC_CLAIMS_RETURNED',
+                       'SET_CIRC_CLAIMS_RETURNED.override',
+                       'SET_CIRC_LOST',
+                       'SET_CIRC_MISSING',
+                       'UNBAR_PATRON',
+                       'UPDATE_BILL_NOTE',
+                       'UPDATE_NON_CAT_TYPE',
+                       'UPDATE_PATRON_CLAIM_NEVER_CHECKED_OUT_COUNT',
+                       'UPDATE_PATRON_CLAIM_RETURN_COUNT',
+                       'UPDATE_PICKUP_LIB_FROM_HOLDS_SHELF',
+                       'UPDATE_PICKUP_LIB_FROM_TRANSIT',
+                       'UPDATE_USER',
+                       'VIEW_REPORT_OUTPUT',
+                       'VIEW_STANDING_PENALTY',
+                       'VOID_BILLING',
+                       'VOLUME_HOLDS'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+INSERT INTO config.upgrade_log (version) VALUES ('0557'); -- miker
+
+CREATE OR REPLACE FUNCTION unapi.acl ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+    SELECT  XMLELEMENT(
+                name location,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    id AS ident,
+                    holdable,
+                    opac_visible,
+                    label_prefix AS prefix,
+                    label_suffix AS suffix
+                ),
+                name
+            )
+      FROM  asset.copy_location
+      WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0558'); -- miker
+
+CREATE OR REPLACE FUNCTION unapi.ccs ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+    SELECT  XMLELEMENT(
+                name status,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    id AS ident,
+                    holdable,
+                    opac_visible
+                ),
+                name
+            )
+      FROM  config.copy_status
+      WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0560'); -- miker
+
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+DECLARE
+    add_query       TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
+BEGIN
+    add_query := $$
+            INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+              SELECT id, circ_lib, record FROM (
+                SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number, cp.location, cp.status
+                  FROM  asset.copy cp
+                        JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                        JOIN asset.copy_location cl ON (cp.location = cl.id)
+                        JOIN config.copy_status cs ON (cp.status = cs.id)
+                        JOIN biblio.record_entry b ON (cn.record = b.id)
+                  WHERE NOT cp.deleted
+                        AND NOT cn.deleted
+                        AND NOT b.deleted
+                        AND cs.opac_visible
+                        AND cl.opac_visible
+                        AND cp.opac_visible
+                        AND a.opac_visible
+                            UNION
+                SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number, cp.location, cp.status
+                  FROM  asset.copy cp
+                        JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                        JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                        JOIN asset.copy_location cl ON (cp.location = cl.id)
+                        JOIN config.copy_status cs ON (cp.status = cs.id)
+                  WHERE NOT cp.deleted
+                        AND cs.opac_visible
+                        AND cl.opac_visible
+                        AND cp.opac_visible
+                        AND a.opac_visible
+                    ) AS x 
+
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
+
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.target_copy || ' AND x.record = ' || NEW.peer_record || ';';
+            EXECUTE add_query;
+            RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
+        END IF;
+    END IF;
+
+    IF TG_OP = 'INSERT' THEN
+
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            EXECUTE add_query;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
+
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
+            END IF;
+
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
+            END IF;
+
+        END IF;
+
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            EXECUTE add_query;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
+
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
+            END IF;
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME IN ('copy','unit') THEN
+                add_query := add_query || 'WHERE x.id = ' || NEW.id || ';';
+            ELSIF TG_TABLE_NAME = 'call_number' THEN
+                add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_query := add_query || 'WHERE x.record = ' || NEW.id || ';';
+            END IF;
+            EXECUTE add_query;
+            RETURN NEW;
+        END IF;
+    END IF;
+
+    IF TG_TABLE_NAME = 'call_number' THEN
+
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_query := add_query || 'WHERE x.call_number = ' || NEW.id || ';';
+            EXECUTE add_query;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
+    END IF;
+
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
+
+        RETURN NEW;
+
+    ELSIF NEW.opac_visible THEN -- add rows
+
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_query := add_query || 'WHERE x.circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_query := add_query || 'WHERE x.location = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_query := add_query || 'WHERE x.status = ' || NEW.id || ';';
+        END IF;
+        EXECUTE add_query;
+    ELSE -- delete rows
+
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0563');
+
+INSERT INTO permission.perm_list ( id, code, description ) 
+    VALUES ( 510, 'UPDATE_PATRON_COLLECTIONS_EXEMPT', oils_i18n_gettext(510,
+    'Allows a user to indicate that a patron is exempt from collections processing', 'ppl', 'description'));
+
+--- stock Circulation Administrator group
+
+INSERT INTO permission.grp_perm_map ( grp, perm, depth, grantable )
+    SELECT
+        4,
+        id,
+        0,
+        't'
+    FROM permission.perm_list
+    WHERE code in ('UPDATE_PATRON_COLLECTIONS_EXEMPT');
+
+INSERT INTO config.upgrade_log (version) VALUES ('0566');
+
+CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+DECLARE
+    me      biblio.record_entry%ROWTYPE;
+    layout  unapi.bre_output_layout%ROWTYPE;
+    xfrm    config.xml_transform%ROWTYPE;
+    ouid    INT;
+    tmp_xml TEXT;
+    top_el  TEXT;
+    output  XML;
+    hxml    XML;
+    axml    XML;
+BEGIN
+
+    SELECT id INTO ouid FROM actor.org_unit WHERE shortname = org;
+
+    IF ouid IS NULL THEN
+        RETURN NULL::XML;
+    END IF;
+
+    IF format = 'holdings_xml' THEN -- the special case
+        output := unapi.holdings_xml( obj_id, ouid, org, depth, includes, slimit, soffset, include_xmlns);
+        RETURN output;
+    END IF;
+
+    SELECT * INTO layout FROM unapi.bre_output_layout WHERE name = format;
+
+    IF layout.name IS NULL THEN
+        RETURN NULL::XML;
+    END IF;
+
+    SELECT * INTO xfrm FROM config.xml_transform WHERE name = layout.transform;
+
+    SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
+
+    -- grab SVF if we need them
+    IF ('mra' = ANY (includes)) THEN 
+        axml := unapi.mra(obj_id,NULL,NULL,NULL,NULL);
+    ELSE
+        axml := NULL::XML;
+    END IF;
+
+    -- grab hodlings if we need them
+    IF ('holdings_xml' = ANY (includes)) THEN 
+        hxml := unapi.holdings_xml(obj_id, ouid, org, depth, evergreen.array_remove_item_by_value(includes,'holdings_xml'), slimit, soffset, include_xmlns);
+    ELSE
+        hxml := NULL::XML;
+    END IF;
+
+
+    -- generate our item node
+
+
+    IF format = 'marcxml' THEN
+        tmp_xml := me.marc;
+        IF tmp_xml !~ E'<marc:' THEN -- If we're not using the prefixed namespace in this record, then remove all declarations of it
+           tmp_xml := REGEXP_REPLACE(tmp_xml, ' xmlns:marc="http://www.loc.gov/MARC21/slim"', '', 'g');
+        END IF; 
+    ELSE
+        tmp_xml := oils_xslt_process(me.marc, xfrm.xslt)::XML;
+    END IF;
+
+    top_el := REGEXP_REPLACE(tmp_xml, E'^.*?<((?:\\S+:)?' || layout.holdings_element || ').*$', E'\\1');
+
+    IF axml IS NOT NULL THEN 
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', axml || '</' || top_el || E'>\\1');
+    END IF;
+
+    IF hxml IS NOT NULL THEN -- XXX how do we configure the holdings position?
+        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', hxml || '</' || top_el || E'>\\1');
+    END IF;
+
+    IF ('bre.unapi' = ANY (includes)) THEN 
+        output := REGEXP_REPLACE(
+            tmp_xml,
+            '</' || top_el || '>(.*?)',
+            XMLELEMENT(
+                name abbr,
+                XMLATTRIBUTES(
+                    'http://www.w3.org/1999/xhtml' AS xmlns,
+                    'unapi-id' AS class,
+                    'tag:open-ils.org:U2@bre/' || obj_id || '/' || org AS title
+                )
+            )::TEXT || '</' || top_el || E'>\\1'
+        );
+    ELSE
+        output := tmp_xml;
+    END IF;
+
+    output := REGEXP_REPLACE(output::TEXT,E'>\\s+<','><','gs')::XML;
+    RETURN output;
+END;
+$F$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION unapi.holdings_xml (bid BIGINT, ouid INT, org TEXT, depth INT DEFAULT NULL, includes TEXT[] DEFAULT NULL::TEXT[], slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE) RETURNS XML AS $F$
+     SELECT  XMLELEMENT(
+                 name holdings,
+                 XMLATTRIBUTES(
+                    CASE WHEN $8 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    CASE WHEN ('bre' = ANY ($5)) THEN 'tag:open-ils.org:U2@bre/' || $1 || '/' || $3 ELSE NULL END AS id
+                 ),
+                 XMLELEMENT(
+                     name counts,
+                     (SELECT  XMLAGG(XMLELEMENT::XML) FROM (
+                         SELECT  XMLELEMENT(
+                                     name count,
+                                     XMLATTRIBUTES('public' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+                                 )::text
+                           FROM  asset.opac_ou_record_copy_count($2,  $1)
+                                     UNION
+                         SELECT  XMLELEMENT(
+                                     name count,
+                                     XMLATTRIBUTES('staff' as type, depth, org_unit, coalesce(transcendant,0) as transcendant, available, visible as count, unshadow)
+                                 )::text
+                           FROM  asset.staff_ou_record_copy_count($2, $1)
+                                     ORDER BY 1
+                     )x)
+                 ),
+                 CASE 
+                     WHEN ('bmp' = ANY ($5)) THEN
+                        XMLELEMENT(
+                            name monograph_parts,
+                            (SELECT XMLAGG(bmp) FROM (
+                                SELECT  unapi.bmp( id, 'xml', 'monograph_part', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'bre'), 'holdings_xml'), $3, $4, $6, $7, FALSE)
+                                  FROM  biblio.monograph_part
+                                  WHERE record = $1
+                            )x)
+                        )
+                     ELSE NULL
+                 END,
+                 XMLELEMENT(
+                     name volumes,
+                     (SELECT XMLAGG(acn) FROM (
+                        SELECT  unapi.acn(acn.id,'xml','volume', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($5,'holdings_xml'),'bre'), $3, $4, $6, $7, FALSE)
+                          FROM  asset.call_number acn
+                          WHERE acn.record = $1
+                                AND EXISTS (
+                                    SELECT  1
+                                      FROM  asset.copy acp
+                                            JOIN actor.org_unit_descendants(
+                                                $2,
+                                                (COALESCE(
+                                                    $4,
+                                                    (SELECT aout.depth
+                                                      FROM  actor.org_unit_type aout
+                                                            JOIN actor.org_unit aou ON (aou.ou_type = aout.id AND aou.id = $2)
+                                                    )
+                                                ))
+                                            ) aoud ON (acp.circ_lib = aoud.id)
+                                      LIMIT 1
+                               )
+                          ORDER BY label_sortkey
+                          LIMIT $6
+                          OFFSET $7
+                     )x)
+                 ),
+                 CASE WHEN ('ssub' = ANY ($5)) THEN 
+                     XMLELEMENT(
+                         name subscriptions,
+                         (SELECT XMLAGG(ssub) FROM (
+                            SELECT  unapi.ssub(id,'xml','subscription','{}'::TEXT[], $3, $4, $6, $7, FALSE)
+                              FROM  serial.subscription
+                              WHERE record_entry = $1
+                        )x)
+                     )
+                 ELSE NULL END,
+                 CASE WHEN ('acp' = ANY ($5)) THEN 
+                     XMLELEMENT(
+                         name foreign_copies,
+                         (SELECT XMLAGG(acp) FROM (
+                            SELECT  unapi.acp(p.target_copy,'xml','copy','{}'::TEXT[], $3, $4, $6, $7, FALSE)
+                              FROM  biblio.peer_bib_copy_map p
+                                    JOIN asset.copy c ON (p.target_copy = c.id)
+                              WHERE NOT c.deleted AND peer_record = $1
+                        )x)
+                     )
+                 ELSE NULL END
+             );
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.ssub ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name subscription,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@ssub/' || id AS id,
+                        start_date AS start, end_date AS end, expected_date_offset
+                    ),
+                    unapi.aou( owning_lib, $2, 'owning_lib', evergreen.array_remove_item_by_value($4,'ssub'), $5, $6, $7, $8),
+                    XMLELEMENT( name distributions,
+                        CASE 
+                            WHEN ('sdist' = ANY ($4)) THEN
+                                (SELECT XMLAGG(sdist) FROM (
+                                    SELECT  unapi.sdist( id, 'xml', 'distribution', evergreen.array_remove_item_by_value($4,'ssub'), $5, $6, $7, $8, FALSE)
+                                      FROM  serial.distribution
+                                      WHERE subscription = ssub.id
+                                )x)
+                            ELSE NULL
+                        END
+                    )
+                )
+          FROM  serial.subscription ssub
+          WHERE id = $1
+          GROUP BY id, start_date, end_date, expected_date_offset, owning_lib;
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.sdist ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name distribution,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@sdist/' || id AS id,
+                       'tag:open-ils.org:U2@acn/' || receive_call_number AS receive_call_number,
+                       'tag:open-ils.org:U2@acn/' || bind_call_number AS bind_call_number,
+                        unit_label_prefix, label, unit_label_suffix, summary_method
+                    ),
+                    unapi.aou( holding_lib, $2, 'holding_lib', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8),
+                    CASE WHEN subscription IS NOT NULL AND ('ssub' = ANY ($4)) THEN unapi.ssub( subscription, 'xml', 'subscription', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    XMLELEMENT( name streams,
+                        CASE 
+                            WHEN ('sstr' = ANY ($4)) THEN
+                                (SELECT XMLAGG(sstr) FROM (
+                                    SELECT  unapi.sstr( id, 'xml', 'stream', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8, FALSE)
+                                      FROM  serial.stream
+                                      WHERE distribution = sdist.id
+                                )x)
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name summaries,
+                        CASE 
+                            WHEN ('ssum' = ANY ($4)) THEN
+                                (SELECT XMLAGG(sbsum) FROM (
+                                    SELECT  unapi.sbsum( id, 'xml', 'serial_summary', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8, FALSE)
+                                      FROM  serial.basic_summary
+                                      WHERE distribution = sdist.id
+                                )x)
+                            ELSE NULL
+                        END,
+                        CASE 
+                            WHEN ('ssum' = ANY ($4)) THEN
+                                (SELECT XMLAGG(sisum) FROM (
+                                    SELECT  unapi.sisum( id, 'xml', 'serial_summary', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8, FALSE)
+                                      FROM  serial.index_summary
+                                      WHERE distribution = sdist.id
+                                )x)
+                            ELSE NULL
+                        END,
+                        CASE 
+                            WHEN ('ssum' = ANY ($4)) THEN
+                                (SELECT XMLAGG(sssum) FROM (
+                                    SELECT  unapi.sssum( id, 'xml', 'serial_summary', evergreen.array_remove_item_by_value($4,'sdist'), $5, $6, $7, $8, FALSE)
+                                      FROM  serial.supplement_summary
+                                      WHERE distribution = sdist.id
+                                )x)
+                            ELSE NULL
+                        END
+                    )
+                )
+          FROM  serial.distribution sdist
+          WHERE id = $1
+          GROUP BY id, label, unit_label_prefix, unit_label_suffix, holding_lib, summary_method, subscription, receive_call_number, bind_call_number;
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.sstr ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+    SELECT  XMLELEMENT(
+                name stream,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    'tag:open-ils.org:U2@sstr/' || id AS id,
+                    routing_label
+                ),
+                CASE WHEN distribution IS NOT NULL AND ('sdist' = ANY ($4)) THEN unapi.sssum( distribution, 'xml', 'distribtion', evergreen.array_remove_item_by_value($4,'sstr'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                XMLELEMENT( name items,
+                    CASE 
+                        WHEN ('sitem' = ANY ($4)) THEN
+                            (SELECT XMLAGG(sitem) FROM (
+                                SELECT  unapi.sitem( id, 'xml', 'serial_item', evergreen.array_remove_item_by_value($4,'sstr'), $5, $6, $7, $8, FALSE)
+                                  FROM  serial.item
+                                  WHERE stream = sstr.id
+                            )x)
+                        ELSE NULL
+                    END
+                )
+            )
+      FROM  serial.stream sstr
+      WHERE id = $1
+      GROUP BY id, routing_label, distribution;
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.siss ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+    SELECT  XMLELEMENT(
+                name issuance,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    'tag:open-ils.org:U2@siss/' || id AS id,
+                    create_date, edit_date, label, date_published,
+                    holding_code, holding_type, holding_link_id
+                ),
+                CASE WHEN subscription IS NOT NULL AND ('ssub' = ANY ($4)) THEN unapi.ssub( subscription, 'xml', 'subscription', evergreen.array_remove_item_by_value($4,'siss'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                XMLELEMENT( name items,
+                    CASE 
+                        WHEN ('sitem' = ANY ($4)) THEN
+                            (SELECT XMLAGG(sitem) FROM (
+                                SELECT  unapi.sitem( id, 'xml', 'serial_item', evergreen.array_remove_item_by_value($4,'siss'), $5, $6, $7, $8, FALSE)
+                                  FROM  serial.item
+                                  WHERE issuance = sstr.id
+                            )x)
+                        ELSE NULL
+                    END
+                )
+            )
+      FROM  serial.issuance sstr
+      WHERE id = $1
+      GROUP BY id, create_date, edit_date, label, date_published, holding_code, holding_type, holding_link_id, subscription;
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.sitem ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name serial_item,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@sitem/' || id AS id,
+                        'tag:open-ils.org:U2@siss/' || issuance AS issuance,
+                        date_expected, date_received
+                    ),
+                    CASE WHEN issuance IS NOT NULL AND ('siss' = ANY ($4)) THEN unapi.siss( issuance, $2, 'issuance', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN stream IS NOT NULL AND ('sstr' = ANY ($4)) THEN unapi.sstr( stream, $2, 'stream', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN unit IS NOT NULL AND ('sunit' = ANY ($4)) THEN unapi.sunit( stream, $2, 'serial_unit', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN uri IS NOT NULL AND ('auri' = ANY ($4)) THEN unapi.auri( uri, $2, 'uri', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END
+--                    XMLELEMENT( name notes,
+--                        CASE 
+--                            WHEN ('acpn' = ANY ($4)) THEN
+--                                (SELECT XMLAGG(acpn) FROM (
+--                                    SELECT  unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8)
+--                                      FROM  asset.copy_note
+--                                      WHERE owning_copy = cp.id AND pub
+--                                )x)
+--                            ELSE NULL
+--                        END
+--                    )
+                )
+          FROM  serial.item sitem
+          WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+
+CREATE OR REPLACE FUNCTION unapi.bmp ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name monograph_part,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@bmp/' || id AS id,
+                        id AS ident,
+                        label,
+                        label_sortkey,
+                        'tag:open-ils.org:U2@bre/' || record AS record
+                    ),
+                    CASE 
+                        WHEN ('acp' = ANY ($4)) THEN
+                            XMLELEMENT( name copies,
+                                (SELECT XMLAGG(acp) FROM (
+                                    SELECT  unapi.acp( cp.id, 'xml', 'copy', evergreen.array_remove_item_by_value($4,'bmp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.copy cp
+                                            JOIN asset.copy_part_map cpm ON (cpm.target_copy = cp.id)
+                                      WHERE cpm.part = $1
+                                      ORDER BY COALESCE(cp.copy_number,0), cp.barcode
+                                      LIMIT $7
+                                      OFFSET $8
+                                )x)
+                            )
+                        ELSE NULL
+                    END,
+                    CASE WHEN ('bre' = ANY ($4)) THEN unapi.bre( record, 'marcxml', 'record', evergreen.array_remove_item_by_value($4,'bmp'), $5, $6, $7, $8, FALSE) ELSE NULL END
+                )
+          FROM  biblio.monograph_part
+          WHERE id = $1
+          GROUP BY id, label, label_sortkey, record;
+$F$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION unapi.acp ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name copy,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@acp/' || id AS id,
+                        create_date, edit_date, copy_number, circulate, deposit,
+                        ref, holdable, deleted, deposit_amount, price, barcode,
+                        circ_modifier, circ_as_type, opac_visible
+                    ),
+                    unapi.ccs( status, $2, 'status', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
+                    unapi.acl( location, $2, 'location', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE),
+                    unapi.aou( circ_lib, $2, 'circ_lib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
+                    unapi.aou( circ_lib, $2, 'circlib', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8),
+                    CASE WHEN ('acn' = ANY ($4)) THEN unapi.acn( call_number, $2, 'call_number', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    XMLELEMENT( name copy_notes,
+                        CASE 
+                            WHEN ('acpn' = ANY ($4)) THEN
+                                (SELECT XMLAGG(acpn) FROM (
+                                    SELECT  unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.copy_note
+                                      WHERE owning_copy = cp.id AND pub
+                                )x)
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name statcats,
+                        CASE 
+                            WHEN ('ascecm' = ANY ($4)) THEN
+                                (SELECT XMLAGG(ascecm) FROM (
+                                    SELECT  unapi.ascecm( stat_cat_entry, 'xml', 'statcat', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.stat_cat_entry_copy_map
+                                      WHERE owning_copy = cp.id
+                                )x)
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name foreign_records,
+                        CASE
+                            WHEN ('bre' = ANY ($4)) THEN
+                                (SELECT XMLAGG(bre) FROM (
+                                    SELECT  unapi.bre(peer_record,'marcxml','record','{}'::TEXT[], $5, $6, $7, $8, FALSE)
+                                      FROM  biblio.peer_bib_copy_map
+                                      WHERE target_copy = cp.id
+                                )x)
+                            ELSE NULL
+                        END
 
-    IF axml IS NOT NULL THEN
-        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', axml || '</' || top_el || E'>\\1');
-    END IF;
+                    ),
+                    CASE 
+                        WHEN ('bmp' = ANY ($4)) THEN
+                            XMLELEMENT( name monograph_parts,
+                                (SELECT XMLAGG(bmp) FROM (
+                                    SELECT  unapi.bmp( part, 'xml', 'monograph_part', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.copy_part_map
+                                      WHERE target_copy = cp.id
+                                )x)
+                            )
+                        ELSE NULL
+                    END
+                )
+          FROM  asset.copy cp
+          WHERE id = $1
+          GROUP BY id, status, location, circ_lib, call_number, create_date, edit_date, copy_number, circulate, deposit, ref, holdable, deleted, deposit_amount, price, barcode, circ_modifier, circ_as_type, opac_visible;
+$F$ LANGUAGE SQL;
 
-    IF hxml IS NOT NULL THEN -- XXX how do we configure the holdings position?
-        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', hxml || '</' || top_el || E'>\\1');
-    END IF;
+CREATE OR REPLACE FUNCTION unapi.sunit ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name serial_unit,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@acp/' || id AS id,
+                        create_date, edit_date, copy_number, circulate, deposit,
+                        ref, holdable, deleted, deposit_amount, price, barcode,
+                        circ_modifier, circ_as_type, opac_visible, status_changed_time,
+                        floating, mint_condition, detailed_contents, sort_key, summary_contents, cost 
+                    ),
+                    unapi.ccs( status, $2, 'status', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($4,'acp'),'sunit'), $5, $6, $7, $8, FALSE),
+                    unapi.acl( location, $2, 'location', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($4,'acp'),'sunit'), $5, $6, $7, $8, FALSE),
+                    unapi.aou( circ_lib, $2, 'circ_lib', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($4,'acp'),'sunit'), $5, $6, $7, $8),
+                    unapi.aou( circ_lib, $2, 'circlib', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($4,'acp'),'sunit'), $5, $6, $7, $8),
+                    CASE WHEN ('acn' = ANY ($4)) THEN unapi.acn( call_number, $2, 'call_number', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    XMLELEMENT( name copy_notes,
+                        CASE 
+                            WHEN ('acpn' = ANY ($4)) THEN
+                                (SELECT XMLAGG(acpn) FROM (
+                                    SELECT  unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value( evergreen.array_remove_item_by_value($4,'acp'),'sunit'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.copy_note
+                                      WHERE owning_copy = cp.id AND pub
+                                )x)
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name statcats,
+                        CASE 
+                            WHEN ('ascecm' = ANY ($4)) THEN
+                                (SELECT XMLAGG(ascecm) FROM (
+                                    SELECT  unapi.ascecm( stat_cat_entry, 'xml', 'statcat', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.stat_cat_entry_copy_map
+                                      WHERE owning_copy = cp.id
+                                )x)
+                            ELSE NULL
+                        END
+                    ),
+                    XMLELEMENT( name foreign_records,
+                        CASE
+                            WHEN ('bre' = ANY ($4)) THEN
+                                (SELECT XMLAGG(bre) FROM (
+                                    SELECT  unapi.bre(peer_record,'marcxml','record','{}'::TEXT[], $5, $6, $7, $8, FALSE)
+                                      FROM  biblio.peer_bib_copy_map
+                                      WHERE target_copy = cp.id
+                                )x)
+                            ELSE NULL
+                        END
 
-    IF ('bre.unapi' = ANY (includes)) THEN
-        output := REGEXP_REPLACE(
-            tmp_xml,
-            '</' || top_el || '>(.*?)',
-            XMLELEMENT(
-                name abbr,
-                XMLATTRIBUTES(
-                    'http://www.w3.org/1999/xhtml' AS xmlns,
-                    'unapi-id' AS class,
-                    'tag:open-ils.org:U2@bre/' || obj_id || '/' || org AS title
+                    ),
+                    CASE 
+                        WHEN ('bmp' = ANY ($4)) THEN
+                            XMLELEMENT( name monograph_parts,
+                                (SELECT XMLAGG(bmp) FROM (
+                                    SELECT  unapi.bmp( part, 'xml', 'monograph_part', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8, FALSE)
+                                      FROM  asset.copy_part_map
+                                      WHERE target_copy = cp.id
+                                )x)
+                            )
+                        ELSE NULL
+                    END
                 )
-            )::TEXT || '</' || top_el || E'>\\1'
-        );
-    ELSE
-        output := tmp_xml;
-    END IF;
-
-    RETURN output;
-END;
-$F$ LANGUAGE PLPGSQL;
+          FROM  serial.unit cp
+          WHERE id = $1
+          GROUP BY  id, status, location, circ_lib, call_number, create_date, edit_date, copy_number, circulate, floating, mint_condition,
+                    deposit, ref, holdable, deleted, deposit_amount, price, barcode, circ_modifier, circ_as_type, opac_visible, status_changed_time, detailed_contents, sort_key, summary_contents, cost;
+$F$ LANGUAGE SQL;
 
+INSERT INTO config.upgrade_log (version) VALUES ('0568'); -- miker for tsbere
 
--- 0514
-CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
 DECLARE
-    me      biblio.record_entry%ROWTYPE;
-    layout  unapi.bre_output_layout%ROWTYPE;
-    xfrm    config.xml_transform%ROWTYPE;
-    ouid    INT;
-    tmp_xml TEXT;
-    top_el  TEXT;
-    output  XML;
-    hxml    XML;
-    axml    XML;
+    add_front       TEXT;
+    add_back        TEXT;
+    add_base_query  TEXT;
+    add_peer_query  TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
 BEGIN
+    add_base_query := $$
+        SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+                JOIN biblio.record_entry b ON (cn.record = b.id)
+          WHERE NOT cp.deleted
+                AND NOT cn.deleted
+                AND NOT b.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_peer_query := $$
+        SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+          WHERE NOT cp.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_front := $$
+        INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+          SELECT id, circ_lib, record FROM (
+    $$;
+    add_back := $$
+        ) AS x
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
 
-    SELECT id INTO ouid FROM actor.org_unit WHERE shortname = org;
-
-    IF ouid IS NULL THEN
-        RETURN NULL::XML;
-    END IF;
-
-    IF format = 'holdings_xml' THEN -- the special case
-        output := unapi.holdings_xml( obj_id, ouid, org, depth, includes, slimit, soffset, include_xmlns);
-        RETURN output;
-    END IF;
-
-    SELECT * INTO layout FROM unapi.bre_output_layout WHERE name = format;
-
-    IF layout.name IS NULL THEN
-        RETURN NULL::XML;
-    END IF;
-
-    SELECT * INTO xfrm FROM config.xml_transform WHERE name = layout.transform;
-
-    SELECT * INTO me FROM biblio.record_entry WHERE id = obj_id;
-
-    -- grab SVF if we need them
-    IF ('mra' = ANY (includes)) THEN
-        axml := unapi.mra(obj_id,NULL,NULL,NULL,NULL);
-    ELSE
-        axml := NULL::XML;
-    END IF;
-
-    -- grab hodlings if we need them
-    IF ('holdings_xml' = ANY (includes)) THEN
-        hxml := unapi.holdings_xml(obj_id, ouid, org, depth, evergreen.array_remove_item_by_value(includes,'holdings_xml'), slimit, soffset, include_xmlns);
-    ELSE
-        hxml := NULL::XML;
-    END IF;
-
-
-    -- generate our item node
-
-
-    IF format = 'marcxml' THEN
-        tmp_xml := me.marc;
-        IF tmp_xml !~ E'<marc:' THEN -- If we're not using the prefixed namespace in this record, then remove all declarations of it
-           tmp_xml := REGEXP_REPLACE(tmp_xml, ' xmlns:marc="http://www.loc.gov/MARC21/slim"', '', 'g');
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.target_copy || ' AND pbcm.record = ' || NEW.peer_record;
+            EXECUTE add_front || add_peer_query || add_back;
+            RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
         END IF;
-    ELSE
-        tmp_xml := oils_xslt_process(me.marc, xfrm.xslt)::XML;
     END IF;
 
-    top_el := REGEXP_REPLACE(tmp_xml, E'^.*?<((?:\\S+:)?' || layout.holdings_element || ').*$', E'\\1');
+    IF TG_OP = 'INSERT' THEN
 
-    IF axml IS NOT NULL THEN
-        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', axml || '</' || top_el || E'>\\1');
-    END IF;
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
 
-    IF hxml IS NOT NULL THEN -- XXX how do we configure the holdings position?
-        tmp_xml := REGEXP_REPLACE(tmp_xml, '</' || top_el || '>(.*?)$', hxml || '</' || top_el || E'>\\1');
-    END IF;
+        RETURN NEW;
 
-    IF ('bre.unapi' = ANY (includes)) THEN
-        output := REGEXP_REPLACE(
-            tmp_xml,
-            '</' || top_el || '>(.*?)',
-            XMLELEMENT(
-                name abbr,
-                XMLATTRIBUTES(
-                    'http://www.w3.org/1999/xhtml' AS xmlns,
-                    'unapi-id' AS class,
-                    'tag:open-ils.org:U2@bre/' || obj_id || '/' || org AS title
-                )
-            )::TEXT || '</' || top_el || E'>\\1'
-        );
-    ELSE
-        output := tmp_xml;
     END IF;
 
-    output := REGEXP_REPLACE(output::TEXT,E'>\\s+<','><','gs')::XML;
-    RETURN output;
-END;
-$F$ LANGUAGE PLPGSQL;
-
-
-
--- 0516
-CREATE OR REPLACE FUNCTION public.extract_acq_marc_field ( BIGINT, TEXT, TEXT) RETURNS TEXT AS $$    
-    SELECT extract_marc_field('acq.lineitem', $1, $2, $3);
-$$ LANGUAGE SQL;
-
--- 0518
-CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field( marc TEXT, ff TEXT ) RETURNS TEXT AS $func$
-DECLARE
-    rtype       TEXT;
-    ff_pos      RECORD;
-    tag_data    RECORD;
-    val         TEXT;
-BEGIN
-    rtype := (vandelay.marc21_record_type( marc )).code;
-    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE fixed_field = ff AND rec_type = rtype ORDER BY tag DESC LOOP
-        IF ff_pos.tag = 'ldr' THEN
-            val := oils_xpath_string('//*[local-name()="leader"]', marc);
-            IF val IS NOT NULL THEN
-                val := SUBSTRING( val, ff_pos.start_pos + 1, ff_pos.length );
-                RETURN val;
-            END IF;
-        ELSE 
-            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
-                val := SUBSTRING( tag_data.value, ff_pos.start_pos + 1, ff_pos.length );
-                RETURN val;
-            END LOOP;
-        END IF;
-        val := REPEAT( ff_pos.default_val, ff_pos.length );
-        RETURN val;
-    END LOOP;
-
-    RETURN NULL;
-END;
-$func$ LANGUAGE PLPGSQL;
-
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
 
--- 0519
-CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT ) RETURNS SETOF biblio.record_ff_map AS $func$
-DECLARE
-    tag_data    TEXT;
-    rtype       TEXT;
-    ff_pos      RECORD;
-    output      biblio.record_ff_map%ROWTYPE;
-BEGIN
-    rtype := (vandelay.marc21_record_type( marc )).code;
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
 
-    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE rec_type = rtype ORDER BY tag DESC LOOP
-        output.ff_name  := ff_pos.fixed_field;
-        output.ff_value := NULL;
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
+            END IF;
 
-        IF ff_pos.tag = 'ldr' THEN
-            output.ff_value := oils_xpath_string('//*[local-name()="leader"]', marc);
-            IF output.ff_value IS NOT NULL THEN
-                output.ff_value := SUBSTRING( output.ff_value, ff_pos.start_pos + 1, ff_pos.length );
-                RETURN NEXT output;
-                output.ff_value := NULL;
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
             END IF;
-        ELSE
-            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
-                output.ff_value := SUBSTRING( tag_data, ff_pos.start_pos + 1, ff_pos.length );
-                IF output.ff_value IS NULL THEN output.ff_value := REPEAT( ff_pos.default_val, ff_pos.length ); END IF;
-                RETURN NEXT output;
-                output.ff_value := NULL;
-            END LOOP;
-        END IF;
-    
-    END LOOP;
 
-    RETURN;
-END;
-$func$ LANGUAGE PLPGSQL;
+        END IF;
 
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+        END IF;
 
--- 0521
-CREATE OR REPLACE FUNCTION biblio.extract_located_uris( bib_id BIGINT, marcxml TEXT, editor_id INT ) RETURNS VOID AS $func$
-DECLARE
-    uris            TEXT[];
-    uri_xml         TEXT;
-    uri_label       TEXT;
-    uri_href        TEXT;
-    uri_use         TEXT;
-    uri_owner_list  TEXT[];
-    uri_owner       TEXT;
-    uri_owner_id    INT;
-    uri_id          INT;
-    uri_cn_id       INT;
-    uri_map_id      INT;
-BEGIN
+        RETURN NEW;
 
-    -- Clear any URI mappings and call numbers for this bib.
-    -- This leads to acn / auricnm inflation, but also enables
-    -- old acn/auricnm's to go away and for bibs to be deleted.
-    FOR uri_cn_id IN SELECT id FROM asset.call_number WHERE record = bib_id AND label = '##URI##' AND NOT deleted LOOP
-        DELETE FROM asset.uri_call_number_map WHERE call_number = uri_cn_id;
-        DELETE FROM asset.call_number WHERE id = uri_cn_id;
-    END LOOP;
+    END IF;
 
-    uris := oils_xpath('//*[@tag="856" and (@ind1="4" or @ind1="1") and (@ind2="0" or @ind2="1")]',marcxml);
-    IF ARRAY_UPPER(uris,1) > 0 THEN
-        FOR i IN 1 .. ARRAY_UPPER(uris, 1) LOOP
-            -- First we pull info out of the 856
-            uri_xml     := uris[i];
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
 
-            uri_href    := (oils_xpath('//*[@code="u"]/text()',uri_xml))[1];
-            uri_label   := (oils_xpath('//*[@code="y"]/text()|//*[@code="3"]/text()|//*[@code="u"]/text()',uri_xml))[1];
-            uri_use     := (oils_xpath('//*[@code="z"]/text()|//*[@code="2"]/text()|//*[@code="n"]/text()',uri_xml))[1];
-            CONTINUE WHEN uri_href IS NULL OR uri_label IS NULL;
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
+            END IF;
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+                EXECUTE add_front || add_base_query || add_back;
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_base_query := add_base_query || ' AND cn.record = ' || NEW.id;
+                add_peer_query := add_peer_query || ' AND pbcm.record = ' || NEW.id;
+                EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+            END IF;
+            RETURN NEW;
+        END IF;
+    END IF;
 
-            -- Get the distinct list of libraries wanting to use 
-            SELECT  ARRAY_ACCUM(
-                        DISTINCT REGEXP_REPLACE(
-                            x,
-                            $re$^.*?\((\w+)\).*$$re$,
-                            E'\\1'
-                        )
-                    ) INTO uri_owner_list
-              FROM  UNNEST(
-                        oils_xpath(
-                            '//*[@code="9"]/text()|//*[@code="w"]/text()|//*[@code="n"]/text()',
-                            uri_xml
-                        )
-                    )x;
+    IF TG_TABLE_NAME = 'call_number' THEN
 
-            IF ARRAY_UPPER(uri_owner_list,1) > 0 THEN
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
 
-                -- look for a matching uri
-                SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
-                IF NOT FOUND THEN -- create one
-                    INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
-                    IF uri_use IS NULL THEN
-                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction IS NULL AND active;
-                    ELSE
-                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
-                    END IF;
-                END IF;
+        RETURN NEW;
 
-                FOR j IN 1 .. ARRAY_UPPER(uri_owner_list, 1) LOOP
-                    uri_owner := uri_owner_list[j];
+    END IF;
 
-                    SELECT id INTO uri_owner_id FROM actor.org_unit WHERE shortname = uri_owner;
-                    CONTINUE WHEN NOT FOUND;
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
+    END IF;
 
-                    -- we need a call number to link through
-                    SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
-                    IF NOT FOUND THEN
-                        INSERT INTO asset.call_number (owning_lib, record, create_date, edit_date, creator, editor, label)
-                            VALUES (uri_owner_id, bib_id, 'now', 'now', editor_id, editor_id, '##URI##');
-                        SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
-                    END IF;
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
 
-                    -- now, link them if they're not already
-                    SELECT id INTO uri_map_id FROM asset.uri_call_number_map WHERE call_number = uri_cn_id AND uri = uri_id;
-                    IF NOT FOUND THEN
-                        INSERT INTO asset.uri_call_number_map (call_number, uri) VALUES (uri_cn_id, uri_id);
-                    END IF;
+        RETURN NEW;
 
-                END LOOP;
+    ELSIF NEW.opac_visible THEN -- add rows
 
-            END IF;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_base_query := add_base_query || ' AND cp.circ_lib = ' || NEW.id || ';';
+            add_peer_query := add_peer_query || ' AND cp.circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_base_query := add_base_query || ' AND cp.location = ' || NEW.id || ';';
+            add_peer_query := add_peer_query || ' AND cp.location = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_base_query := add_base_query || ' AND cp.status = ' || NEW.id || ';';
+            add_peer_query := add_peer_query || ' AND cp.status = ' || NEW.id || ';';
+        END IF;
+        EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+    ELSE -- delete rows
 
-        END LOOP;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
     END IF;
-
-    RETURN;
+    RETURN NEW;
 END;
 $func$ LANGUAGE PLPGSQL;
 
+INSERT INTO config.upgrade_log (version) VALUES ('0569'); --miker
 
--- 0522
-UPDATE config.org_unit_setting_type SET datatype = 'string' WHERE name = 'ui.general.button_bar';
+CREATE OR REPLACE FUNCTION unapi.auri ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name uri,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@auri/' || uri.id AS id,
+                        use_restriction,
+                        href,
+                        label
+                    ),
+                    XMLELEMENT( name copies,
+                        CASE
+                            WHEN ('acn' = ANY ($4)) THEN
+                                (SELECT XMLAGG(acn) FROM (SELECT unapi.acn( call_number, 'xml', 'copy', evergreen.array_remove_item_by_value($4,'auri'), $5, $6, $7, $8, FALSE) FROM asset.uri_call_number_map WHERE uri = uri.id)x)
+                            ELSE NULL
+                        END
+                    )
+                ) AS x
+          FROM  asset.uri uri
+          WHERE uri.id = $1
+          GROUP BY uri.id, use_restriction, href, label;
+$F$ LANGUAGE SQL;
 
-INSERT INTO config.org_unit_setting_type ( name, label, description, datatype) VALUES ('ui.general.hotkeyset', 'GUI: Default Hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset).  Examples: Default, Minimal, and None', 'string');
+INSERT INTO config.upgrade_log (version) VALUES ('0570');
 
-UPDATE actor.org_unit_setting SET value='"circ"' WHERE name = 'ui.general.button_bar' AND value='true';
+-- Not everything in 1XX tags should become part of the authorsort field
+-- ($0 for example).  The list of subfields chosen here is a superset of all
+-- the fields found in the LoC authority mappin definitions for 1XX fields.
+-- Anyway, if more fields should be here, add them.
 
-UPDATE actor.org_unit_setting SET value='"none"' WHERE name = 'ui.general.button_bar' AND value='false';
+UPDATE config.record_attr_definition
+    SET sf_list = 'abcdefgklmnopqrstvxyz'
+    WHERE name='authorsort' AND sf_list IS NULL;
 
+INSERT INTO config.upgrade_log (version) VALUES ('0571');
 
--- 0523
-INSERT into config.org_unit_setting_type
-( name, label, description, datatype, fm_class ) VALUES
-( 'cat.default_copy_status_fast',
-  oils_i18n_gettext( 'cat.default_copy_status_fast', 'Cataloging: Default copy status (fast add)', 'coust', 'label'),
-  oils_i18n_gettext( 'cat.default_copy_status_fast', 'Default status when a copy is created using the "Fast Add" interface.', 'coust', 'description'),
-  'link', 'ccs'
-);
+-- FIXME: add/check SQL statements to perform the upgrade
+CREATE OR REPLACE FUNCTION metabib.facet_normalize_trigger () RETURNS TRIGGER AS $$
+DECLARE
+    normalizer  RECORD;
+    facet_text  TEXT;
+BEGIN
+    facet_text := NEW.value;
+
+    FOR normalizer IN
+        SELECT  n.func AS func,
+                n.param_count AS param_count,
+                m.params AS params
+          FROM  config.index_normalizer n
+                JOIN config.metabib_field_index_norm_map m ON (m.norm = n.id)
+          WHERE m.field = NEW.field AND m.pos < 0
+          ORDER BY m.pos LOOP
+
+            EXECUTE 'SELECT ' || normalizer.func || '(' ||
+                quote_literal( facet_text ) ||
+                CASE
+                    WHEN normalizer.param_count > 0
+                        THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+                        ELSE ''
+                    END ||
+                ')' INTO facet_text;
 
-INSERT into config.org_unit_setting_type
-( name, label, description, datatype, fm_class ) VALUES
-( 'cat.default_copy_status_normal',
-  oils_i18n_gettext( 'cat.default_copy_status_normal', 'Cataloging: Default copy status (normal)', 'coust', 'label'),
-  oils_i18n_gettext( 'cat.default_copy_status_normal', 'Default status when a copy is created using the normal volume/copy creator interface.', 'coust', 'description'),
-  'link', 'ccs'
-);
+    END LOOP;
 
--- 0524
-INSERT into config.org_unit_setting_type
-( name, label, description, datatype ) VALUES
-( 'ui.unified_volume_copy_editor',
-  oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'GUI: Unified Volume/Item Creator/Editor', 'coust', 'label'),
-  oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'),
-  'bool'
-);
+    NEW.value = facet_text;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER facet_normalize_tgr
+    BEFORE UPDATE OR INSERT ON metabib.facet_entry
+    FOR EACH ROW EXECUTE PROCEDURE metabib.facet_normalize_trigger();
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0578'); -- tsbere via miker
+
+CREATE OR REPLACE VIEW reporter.hold_request_record AS
+SELECT id,
+       target,
+       hold_type,
+       CASE
+               WHEN hold_type = 'T'
+                       THEN target
+               WHEN hold_type = 'I'
+                       THEN (SELECT ssub.record_entry FROM serial.subscription ssub JOIN serial.issuance si ON (si.subscription = ssub.id) WHERE si.id = ahr.target)
+               WHEN hold_type = 'V'
+                       THEN (SELECT cn.record FROM asset.call_number cn WHERE cn.id = ahr.target)
+               WHEN hold_type IN ('C','R','F')
+                       THEN (SELECT cn.record FROM asset.call_number cn JOIN asset.copy cp ON (cn.id = cp.call_number) WHERE cp.id = ahr.target)
+               WHEN hold_type = 'M'
+                       THEN (SELECT mr.master_record FROM metabib.metarecord mr WHERE mr.id = ahr.target)
+        WHEN hold_type = 'P'
+            THEN (SELECT bmp.record FROM biblio.monograph_part bmp WHERE bmp.id = ahr.target)
+       END AS bib_record
+  FROM action.hold_request ahr;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0583');
+
+CREATE OR REPLACE VIEW action.all_circulation AS
+    SELECT  id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, grace_period, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
+        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ
+      FROM  action.aged_circulation
+            UNION ALL
+    SELECT  DISTINCT circ.id,COALESCE(a.post_code,b.post_code) AS usr_post_code, p.home_ou AS usr_home_ou, p.profile AS usr_profile, EXTRACT(YEAR FROM p.dob)::INT AS usr_birth_year,
+        cp.call_number AS copy_call_number, cp.location AS copy_location, cn.owning_lib AS copy_owning_lib, cp.circ_lib AS copy_circ_lib,
+        cn.record AS copy_bib_record, circ.xact_start, circ.xact_finish, circ.target_copy, circ.circ_lib, circ.circ_staff, circ.checkin_staff,
+        circ.checkin_lib, circ.renewal_remaining, circ.grace_period, circ.due_date, circ.stop_fines_time, circ.checkin_time, circ.create_time, circ.duration,
+        circ.fine_interval, circ.recurring_fine, circ.max_fine, circ.phone_renewal, circ.desk_renewal, circ.opac_renewal, circ.duration_rule,
+        circ.recurring_fine_rule, circ.max_fine_rule, circ.stop_fines, circ.workstation, circ.checkin_workstation, circ.checkin_scan_time,
+        circ.parent_circ
+      FROM  action.circulation circ
+        JOIN asset.copy cp ON (circ.target_copy = cp.id)
+        JOIN asset.call_number cn ON (cp.call_number = cn.id)
+        JOIN actor.usr p ON (circ.usr = p.id)
+        LEFT JOIN actor.usr_address a ON (p.mailing_address = a.id)
+        LEFT JOIN actor.usr_address b ON (p.billing_address = b.id);
 
--- 0525
-CREATE OR REPLACE FUNCTION biblio.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
-DECLARE
-    transformed_xml TEXT;
-    prev_xfrm       TEXT;
-    normalizer      RECORD;
-    xfrm            config.xml_transform%ROWTYPE;
-    attr_value      TEXT;
-    new_attrs       HSTORE := ''::HSTORE;
-    attr_def        config.record_attr_definition%ROWTYPE;
-BEGIN
 
-    IF NEW.deleted IS TRUE THEN -- If this bib is deleted
-        DELETE FROM metabib.metarecord_source_map WHERE source = NEW.id; -- Rid ourselves of the search-estimate-killing linkage
-        DELETE FROM metabib.record_attr WHERE id = NEW.id; -- Kill the attrs hash, useless on deleted records
-        DELETE FROM authority.bib_linking WHERE bib = NEW.id; -- Avoid updating fields in bibs that are no longer visible
-        DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = NEW.id; -- Separate any multi-homed items
-        RETURN NEW; -- and we're done
-    END IF;
 
-    IF TG_OP = 'UPDATE' THEN -- re-ingest?
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
+INSERT INTO config.upgrade_log (version) VALUES ('0590'); -- miker/tsbere
 
-        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+DECLARE
+    add_front       TEXT;
+    add_back        TEXT;
+    add_base_query  TEXT;
+    add_peer_query  TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
+BEGIN
+    add_base_query := $$
+        SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+                JOIN biblio.record_entry b ON (cn.record = b.id)
+          WHERE NOT cp.deleted
+                AND NOT cn.deleted
+                AND NOT b.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_peer_query := $$
+        SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+          WHERE NOT cp.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_front := $$
+        INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+          SELECT id, circ_lib, record FROM (
+    $$;
+    add_back := $$
+        ) AS x
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
+
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.target_copy || ' AND pbcm.record = ' || NEW.peer_record;
+            EXECUTE add_front || add_peer_query || add_back;
             RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
         END IF;
     END IF;
 
-    -- Record authority linking
-    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_linking' AND enabled;
-    IF NOT FOUND THEN
-        PERFORM biblio.map_authority_linking( NEW.id, NEW.marc );
-    END IF;
-
-    -- Flatten and insert the mfr data
-    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_full_rec' AND enabled;
-    IF NOT FOUND THEN
-        PERFORM metabib.reingest_metabib_full_rec(NEW.id);
+    IF TG_OP = 'INSERT' THEN
 
-        -- Now we pull out attribute data, which is dependent on the mfr for all but XPath-based fields
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_rec_descriptor' AND enabled;
-        IF NOT FOUND THEN
-            FOR attr_def IN SELECT * FROM config.record_attr_definition ORDER BY format LOOP
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
 
-                IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
-                    SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(value), COALESCE(attr_def.joiner,' ')) INTO attr_value
-                      FROM  (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
-                      WHERE record = NEW.id
-                            AND tag LIKE attr_def.tag
-                            AND CASE
-                                WHEN attr_def.sf_list IS NOT NULL 
-                                    THEN POSITION(subfield IN attr_def.sf_list) > 0
-                                ELSE TRUE
-                                END
-                      GROUP BY tag
-                      ORDER BY tag
-                      LIMIT 1;
+        RETURN NEW;
 
-                ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
-                    attr_value := biblio.marc21_extract_fixed_field(NEW.id, attr_def.fixed_field);
+    END IF;
 
-                ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
 
-                    SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
-            
-                    -- See if we can skip the XSLT ... it's expensive
-                    IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
-                        -- Can't skip the transform
-                        IF xfrm.xslt <> '---' THEN
-                            transformed_xml := oils_xslt_process(NEW.marc,xfrm.xslt);
-                        ELSE
-                            transformed_xml := NEW.marc;
-                        END IF;
-            
-                        prev_xfrm := xfrm.name;
-                    END IF;
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
 
-                    IF xfrm.name IS NULL THEN
-                        -- just grab the marcxml (empty) transform
-                        SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
-                        prev_xfrm := xfrm.name;
-                    END IF;
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
+            END IF;
 
-                    attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
+            END IF;
 
-                ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
-                    SELECT  m.value INTO attr_value
-                      FROM  biblio.marc21_physical_characteristics(NEW.id) v
-                            JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value)
-                      WHERE v.subfield = attr_def.phys_char_sf
-                      LIMIT 1; -- Just in case ...
+        END IF;
 
-                END IF;
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+        END IF;
 
-                -- apply index normalizers to attr_value
-                FOR normalizer IN
-                    SELECT  n.func AS func,
-                            n.param_count AS param_count,
-                            m.params AS params
-                      FROM  config.index_normalizer n
-                            JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
-                      WHERE attr = attr_def.name
-                      ORDER BY m.pos LOOP
-                        EXECUTE 'SELECT ' || normalizer.func || '(' ||
-                            quote_literal( attr_value ) ||
-                            CASE
-                                WHEN normalizer.param_count > 0
-                                    THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
-                                    ELSE ''
-                                END ||
-                            ')' INTO attr_value;
-        
-                END LOOP;
+        RETURN NEW;
 
-                -- Add the new value to the hstore
-                new_attrs := new_attrs || hstore( attr_def.name, attr_value );
+    END IF;
 
-            END LOOP;
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
 
-            IF TG_OP = 'INSERT' OR OLD.deleted THEN -- initial insert OR revivication
-                INSERT INTO metabib.record_attr (id, attrs) VALUES (NEW.id, new_attrs);
-            ELSE
-                UPDATE metabib.record_attr SET attrs = attrs || new_attrs WHERE id = NEW.id;
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
             END IF;
-
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+                EXECUTE add_front || add_base_query || add_back;
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_base_query := add_base_query || ' AND cn.record = ' || NEW.id;
+                add_peer_query := add_peer_query || ' AND pbcm.record = ' || NEW.id;
+                EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+            END IF;
+            RETURN NEW;
         END IF;
     END IF;
 
-    -- Gather and insert the field entry data
-    PERFORM metabib.reingest_metabib_field_entries(NEW.id);
+    IF TG_TABLE_NAME = 'call_number' THEN
 
-    -- Located URI magic
-    IF TG_OP = 'INSERT' THEN
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
-        END IF;
-    ELSE
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
         END IF;
+
+        RETURN NEW;
+
     END IF;
 
-    -- (re)map metarecord-bib linking
-    IF TG_OP = 'INSERT' THEN -- if not deleted and performing an insert, check for the flag
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_insert' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
-        END IF;
-    ELSE -- we're doing an update, and we're not deleted, remap
-        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_update' AND enabled;
-        IF NOT FOUND THEN
-            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
-        END IF;
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
     END IF;
 
-    RETURN NEW;
-END;
-$func$ LANGUAGE PLPGSQL;
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
 
-ALTER TABLE config.circ_matrix_weights ADD COLUMN marc_bib_level NUMERIC(6,2) NOT NULL DEFAULT 0.0;
+        RETURN NEW;
 
-UPDATE config.circ_matrix_weights
-SET marc_bib_level = marc_vr_format;
+    ELSIF NEW.opac_visible THEN -- add rows
 
-ALTER TABLE config.hold_matrix_weights ADD COLUMN marc_bib_level NUMERIC(6, 2) NOT NULL DEFAULT 0.0;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_base_query := add_base_query || ' AND cp.circ_lib = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.circ_lib = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_base_query := add_base_query || ' AND cp.location = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.location = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_base_query := add_base_query || ' AND cp.status = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.status = ' || NEW.id;
+        END IF;
+        EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+    ELSE -- delete rows
+
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-UPDATE config.hold_matrix_weights
-SET marc_bib_level = marc_vr_format;
+INSERT INTO config.upgrade_log (version) VALUES ('0591'); -- berick/miker
 
-ALTER TABLE config.circ_matrix_weights ALTER COLUMN marc_bib_level DROP DEFAULT;
+CREATE OR REPLACE FUNCTION action.usr_visible_circs (usr_id INT) RETURNS SETOF action.circulation AS $func$
+DECLARE
+    c               action.circulation%ROWTYPE;
+    view_age        INTERVAL;
+    usr_view_age    actor.usr_setting%ROWTYPE;
+    usr_view_start  actor.usr_setting%ROWTYPE;
+BEGIN
+    SELECT * INTO usr_view_age FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.circ.retention_age';
+    SELECT * INTO usr_view_start FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.circ.retention_start';
 
-ALTER TABLE config.hold_matrix_weights ALTER COLUMN marc_bib_level DROP DEFAULT;
+    IF usr_view_age.value IS NOT NULL AND usr_view_start.value IS NOT NULL THEN
+        -- User opted in and supplied a retention age
+        IF oils_json_to_text(usr_view_age.value)::INTERVAL > AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ) THEN
+            view_age := AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ);
+        ELSE
+            view_age := oils_json_to_text(usr_view_age.value)::INTERVAL;
+        END IF;
+    ELSIF usr_view_start.value IS NOT NULL THEN
+        -- User opted in
+        view_age := AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ);
+    ELSE
+        -- User did not opt in
+        RETURN;
+    END IF;
 
-ALTER TABLE config.circ_matrix_matchpoint ADD COLUMN marc_bib_level text;
+    FOR c IN
+        SELECT  *
+          FROM  action.circulation
+          WHERE usr = usr_id
+                AND parent_circ IS NULL
+                AND xact_start > NOW() - view_age
+          ORDER BY xact_start DESC
+    LOOP
+        RETURN NEXT c;
+    END LOOP;
 
-ALTER TABLE config.hold_matrix_matchpoint ADD COLUMN marc_bib_level text;
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, item_object asset.copy, user_object actor.usr, renewal BOOL ) RETURNS action.found_circ_matrix_matchpoint AS $func$
+CREATE OR REPLACE FUNCTION action.usr_visible_holds (usr_id INT) RETURNS SETOF action.hold_request AS $func$
 DECLARE
-    cn_object       asset.call_number%ROWTYPE;
-    rec_descriptor  metabib.rec_descriptor%ROWTYPE;
-    cur_matchpoint  config.circ_matrix_matchpoint%ROWTYPE;
-    matchpoint      config.circ_matrix_matchpoint%ROWTYPE;
-    weights         config.circ_matrix_weights%ROWTYPE;
-    user_age        INTERVAL;
-    denominator     NUMERIC(6,2);
-    row_list        INT[];
-    result          action.found_circ_matrix_matchpoint;
+    h               action.hold_request%ROWTYPE;
+    view_age        INTERVAL;
+    view_count      INT;
+    usr_view_count  actor.usr_setting%ROWTYPE;
+    usr_view_age    actor.usr_setting%ROWTYPE;
+    usr_view_start  actor.usr_setting%ROWTYPE;
 BEGIN
-    -- Assume failure
-    result.success = false;
-
-    -- Fetch useful data
-    SELECT INTO cn_object       * FROM asset.call_number        WHERE id = item_object.call_number;
-    SELECT INTO rec_descriptor  * FROM metabib.rec_descriptor   WHERE record = cn_object.record;
+    SELECT * INTO usr_view_count FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_count';
+    SELECT * INTO usr_view_age FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_age';
+    SELECT * INTO usr_view_start FROM actor.usr_setting WHERE usr = usr_id AND name = 'history.hold.retention_start';
+
+    FOR h IN
+        SELECT  *
+          FROM  action.hold_request
+          WHERE usr = usr_id
+                AND fulfillment_time IS NULL
+                AND cancel_time IS NULL
+          ORDER BY request_time DESC
+    LOOP
+        RETURN NEXT h;
+    END LOOP;
 
-    -- Pre-generate this so we only calc it once
-    IF user_object.dob IS NOT NULL THEN
-        SELECT INTO user_age age(user_object.dob);
+    IF usr_view_start.value IS NULL THEN
+        RETURN;
     END IF;
 
-    -- Grab the closest set circ weight setting.
-    SELECT INTO weights cw.*
-      FROM config.weight_assoc wa
-           JOIN config.circ_matrix_weights cw ON (cw.id = wa.circ_weights)
-           JOIN actor.org_unit_ancestors_distance( context_ou ) d ON (wa.org_unit = d.id)
-      WHERE active
-      ORDER BY d.distance
-      LIMIT 1;
+    IF usr_view_age.value IS NOT NULL THEN
+        -- User opted in and supplied a retention age
+        IF oils_json_to_text(usr_view_age.value)::INTERVAL > AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ) THEN
+            view_age := AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ);
+        ELSE
+            view_age := oils_json_to_text(usr_view_age.value)::INTERVAL;
+        END IF;
+    ELSE
+        -- User opted in
+        view_age := AGE(NOW(), oils_json_to_text(usr_view_start.value)::TIMESTAMPTZ);
+    END IF;
 
-    -- No weights? Bad admin! Defaults to handle that anyway.
-    IF weights.id IS NULL THEN
-        weights.grp                 := 11.0;
-        weights.org_unit            := 10.0;
-        weights.circ_modifier       := 5.0;
-        weights.marc_type           := 4.0;
-        weights.marc_form           := 3.0;
-        weights.marc_bib_level      := 2.0;
-        weights.marc_vr_format      := 2.0;
-        weights.copy_circ_lib       := 8.0;
-        weights.copy_owning_lib     := 8.0;
-        weights.user_home_ou        := 8.0;
-        weights.ref_flag            := 1.0;
-        weights.juvenile_flag       := 6.0;
-        weights.is_renewal          := 7.0;
-        weights.usr_age_lower_bound := 0.0;
-        weights.usr_age_upper_bound := 0.0;
+    IF usr_view_count.value IS NOT NULL THEN
+        view_count := oils_json_to_text(usr_view_count.value)::INT;
+    ELSE
+        view_count := 1000;
     END IF;
 
-    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
-    -- If you break your org tree with funky parenting this may be wrong
-    -- Note: This CTE is duplicated in the find_hold_matrix_matchpoint function, and it may be a good idea to split it off to a function
-    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
-    WITH all_distance(distance) AS (
-            SELECT depth AS distance FROM actor.org_unit_type
-        UNION
-                   SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
-       )
-    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+    -- show some fulfilled/canceled holds
+    FOR h IN
+        SELECT  *
+          FROM  action.hold_request
+          WHERE usr = usr_id
+                AND ( fulfillment_time IS NOT NULL OR cancel_time IS NOT NULL )
+                AND request_time > NOW() - view_age
+          ORDER BY request_time DESC
+          LIMIT view_count
+    LOOP
+        RETURN NEXT h;
+    END LOOP;
 
-    -- Loop over all the potential matchpoints
-    FOR cur_matchpoint IN
-        SELECT m.*
-          FROM  config.circ_matrix_matchpoint m
-                /*LEFT*/ JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.grp = upgad.id
-                /*LEFT*/ JOIN actor.org_unit_ancestors_distance( context_ou ) ctoua ON m.org_unit = ctoua.id
-                LEFT JOIN actor.org_unit_ancestors_distance( cn_object.owning_lib ) cnoua ON m.copy_owning_lib = cnoua.id
-                LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.copy_circ_lib = iooua.id
-                LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
-          WHERE m.active
-                -- Permission Groups
-             -- AND (m.grp                      IS NULL OR upgad.id IS NOT NULL) -- Optional Permission Group?
-                -- Org Units
-             -- AND (m.org_unit                 IS NULL OR ctoua.id IS NOT NULL) -- Optional Org Unit?
-                AND (m.copy_owning_lib          IS NULL OR cnoua.id IS NOT NULL)
-                AND (m.copy_circ_lib            IS NULL OR iooua.id IS NOT NULL)
-                AND (m.user_home_ou             IS NULL OR uhoua.id IS NOT NULL)
-                -- Circ Type
-                AND (m.is_renewal               IS NULL OR m.is_renewal = renewal)
-                -- Static User Checks
-                AND (m.juvenile_flag            IS NULL OR m.juvenile_flag = user_object.juvenile)
-                AND (m.usr_age_lower_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_lower_bound < user_age))
-                AND (m.usr_age_upper_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_upper_bound > user_age))
-                -- Static Item Checks
-                AND (m.circ_modifier            IS NULL OR m.circ_modifier = item_object.circ_modifier)
-                AND (m.marc_type                IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
-                AND (m.marc_form                IS NULL OR m.marc_form = rec_descriptor.item_form)
-                AND (m.marc_bib_level           IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
-                AND (m.marc_vr_format           IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
-                AND (m.ref_flag                 IS NULL OR m.ref_flag = item_object.ref)
-          ORDER BY
-                -- Permission Groups
-                CASE WHEN upgad.distance        IS NOT NULL THEN 2^(2*weights.grp - (upgad.distance/denominator)) ELSE 0.0 END +
-                -- Org Units
-                CASE WHEN ctoua.distance        IS NOT NULL THEN 2^(2*weights.org_unit - (ctoua.distance/denominator)) ELSE 0.0 END +
-                CASE WHEN cnoua.distance        IS NOT NULL THEN 2^(2*weights.copy_owning_lib - (cnoua.distance/denominator)) ELSE 0.0 END +
-                CASE WHEN iooua.distance        IS NOT NULL THEN 2^(2*weights.copy_circ_lib - (iooua.distance/denominator)) ELSE 0.0 END +
-                CASE WHEN uhoua.distance        IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
-                -- Circ Type                    -- Note: 4^x is equiv to 2^(2*x)
-                CASE WHEN m.is_renewal          IS NOT NULL THEN 4^weights.is_renewal ELSE 0.0 END +
-                -- Static User Checks
-                CASE WHEN m.juvenile_flag       IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
-                CASE WHEN m.usr_age_lower_bound IS NOT NULL THEN 4^weights.usr_age_lower_bound ELSE 0.0 END +
-                CASE WHEN m.usr_age_upper_bound IS NOT NULL THEN 4^weights.usr_age_upper_bound ELSE 0.0 END +
-                -- Static Item Checks
-                CASE WHEN m.circ_modifier       IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
-                CASE WHEN m.marc_type           IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
-                CASE WHEN m.marc_form           IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
-                CASE WHEN m.marc_vr_format      IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
-                CASE WHEN m.ref_flag            IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END DESC,
-                -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
-                -- This prevents "we changed the table order by updating a rule, and we started getting different results"
-                m.id LOOP
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-        -- Record the full matching row list
-        row_list := row_list || cur_matchpoint.id;
+INSERT INTO config.upgrade_log (version) VALUES ('0599'); -- miker/gmc
+
+UPDATE config.metabib_field 
+SET xpath = $$//mods32:mods/mods32:name[@type='personal' and not(mods32:role/mods32:roleTerm[text()='creator'])]$$
+WHERE field_class = 'author'
+AND name = 'other'
+AND xpath = $$//mods32:mods/mods32:name[@type='personal' and not(mods32:role)]$$
+AND format = 'mods32';
+
+\qecho To reindex bibs that use the author|other index definition,
+\qecho you can run something like this:
+\qecho
+\qecho SELECT metabib.reingest_metabib_field_entries(record)
+\qecho FROM (
+\qecho   SELECT DISTINCT record
+\qecho   FROM metabib.real_full_rec
+\qecho   WHERE tag IN ('600', '700', '720', '800')
+\qecho   AND   subfield IN ('4', 'e')
+\qecho ) a;
+
+-- Resolves an error in calculating copy counts for org lassos
+-- Per LP 790329
+INSERT INTO config.upgrade_log (version) VALUES ('0603');
+
+-- FIXME: add/check SQL statements to perform the upgrade
+CREATE OR REPLACE FUNCTION asset.opac_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
 
-        -- No matchpoint yet?
-        IF matchpoint.id IS NULL THEN
-            -- Take the entire matchpoint as a starting point
-            matchpoint := cur_matchpoint;
-            CONTINUE; -- No need to look at this row any more.
-        END IF;
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.copy_id)
+          GROUP BY 1,2,6;
 
-        -- Incomplete matchpoint?
-        IF matchpoint.circulate IS NULL THEN
-            matchpoint.circulate := cur_matchpoint.circulate;
-        END IF;
-        IF matchpoint.duration_rule IS NULL THEN
-            matchpoint.duration_rule := cur_matchpoint.duration_rule;
-        END IF;
-        IF matchpoint.recurring_fine_rule IS NULL THEN
-            matchpoint.recurring_fine_rule := cur_matchpoint.recurring_fine_rule;
-        END IF;
-        IF matchpoint.max_fine_rule IS NULL THEN
-            matchpoint.max_fine_rule := cur_matchpoint.max_fine_rule;
-        END IF;
-        IF matchpoint.hard_due_date IS NULL THEN
-            matchpoint.hard_due_date := cur_matchpoint.hard_due_date;
-        END IF;
-        IF matchpoint.total_copy_hold_ratio IS NULL THEN
-            matchpoint.total_copy_hold_ratio := cur_matchpoint.total_copy_hold_ratio;
-        END IF;
-        IF matchpoint.available_copy_hold_ratio IS NULL THEN
-            matchpoint.available_copy_hold_ratio := cur_matchpoint.available_copy_hold_ratio;
-        END IF;
-        IF matchpoint.renewals IS NULL THEN
-            matchpoint.renewals := cur_matchpoint.renewals;
-        END IF;
-        IF matchpoint.grace_period IS NULL THEN
-            matchpoint.grace_period := cur_matchpoint.grace_period;
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
         END IF;
-    END LOOP;
-
-    -- Check required fields
-    IF matchpoint.circulate             IS NOT NULL AND
-       matchpoint.duration_rule         IS NOT NULL AND
-       matchpoint.recurring_fine_rule   IS NOT NULL AND
-       matchpoint.max_fine_rule         IS NOT NULL THEN
-        -- All there? We have a completed match.
-        result.success := true;
-    END IF;
 
-    -- Include the assembled matchpoint, even if it isn't complete
-    result.matchpoint := matchpoint;
+    END LOOP;   
+                
+    RETURN;     
+END;            
+$f$ LANGUAGE PLPGSQL;
 
-    -- Include (for debugging) the full list of matching rows
-    result.buildrows := row_list;
 
-    -- Hand the result back to caller
-    RETURN result;
-END;
-$func$ LANGUAGE plpgsql;
+-- Staff record copy counts also triggered an SQL error for org lassos
+-- Per LP790329
+--
+INSERT INTO config.upgrade_log (version) VALUES ('0604');
 
-CREATE OR REPLACE FUNCTION action.find_hold_matrix_matchpoint(pickup_ou integer, request_ou integer, match_item bigint, match_user integer, match_requestor integer)
-  RETURNS integer AS
-$func$
+CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
 DECLARE
-    requestor_object    actor.usr%ROWTYPE;
-    user_object         actor.usr%ROWTYPE;
-    item_object         asset.copy%ROWTYPE;
-    item_cn_object      asset.call_number%ROWTYPE;
-    rec_descriptor      metabib.rec_descriptor%ROWTYPE;
-    matchpoint          config.hold_matrix_matchpoint%ROWTYPE;
-    weights             config.hold_matrix_weights%ROWTYPE;
-    denominator         NUMERIC(6,2);
+    ans RECORD;
+    trans INT;
 BEGIN
-    SELECT INTO user_object         * FROM actor.usr                WHERE id = match_user;
-    SELECT INTO requestor_object    * FROM actor.usr                WHERE id = match_requestor;
-    SELECT INTO item_object         * FROM asset.copy               WHERE id = match_item;
-    SELECT INTO item_cn_object      * FROM asset.call_number        WHERE id = item_object.call_number;
-    SELECT INTO rec_descriptor      * FROM metabib.rec_descriptor   WHERE record = item_cn_object.record;
-
-    -- The item's owner should probably be the one determining if the item is holdable
-    -- How to decide that is debatable. Decided to default to the circ library (where the item lives)
-    -- This flag will allow for setting it to the owning library (where the call number "lives")
-    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.weight_owner_not_circ' AND enabled;
-
-    -- Grab the closest set circ weight setting.
-    IF NOT FOUND THEN
-        -- Default to circ library
-        SELECT INTO weights hw.*
-          FROM config.weight_assoc wa
-               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
-               JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) d ON (wa.org_unit = d.id)
-          WHERE active
-          ORDER BY d.distance
-          LIMIT 1;
-    ELSE
-        -- Flag is set, use owning library
-        SELECT INTO weights hw.*
-          FROM config.weight_assoc wa
-               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
-               JOIN actor.org_unit_ancestors_distance( cn_object.owning_lib ) d ON (wa.org_unit = d.id)
-          WHERE active
-          ORDER BY d.distance
-          LIMIT 1;
-    END IF;
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
 
-    -- No weights? Bad admin! Defaults to handle that anyway.
-    IF weights.id IS NULL THEN
-        weights.user_home_ou    := 5.0;
-        weights.request_ou      := 5.0;
-        weights.pickup_ou       := 5.0;
-        weights.item_owning_ou  := 5.0;
-        weights.item_circ_ou    := 5.0;
-        weights.usr_grp         := 7.0;
-        weights.requestor_grp   := 8.0;
-        weights.circ_modifier   := 4.0;
-        weights.marc_type       := 3.0;
-        weights.marc_form       := 2.0;
-        weights.marc_bib_level  := 1.0;
-        weights.marc_vr_format  := 1.0;
-        weights.juvenile_flag   := 4.0;
-        weights.ref_flag        := 0.0;
-    END IF;
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
 
-    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
-    -- If you break your org tree with funky parenting this may be wrong
-    -- Note: This CTE is duplicated in the find_circ_matrix_matchpoint function, and it may be a good idea to split it off to a function
-    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
-    WITH all_distance(distance) AS (
-            SELECT depth AS distance FROM actor.org_unit_type
-        UNION
-            SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
-       )
-    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
 
-    -- To ATTEMPT to make this work like it used to, make it reverse the user/requestor profile ids.
-    -- This may be better implemented as part of the upgrade script?
-    -- Set usr_grp = requestor_grp, requestor_grp = 1 or something when this flag is already set
-    -- Then remove this flag, of course.
-    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.usr_not_requestor' AND enabled;
+    END LOOP;
 
-    IF FOUND THEN
-        -- Note: This, to me, is REALLY hacky. I put it in anyway.
-        -- If you can't tell, this is a single call swap on two variables.
-        SELECT INTO user_object.profile, requestor_object.profile
-                    requestor_object.profile, user_object.profile;
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0614'); --miker/phasefx
+
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+DECLARE
+    add_front       TEXT;
+    add_back        TEXT;
+    add_base_query  TEXT;
+    add_peer_query  TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
+BEGIN
+    add_base_query := $$
+        SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+                JOIN biblio.record_entry b ON (cn.record = b.id)
+          WHERE NOT cp.deleted
+                AND NOT cn.deleted
+                AND NOT b.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_peer_query := $$
+        SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+          WHERE NOT cp.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_front := $$
+        INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+          SELECT id, circ_lib, record FROM (
+    $$;
+    add_back := $$
+        ) AS x
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
+
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.target_copy || ' AND pbcm.peer_record = ' || NEW.peer_record;
+            EXECUTE add_front || add_peer_query || add_back;
+            RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
+        END IF;
     END IF;
 
-    -- Select the winning matchpoint into the matchpoint variable for returning
-    SELECT INTO matchpoint m.*
-      FROM  config.hold_matrix_matchpoint m
-            /*LEFT*/ JOIN permission.grp_ancestors_distance( requestor_object.profile ) rpgad ON m.requestor_grp = rpgad.id
-            LEFT JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.usr_grp = upgad.id
-            LEFT JOIN actor.org_unit_ancestors_distance( pickup_ou ) puoua ON m.pickup_ou = puoua.id
-            LEFT JOIN actor.org_unit_ancestors_distance( request_ou ) rqoua ON m.request_ou = rqoua.id
-            LEFT JOIN actor.org_unit_ancestors_distance( item_cn_object.owning_lib ) cnoua ON m.item_owning_ou = cnoua.id
-            LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.item_circ_ou = iooua.id
-            LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
-      WHERE m.active
-            -- Permission Groups
-         -- AND (m.requestor_grp        IS NULL OR upgad.id IS NOT NULL) -- Optional Requestor Group?
-            AND (m.usr_grp              IS NULL OR upgad.id IS NOT NULL)
-            -- Org Units
-            AND (m.pickup_ou            IS NULL OR (puoua.id IS NOT NULL AND (puoua.distance = 0 OR NOT m.strict_ou_match)))
-            AND (m.request_ou           IS NULL OR (rqoua.id IS NOT NULL AND (rqoua.distance = 0 OR NOT m.strict_ou_match)))
-            AND (m.item_owning_ou       IS NULL OR (cnoua.id IS NOT NULL AND (cnoua.distance = 0 OR NOT m.strict_ou_match)))
-            AND (m.item_circ_ou         IS NULL OR (iooua.id IS NOT NULL AND (iooua.distance = 0 OR NOT m.strict_ou_match)))
-            AND (m.user_home_ou         IS NULL OR (uhoua.id IS NOT NULL AND (uhoua.distance = 0 OR NOT m.strict_ou_match)))
-            -- Static User Checks
-            AND (m.juvenile_flag        IS NULL OR m.juvenile_flag = user_object.juvenile)
-            -- Static Item Checks
-            AND (m.circ_modifier        IS NULL OR m.circ_modifier = item_object.circ_modifier)
-            AND (m.marc_type            IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
-            AND (m.marc_form            IS NULL OR m.marc_form = rec_descriptor.item_form)
-            AND (m.marc_bib_level       IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
-            AND (m.marc_vr_format       IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
-            AND (m.ref_flag             IS NULL OR m.ref_flag = item_object.ref)
-      ORDER BY
-            -- Permission Groups
-            CASE WHEN rpgad.distance    IS NOT NULL THEN 2^(2*weights.requestor_grp - (rpgad.distance/denominator)) ELSE 0.0 END +
-            CASE WHEN upgad.distance    IS NOT NULL THEN 2^(2*weights.usr_grp - (upgad.distance/denominator)) ELSE 0.0 END +
-            -- Org Units
-            CASE WHEN puoua.distance    IS NOT NULL THEN 2^(2*weights.pickup_ou - (puoua.distance/denominator)) ELSE 0.0 END +
-            CASE WHEN rqoua.distance    IS NOT NULL THEN 2^(2*weights.request_ou - (rqoua.distance/denominator)) ELSE 0.0 END +
-            CASE WHEN cnoua.distance    IS NOT NULL THEN 2^(2*weights.item_owning_ou - (cnoua.distance/denominator)) ELSE 0.0 END +
-            CASE WHEN iooua.distance    IS NOT NULL THEN 2^(2*weights.item_circ_ou - (iooua.distance/denominator)) ELSE 0.0 END +
-            CASE WHEN uhoua.distance    IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
-            -- Static User Checks       -- Note: 4^x is equiv to 2^(2*x)
-            CASE WHEN m.juvenile_flag   IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
-            -- Static Item Checks
-            CASE WHEN m.circ_modifier   IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
-            CASE WHEN m.marc_type       IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
-            CASE WHEN m.marc_form       IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
-            CASE WHEN m.marc_vr_format  IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
-            CASE WHEN m.ref_flag        IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END DESC,
-            -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
-            -- This prevents "we changed the table order by updating a rule, and we started getting different results"
-            m.id;
+    IF TG_OP = 'INSERT' THEN
 
-    -- Return just the ID for now
-    RETURN matchpoint.id;
-END;
-$func$ LANGUAGE 'plpgsql';
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
 
--- 0528
-CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$
-use strict;
-use MARC::Record;
-use MARC::File::XML (BinaryEncoding => 'UTF-8');
-use MARC::Charset;
-use Encode;
-use Unicode::Normalize;
+        RETURN NEW;
 
-MARC::Charset->assume_unicode(1);
+    END IF;
 
-my $record = MARC::Record->new_from_xml($_TD->{new}{marc});
-my $schema = $_TD->{table_schema};
-my $rec_id = $_TD->{new}{id};
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
 
-# Short-circuit if maintaining control numbers per MARC21 spec is not enabled
-my $enable = spi_exec_query("SELECT enabled FROM config.global_flag WHERE name = 'cat.maintain_control_numbers'");
-if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') {
-    return;
-}
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
 
-# Get the control number identifier from an OU setting based on $_TD->{new}{owner}
-my $ou_cni = 'EVRGRN';
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
+            END IF;
 
-my $owner;
-if ($schema eq 'serial') {
-    $owner = $_TD->{new}{owning_lib};
-} else {
-    # are.owner and bre.owner can be null, so fall back to the consortial setting
-    $owner = $_TD->{new}{owner} || 1;
-}
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
+            END IF;
 
-my $ous_rv = spi_exec_query("SELECT value FROM actor.org_unit_ancestor_setting('cat.marc_control_number_identifier', $owner)");
-if ($ous_rv->{processed}) {
-    $ou_cni = $ous_rv->{rows}[0]->{value};
-    $ou_cni =~ s/"//g; # Stupid VIM syntax highlighting"
-} else {
-    # Fall back to the shortname of the OU if there was no OU setting
-    $ous_rv = spi_exec_query("SELECT shortname FROM actor.org_unit WHERE id = $owner");
-    if ($ous_rv->{processed}) {
-        $ou_cni = $ous_rv->{rows}[0]->{shortname};
-    }
-}
+        END IF;
 
-my ($create, $munge) = (0, 0);
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+        END IF;
 
-my @scns = $record->field('035');
+        RETURN NEW;
 
-foreach my $id_field ('001', '003') {
-    my $spec_value;
-    my @controls = $record->field($id_field);
+    END IF;
 
-    if ($id_field eq '001') {
-        $spec_value = $rec_id;
-    } else {
-        $spec_value = $ou_cni;
-    }
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
 
-    # Create the 001/003 if none exist
-    if (scalar(@controls) == 1) {
-        # Only one field; check to see if we need to munge it
-        unless (grep $_->data() eq $spec_value, @controls) {
-            $munge = 1;
-        }
-    } else {
-        # Delete the other fields, as with more than 1 001/003 we do not know which 003/001 to match
-        foreach my $control (@controls) {
-            unless ($control->data() eq $spec_value) {
-                $record->delete_field($control);
-            }
-        }
-        $record->insert_fields_ordered(MARC::Field->new($id_field, $spec_value));
-        $create = 1;
-    }
-}
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
+            END IF;
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+                EXECUTE add_front || add_base_query || add_back;
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_base_query := add_base_query || ' AND cn.record = ' || NEW.id;
+                add_peer_query := add_peer_query || ' AND pbcm.peer_record = ' || NEW.id;
+                EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+            END IF;
+            RETURN NEW;
+        END IF;
+    END IF;
 
-# Now, if we need to munge the 001, we will first push the existing 001/003
-# into the 035; but if the record did not have one (and one only) 001 and 003
-# to begin with, skip this process
-if ($munge and not $create) {
-    my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data();
+    IF TG_TABLE_NAME = 'call_number' THEN
 
-    # Do not create duplicate 035 fields
-    unless (grep $_->subfield('a') eq $scn, @scns) {
-        $record->insert_fields_ordered(MARC::Field->new('035', '', '', 'a' => $scn));
-    }
-}
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
 
-# Set the 001/003 and update the MARC
-if ($create or $munge) {
-    $record->field('001')->data($rec_id);
-    $record->field('003')->data($ou_cni);
+        RETURN NEW;
 
-    my $xml = $record->as_xml_record();
-    $xml =~ s/\n//sgo;
-    $xml =~ s/^<\?xml.+\?\s*>//go;
-    $xml =~ s/>\s+</></go;
-    $xml =~ s/\p{Cc}//go;
+    END IF;
 
-    # Embed a version of OpenILS::Application::AppUtils->entityize()
-    # to avoid having to set PERL5LIB for PostgreSQL as well
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
+    END IF;
 
-    # If we are going to convert non-ASCII characters to XML entities,
-    # we had better be dealing with a UTF8 string to begin with
-    $xml = decode_utf8($xml);
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
 
-    $xml = NFC($xml);
+        RETURN NEW;
 
-    # Convert raw ampersands to entities
-    $xml =~ s/&(?!\S+;)/&amp;/gso;
+    ELSIF NEW.opac_visible THEN -- add rows
 
-    # Convert Unicode characters to entities
-    $xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_base_query := add_base_query || ' AND cp.circ_lib = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.circ_lib = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_base_query := add_base_query || ' AND cp.location = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.location = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_base_query := add_base_query || ' AND cp.status = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.status = ' || NEW.id;
+        END IF;
+        EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+    ELSE -- delete rows
 
-    $xml =~ s/[\x00-\x1f]//go;
-    $_TD->{new}{marc} = $xml;
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-    return "MODIFY";
-}
+INSERT INTO config.upgrade_log (version) VALUES ('0579'); -- superceded by 0620
+INSERT INTO config.upgrade_log (version) VALUES ('0620'); -- tsbere via miker
 
-return;
-$func$ LANGUAGE PLPERLU;
+CREATE OR REPLACE FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS SETOF action.circ_matrix_test_result AS $func$
+DECLARE
+    user_object             actor.usr%ROWTYPE;
+    standing_penalty        config.standing_penalty%ROWTYPE;
+    item_object             asset.copy%ROWTYPE;
+    item_status_object      config.copy_status%ROWTYPE;
+    item_location_object    asset.copy_location%ROWTYPE;
+    result                  action.circ_matrix_test_result;
+    circ_test               action.found_circ_matrix_matchpoint;
+    circ_matchpoint         config.circ_matrix_matchpoint%ROWTYPE;
+    out_by_circ_mod         config.circ_matrix_circ_mod_test%ROWTYPE;
+    circ_mod_map            config.circ_matrix_circ_mod_test_map%ROWTYPE;
+    hold_ratio              action.hold_stats%ROWTYPE;
+    penalty_type            TEXT;
+    items_out               INT;
+    context_org_list        INT[];
+    done                    BOOL := FALSE;
+BEGIN
+    -- Assume success unless we hit a failure condition
+    result.success := TRUE;
 
-CREATE OR REPLACE FUNCTION authority.generate_overlay_template ( TEXT, BIGINT ) RETURNS TEXT AS $func$
+    -- Need user info to look up matchpoints
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user AND NOT deleted;
 
-    use MARC::Record;
-    use MARC::File::XML (BinaryEncoding => 'UTF-8');
-    use MARC::Charset;
+    -- (Insta)Fail if we couldn't find the user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
 
-    MARC::Charset->assume_unicode(1);
+    -- Need item info to look up matchpoints
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item AND NOT deleted;
 
-    my $xml = shift;
-    my $r = MARC::Record->new_from_xml( $xml );
+    -- (Insta)Fail if we couldn't find the item 
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
 
-    return undef unless ($r);
+    SELECT INTO circ_test * FROM action.find_circ_matrix_matchpoint(circ_ou, item_object, user_object, renewal);
 
-    my $id = shift() || $r->subfield( '901' => 'c' );
-    $id =~ s/^\s*(?:\([^)]+\))?\s*(.+)\s*?$/$1/;
-    return undef unless ($id); # We need an ID!
+    circ_matchpoint             := circ_test.matchpoint;
+    result.matchpoint           := circ_matchpoint.id;
+    result.circulate            := circ_matchpoint.circulate;
+    result.duration_rule        := circ_matchpoint.duration_rule;
+    result.recurring_fine_rule  := circ_matchpoint.recurring_fine_rule;
+    result.max_fine_rule        := circ_matchpoint.max_fine_rule;
+    result.hard_due_date        := circ_matchpoint.hard_due_date;
+    result.renewals             := circ_matchpoint.renewals;
+    result.grace_period         := circ_matchpoint.grace_period;
+    result.buildrows            := circ_test.buildrows;
 
-    my $tmpl = MARC::Record->new();
-    $tmpl->encoding( 'UTF-8' );
+    -- (Insta)Fail if we couldn't find a matchpoint
+    IF circ_test.success = false THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
 
-    my @rule_fields;
-    for my $field ( $r->field( '1..' ) ) { # Get main entry fields from the authority record
+    -- All failures before this point are non-recoverable
+    -- Below this point are possibly overridable failures
 
-        my $tag = $field->tag;
-        my $i1 = $field->indicator(1);
-        my $i2 = $field->indicator(2);
-        my $sf = join '', map { $_->[0] } $field->subfields;
-        my @data = map { @$_ } $field->subfields;
+    -- Fail if the user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
 
-        my @replace_them;
+    -- Fail if the item can't circulate
+    IF item_object.circulate IS FALSE THEN
+        result.fail_part := 'asset.copy.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
 
-        # Map the authority field to bib fields it can control.
-        if ($tag >= 100 and $tag <= 111) {       # names
-            @replace_them = map { $tag + $_ } (0, 300, 500, 600, 700);
-        } elsif ($tag eq '130') {                # uniform title
-            @replace_them = qw/130 240 440 730 830/;
-        } elsif ($tag >= 150 and $tag <= 155) {  # subjects
-            @replace_them = ($tag + 500);
-        } elsif ($tag >= 180 and $tag <= 185) {  # floating subdivisions
-            @replace_them = qw/100 400 600 700 800 110 410 610 710 810 111 411 611 711 811 130 240 440 730 830 650 651 655/;
-        } else {
-            next;
-        }
+    -- Fail if the item isn't in a circulateable status on a non-renewal
+    IF NOT renewal AND item_object.status NOT IN ( 0, 7, 8 ) THEN 
+        result.fail_part := 'asset.copy.status';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    -- Alternately, fail if the item isn't checked out on a renewal
+    ELSIF renewal AND item_object.status <> 1 THEN
+        result.fail_part := 'asset.copy.status';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
 
-        # Dummy up the bib-side data
-        $tmpl->append_fields(
-            map {
-                MARC::Field->new( $_, $i1, $i2, @data )
-            } @replace_them
-        );
+    -- Fail if the item can't circulate because of the shelving location
+    SELECT INTO item_location_object * FROM asset.copy_location WHERE id = item_object.location;
+    IF item_location_object.circulate IS FALSE THEN
+        result.fail_part := 'asset.copy_location.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
 
-        # Construct some 'replace' rules
-        push @rule_fields, map { $_ . $sf . '[0~\)' .$id . '$]' } @replace_them;
-    }
+    -- Use Circ OU for penalties and such
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( circ_ou );
 
-    # Insert the replace rules into the template
-    $tmpl->append_fields(
-        MARC::Field->new( '905' => ' ' => ' ' => 'r' => join(',', @rule_fields ) )
-    );
+    IF renewal THEN
+        penalty_type = '%RENEW%';
+    ELSE
+        penalty_type = '%CIRC%';
+    END IF;
 
-    $xml = $tmpl->as_xml_record;
-    $xml =~ s/^<\?.+?\?>$//mo;
-    $xml =~ s/\n//sgo;
-    $xml =~ s/>\s+</></sgo;
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE penalty_type LOOP
 
-    return $xml;
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
 
-$func$ LANGUAGE PLPERLU;
+    -- Fail if the test is set to hard non-circulating
+    IF circ_matchpoint.circulate IS FALSE THEN
+        result.fail_part := 'config.circ_matrix_test.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Fail if the total copy-hold ratio is too low
+    IF circ_matchpoint.total_copy_hold_ratio IS NOT NULL THEN
+        SELECT INTO hold_ratio * FROM action.copy_related_hold_stats(match_item);
+        IF hold_ratio.total_copy_ratio IS NOT NULL AND hold_ratio.total_copy_ratio < circ_matchpoint.total_copy_hold_ratio THEN
+            result.fail_part := 'config.circ_matrix_test.total_copy_hold_ratio';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
 
-CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$
+    -- Fail if the available copy-hold ratio is too low
+    IF circ_matchpoint.available_copy_hold_ratio IS NOT NULL THEN
+        IF hold_ratio.hold_count IS NULL THEN
+            SELECT INTO hold_ratio * FROM action.copy_related_hold_stats(match_item);
+        END IF;
+        IF hold_ratio.available_copy_ratio IS NOT NULL AND hold_ratio.available_copy_ratio < circ_matchpoint.available_copy_hold_ratio THEN
+            result.fail_part := 'config.circ_matrix_test.available_copy_hold_ratio';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
 
-    use MARC::Record;
-    use MARC::File::XML (BinaryEncoding => 'UTF-8');
-    use MARC::Charset;
-    use strict;
+    -- Fail if the user has too many items with specific circ_modifiers checked out
+    FOR out_by_circ_mod IN SELECT * FROM config.circ_matrix_circ_mod_test WHERE matchpoint = circ_matchpoint.id LOOP
+        SELECT  INTO items_out COUNT(*)
+          FROM  action.circulation circ
+            JOIN asset.copy cp ON (cp.id = circ.target_copy)
+          WHERE circ.usr = match_user
+               AND circ.circ_lib IN ( SELECT * FROM unnest(context_org_list) )
+            AND circ.checkin_time IS NULL
+            AND (circ.stop_fines IN ('MAXFINES','LONGOVERDUE') OR circ.stop_fines IS NULL)
+            AND cp.circ_modifier IN (SELECT circ_mod FROM config.circ_matrix_circ_mod_test_map WHERE circ_mod_test = out_by_circ_mod.id);
+        IF items_out >= out_by_circ_mod.items_out THEN
+            result.fail_part := 'config.circ_matrix_circ_mod_test';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END LOOP;
 
-    MARC::Charset->assume_unicode(1);
+    -- If we passed everything, return the successful matchpoint
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
 
-    my $target_xml = shift;
-    my $source_xml = shift;
-    my $field_spec = shift;
-    my $force_add = shift || 0;
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
 
-    my $target_r = MARC::Record->new_from_xml( $target_xml );
-    my $source_r = MARC::Record->new_from_xml( $source_xml );
 
-    return $target_xml unless ($target_r && $source_r);
 
-    my @field_list = split(',', $field_spec);
+INSERT INTO config.upgrade_log (version) VALUES ('0628');
 
-    my %fields;
-    for my $f (@field_list) {
-        $f =~ s/^\s*//; $f =~ s/\s*$//;
-        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
-            my $field = $1;
-            $field =~ s/\s+//;
-            my $sf = $2;
-            $sf =~ s/\s+//;
-            my $match = $3;
-            $match =~ s/^\s*//; $match =~ s/\s*$//;
-            $fields{$field} = { sf => [ split('', $sf) ] };
-            if ($match) {
-                my ($msf,$mre) = split('~', $match);
-                if (length($msf) > 0 and length($mre) > 0) {
-                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
-                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
-                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
-                }
-            }
-        }
-    }
+-- acq.fund_combined_balance and acq.fund_spent_balance are unchanged,
+-- however we need to drop them to recreate the other views.
+-- we need to drop all our views because we change the number of columns
+-- for example, debit_total does not need an encumberance column when we 
+-- have a sepearate total for that.
 
-    for my $f ( keys %fields) {
-        if ( @{$fields{$f}{sf}} ) {
-            for my $from_field ($source_r->field( $f )) {
-                my @tos = $target_r->field( $f );
-                if (!@tos) {
-                    next if (exists($fields{$f}{match}) and !$force_add);
-                    my @new_fields = map { $_->clone } $source_r->field( $f );
-                    $target_r->insert_fields_ordered( @new_fields );
-                } else {
-                    for my $to_field (@tos) {
-                        if (exists($fields{$f}{match})) {
-                            next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
-                        }
-                        my @new_sf = map { ($_ => $from_field->subfield($_)) } @{$fields{$f}{sf}};
-                        $to_field->add_subfields( @new_sf );
-                    }
-                }
-            }
-        } else {
-            my @new_fields = map { $_->clone } $source_r->field( $f );
-            $target_r->insert_fields_ordered( @new_fields );
-        }
-    }
+DROP VIEW acq.fund_spent_balance;
+DROP VIEW acq.fund_combined_balance;
+DROP VIEW acq.fund_encumbrance_total;
+DROP VIEW acq.fund_spent_total;
+DROP VIEW acq.fund_debit_total;
 
-    $target_xml = $target_r->as_xml_record;
-    $target_xml =~ s/^<\?.+?\?>$//mo;
-    $target_xml =~ s/\n//sgo;
-    $target_xml =~ s/>\s+</></sgo;
+CREATE OR REPLACE VIEW acq.fund_debit_total AS
+    SELECT  fund.id AS fund, 
+            sum(COALESCE(fund_debit.amount, 0::numeric)) AS amount
+    FROM acq.fund fund
+        LEFT JOIN acq.fund_debit fund_debit ON fund.id = fund_debit.fund
+    GROUP BY fund.id;
 
-    return $target_xml;
+CREATE OR REPLACE VIEW acq.fund_encumbrance_total AS
+    SELECT 
+        fund.id AS fund, 
+        sum(COALESCE(fund_debit.amount, 0::numeric)) AS amount 
+    FROM acq.fund fund
+        LEFT JOIN acq.fund_debit fund_debit ON fund.id = fund_debit.fund 
+    WHERE fund_debit.encumbrance GROUP BY fund.id;
 
-$_$ LANGUAGE PLPERLU;
+CREATE OR REPLACE VIEW acq.fund_spent_total AS
+    SELECT  fund.id AS fund, 
+            sum(COALESCE(fund_debit.amount, 0::numeric)) AS amount 
+    FROM acq.fund fund
+        LEFT JOIN acq.fund_debit fund_debit ON fund.id = fund_debit.fund 
+    WHERE NOT fund_debit.encumbrance 
+    GROUP BY fund.id;
 
-CREATE OR REPLACE FUNCTION authority.normalize_heading( TEXT ) RETURNS TEXT AS $func$
-    use strict;
-    use warnings;
+CREATE OR REPLACE VIEW acq.fund_combined_balance AS
+    SELECT  c.fund, 
+            c.amount - COALESCE(d.amount, 0.0) AS amount
+    FROM acq.fund_allocation_total c
+    LEFT JOIN acq.fund_debit_total d USING (fund);
 
-    use utf8;
-    use MARC::Record;
-    use MARC::File::XML (BinaryEncoding => 'UTF8');
-    use MARC::Charset;
-    use UUID::Tiny ':std';
+CREATE OR REPLACE VIEW acq.fund_spent_balance AS
+    SELECT  c.fund,
+            c.amount - COALESCE(d.amount,0.0) AS amount
+      FROM  acq.fund_allocation_total c
+            LEFT JOIN acq.fund_spent_total d USING (fund);
 
-    MARC::Charset->assume_unicode(1);
 
-    my $xml = shift() or return undef;
 
-    my $r;
+INSERT INTO config.upgrade_log (version) VALUES ('0631');
 
-    # Prevent errors in XML parsing from blowing out ungracefully
-    eval {
-        $r = MARC::Record->new_from_xml( $xml );
-        1;
-    } or do {
-       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
-    };
+CREATE OR REPLACE FUNCTION search.query_parser_fts (
 
-    if (!$r) {
-       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
-    }
+    param_search_ou INT,
+    param_depth     INT,
+    param_query     TEXT,
+    param_statuses  INT[],
+    param_locations INT[],
+    param_offset    INT,
+    param_check     INT,
+    param_limit     INT,
+    metarecord      BOOL,
+    staff           BOOL
+) RETURNS SETOF search.search_result AS $func$
+DECLARE
 
-    # From http://www.loc.gov/standards/sourcelist/subject.html
-    my $thes_code_map = {
-        a => 'lcsh',
-        b => 'lcshac',
-        c => 'mesh',
-        d => 'nal',
-        k => 'cash',
-        n => 'notapplicable',
-        r => 'aat',
-        s => 'sears',
-        v => 'rvm',
-    };
+    current_res         search.search_result%ROWTYPE;
+    search_org_list     INT[];
+    luri_org_list       INT[];
+    tmp_int_list        INT[];
 
-    # Default to "No attempt to code" if the leader is horribly broken
-    my $fixed_field = $r->field('008');
-    my $thes_char = '|';
-    if ($fixed_field) { 
-        $thes_char = substr($fixed_field->data(), 11, 1) || '|';
-    }
+    check_limit         INT;
+    core_limit          INT;
+    core_offset         INT;
+    tmp_int             INT;
 
-    my $thes_code = 'UNDEFINED';
+    core_result         RECORD;
+    core_cursor         REFCURSOR;
+    core_rel_query      TEXT;
 
-    if ($thes_char eq 'z') {
-        # Grab the 040 $f per http://www.loc.gov/marc/authority/ad040.html
-        $thes_code = $r->subfield('040', 'f') || 'UNDEFINED';
-    } elsif ($thes_code_map->{$thes_char}) {
-        $thes_code = $thes_code_map->{$thes_char};
-    }
+    total_count         INT := 0;
+    check_count         INT := 0;
+    deleted_count       INT := 0;
+    visible_count       INT := 0;
+    excluded_count      INT := 0;
 
-    my $auth_txt = '';
-    my $head = $r->field('1..');
-    if ($head) {
-        # Concatenate all of these subfields together, prefixed by their code
-        # to prevent collisions along the lines of "Fiction, North Carolina"
-        foreach my $sf ($head->subfields()) {
-            $auth_txt .= '‡' . $sf->[0] . ' ' . $sf->[1];
-        }
-    }
-    
-    if ($auth_txt) {
-        my $stmt = spi_prepare('SELECT public.naco_normalize($1) AS norm_text', 'TEXT');
-        my $result = spi_exec_prepared($stmt, $auth_txt);
-        my $norm_txt = $result->{rows}[0]->{norm_text};
-        spi_freeplan($stmt);
-        undef($stmt);
-        return $head->tag() . "_" . $thes_code . " " . $norm_txt;
-    }
+BEGIN
 
-    return 'NOHEADING_' . $thes_code . ' ' . create_uuid_as_string(UUID_MD5, $xml);
-$func$ LANGUAGE 'plperlu' IMMUTABLE;
+    check_limit := COALESCE( param_check, 1000 );
+    core_limit  := COALESCE( param_limit, 25000 );
+    core_offset := COALESCE( param_offset, 0 );
 
-CREATE OR REPLACE FUNCTION vandelay.strip_field ( xml TEXT, field TEXT ) RETURNS TEXT AS $_$
+    -- core_skip_chk := COALESCE( param_skip_chk, 1 );
 
-    use MARC::Record;
-    use MARC::File::XML (BinaryEncoding => 'UTF-8');
-    use MARC::Charset;
-    use strict;
+    IF param_search_ou > 0 THEN
+        IF param_depth IS NOT NULL THEN
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
+        ELSE
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
+        END IF;
 
-    MARC::Charset->assume_unicode(1);
+        SELECT array_accum(distinct id) INTO luri_org_list FROM actor.org_unit_ancestors( param_search_ou );
 
-    my $xml = shift;
-    my $r = MARC::Record->new_from_xml( $xml );
+    ELSIF param_search_ou < 0 THEN
+        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
 
-    return $xml unless ($r);
+        FOR tmp_int IN SELECT * FROM UNNEST(search_org_list) LOOP
+            SELECT array_accum(distinct id) INTO tmp_int_list FROM actor.org_unit_ancestors( tmp_int );
+            luri_org_list := luri_org_list || tmp_int_list;
+        END LOOP;
 
-    my $field_spec = shift;
-    my @field_list = split(',', $field_spec);
+        SELECT array_accum(DISTINCT x.id) INTO luri_org_list FROM UNNEST(luri_org_list) x(id);
 
-    my %fields;
-    for my $f (@field_list) {
-        $f =~ s/^\s*//; $f =~ s/\s*$//;
-        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
-            my $field = $1;
-            $field =~ s/\s+//;
-            my $sf = $2;
-            $sf =~ s/\s+//;
-            my $match = $3;
-            $match =~ s/^\s*//; $match =~ s/\s*$//;
-            $fields{$field} = { sf => [ split('', $sf) ] };
-            if ($match) {
-                my ($msf,$mre) = split('~', $match);
-                if (length($msf) > 0 and length($mre) > 0) {
-                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
-                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
-                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
-                }
-            }
-        }
-    }
+    ELSIF param_search_ou = 0 THEN
+        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
+    END IF;
 
-    for my $f ( keys %fields) {
-        for my $to_field ($r->field( $f )) {
-            if (exists($fields{$f}{match})) {
-                next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
-            }
+    OPEN core_cursor FOR EXECUTE param_query;
 
-            if ( @{$fields{$f}{sf}} ) {
-                $to_field->delete_subfield(code => $fields{$f}{sf});
-            } else {
-                $r->delete_field( $to_field );
-            }
-        }
-    }
+    LOOP
 
-    $xml = $r->as_xml_record;
-    $xml =~ s/^<\?.+?\?>$//mo;
-    $xml =~ s/\n//sgo;
-    $xml =~ s/>\s+</></sgo;
+        FETCH core_cursor INTO core_result;
+        EXIT WHEN NOT FOUND;
+        EXIT WHEN total_count >= core_limit;
 
-    return $xml;
+        total_count := total_count + 1;
 
-$_$ LANGUAGE PLPERLU;
+        CONTINUE WHEN total_count NOT BETWEEN  core_offset + 1 AND check_limit + core_offset;
 
-CREATE OR REPLACE FUNCTION biblio.flatten_marc ( TEXT ) RETURNS SETOF metabib.full_rec AS $func$
+        check_count := check_count + 1;
 
-use MARC::Record;
-use MARC::File::XML (BinaryEncoding => 'UTF-8');
-use MARC::Charset;
+        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
+        IF NOT FOUND THEN
+            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
+            deleted_count := deleted_count + 1;
+            CONTINUE;
+        END IF;
 
-MARC::Charset->assume_unicode(1);
+        PERFORM 1
+          FROM  biblio.record_entry b
+                JOIN config.bib_source s ON (b.source = s.id)
+          WHERE s.transcendant
+                AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
 
-my $xml = shift;
-my $r = MARC::Record->new_from_xml( $xml );
+        IF FOUND THEN
+            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
+            visible_count := visible_count + 1;
 
-return_next( { tag => 'LDR', value => $r->leader } );
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
 
-for my $f ( $r->fields ) {
-       if ($f->is_control_field) {
-               return_next({ tag => $f->tag, value => $f->data });
-       } else {
-               for my $s ($f->subfields) {
-                       return_next({
-                               tag      => $f->tag,
-                               ind1     => $f->indicator(1),
-                               ind2     => $f->indicator(2),
-                               subfield => $s->[0],
-                               value    => $s->[1]
-                       });
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
 
-                       if ( $f->tag eq '245' and $s->[0] eq 'a' ) {
-                               my $trim = $f->indicator(2) || 0;
-                               return_next({
-                                       tag      => 'tnf',
-                                       ind1     => $f->indicator(1),
-                                       ind2     => $f->indicator(2),
-                                       subfield => 'a',
-                                       value    => substr( $s->[1], $trim )
-                               });
-                       }
-               }
-       }
-}
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
 
-return undef;
+            RETURN NEXT current_res;
 
-$func$ LANGUAGE PLPERLU;
+            CONTINUE;
+        END IF;
 
-CREATE OR REPLACE FUNCTION authority.flatten_marc ( TEXT ) RETURNS SETOF authority.full_rec AS $func$
+        PERFORM 1
+          FROM  asset.call_number cn
+                JOIN asset.uri_call_number_map map ON (map.call_number = cn.id)
+                JOIN asset.uri uri ON (map.uri = uri.id)
+          WHERE NOT cn.deleted
+                AND cn.label = '##URI##'
+                AND uri.active
+                AND ( param_locations IS NULL OR array_upper(param_locations, 1) IS NULL )
+                AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                AND cn.owning_lib IN ( SELECT * FROM unnest( luri_org_list ) )
+          LIMIT 1;
 
-use MARC::Record;
-use MARC::File::XML (BinaryEncoding => 'UTF-8');
-use MARC::Charset;
+        IF FOUND THEN
+            -- RAISE NOTICE ' % have at least one URI ... ', core_result.records;
+            visible_count := visible_count + 1;
 
-MARC::Charset->assume_unicode(1);
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
 
-my $xml = shift;
-my $r = MARC::Record->new_from_xml( $xml );
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
 
-return_next( { tag => 'LDR', value => $r->leader } );
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
 
-for my $f ( $r->fields ) {
-    if ($f->is_control_field) {
-        return_next({ tag => $f->tag, value => $f->data });
-    } else {
-        for my $s ($f->subfields) {
-            return_next({
-                tag      => $f->tag,
-                ind1     => $f->indicator(1),
-                ind2     => $f->indicator(2),
-                subfield => $s->[0],
-                value    => $s->[1]
-            });
+            RETURN NEXT current_res;
 
-        }
-    }
-}
+            CONTINUE;
+        END IF;
 
-return undef;
+        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
 
-$func$ LANGUAGE PLPERLU;
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
 
--- 0529
-INSERT INTO config.org_unit_setting_type 
-( name, label, description, datatype ) VALUES 
-( 'circ.user_merge.delete_addresses', 
-  'Circ:  Patron Merge Address Delete', 
-  'Delete address(es) of subordinate user(s) in a patron merge', 
-   'bool'
-);
+            IF NOT FOUND THEN
+                PERFORM 1
+                  FROM  biblio.peer_bib_copy_map pr
+                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
+                  WHERE NOT cp.deleted
+                        AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
+                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
+                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                  LIMIT 1;
 
-INSERT INTO config.org_unit_setting_type 
-( name, label, description, datatype ) VALUES 
-( 'circ.user_merge.delete_cards', 
-  'Circ: Patron Merge Barcode Delete', 
-  'Delete barcode(s) of subordinate user(s) in a patron merge', 
-  'bool'
-);
+                IF NOT FOUND THEN
+                -- RAISE NOTICE ' % and multi-home linked records were all status-excluded ... ', core_result.records;
+                    excluded_count := excluded_count + 1;
+                    CONTINUE;
+                END IF;
+            END IF;
 
-INSERT INTO config.org_unit_setting_type 
-( name, label, description, datatype ) VALUES 
-( 'circ.user_merge.deactivate_cards', 
-  'Circ:  Patron Merge Deactivate Card', 
-  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
-  'bool'
-);
+        END IF;
 
--- 0530
-CREATE INDEX actor_usr_day_phone_idx_numeric ON actor.usr USING BTREE 
-    (evergreen.lowercase(REGEXP_REPLACE(day_phone, '[^0-9]', '', 'g')));
+        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
 
-CREATE INDEX actor_usr_evening_phone_idx_numeric ON actor.usr USING BTREE 
-    (evergreen.lowercase(REGEXP_REPLACE(evening_phone, '[^0-9]', '', 'g')));
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
 
-CREATE INDEX actor_usr_other_phone_idx_numeric ON actor.usr USING BTREE 
-    (evergreen.lowercase(REGEXP_REPLACE(other_phone, '[^0-9]', '', 'g')));
+            IF NOT FOUND THEN
+                PERFORM 1
+                  FROM  biblio.peer_bib_copy_map pr
+                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
+                  WHERE NOT cp.deleted
+                        AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
+                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
+                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                  LIMIT 1;
 
--- 0533
-CREATE OR REPLACE FUNCTION action.age_circ_on_delete () RETURNS TRIGGER AS $$
-DECLARE
-found char := 'N';
-BEGIN
+                IF NOT FOUND THEN
+                    -- RAISE NOTICE ' % and multi-home linked records were all copy_location-excluded ... ', core_result.records;
+                    excluded_count := excluded_count + 1;
+                    CONTINUE;
+                END IF;
+            END IF;
 
-    -- If there are any renewals for this circulation, don't archive or delete
-    -- it yet.   We'll do so later, when we archive and delete the renewals.
+        END IF;
 
-    SELECT 'Y' INTO found
-    FROM action.circulation
-    WHERE parent_circ = OLD.id
-    LIMIT 1;
+        IF staff IS NULL OR NOT staff THEN
 
-    IF found = 'Y' THEN
-        RETURN NULL;  -- don't delete
-       END IF;
+            PERFORM 1
+              FROM  asset.opac_visible_copies
+              WHERE circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
 
-    -- Archive a copy of the old row to action.aged_circulation
+            IF NOT FOUND THEN
+                PERFORM 1
+                  FROM  biblio.peer_bib_copy_map pr
+                        JOIN asset.opac_visible_copies cp ON (cp.copy_id = pr.target_copy)
+                  WHERE cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
+                  LIMIT 1;
 
-    INSERT INTO action.aged_circulation
-        (id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
-        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
-        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, grace_period, due_date,
-        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
-        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
-        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ)
-      SELECT
-        id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
-        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
-        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, grace_period, due_date,
-        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
-        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
-        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ
-        FROM action.all_circulation WHERE id = OLD.id;
+                IF NOT FOUND THEN
 
-    RETURN OLD;
-END;
-$$ LANGUAGE 'plpgsql';
+                    -- RAISE NOTICE ' % and multi-home linked records were all visibility-excluded ... ', core_result.records;
+                    excluded_count := excluded_count + 1;
+                    CONTINUE;
+                END IF;
+            END IF;
 
--- 0534
-CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
-DECLARE
-    matchpoint_id        INT;
-    user_object        actor.usr%ROWTYPE;
-    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
-    standing_penalty    config.standing_penalty%ROWTYPE;
-    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
-    transit_source        actor.org_unit%ROWTYPE;
-    item_object        asset.copy%ROWTYPE;
-    item_cn_object     asset.call_number%ROWTYPE;
-    ou_skip              actor.org_unit_setting%ROWTYPE;
-    result            action.matrix_test_result;
-    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
-    hold_count        INT;
-    hold_transit_prox    INT;
-    frozen_hold_count    INT;
-    context_org_list    INT[];
-    done            BOOL := FALSE;
-BEGIN
-    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
-    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
+        ELSE
 
-    result.success := TRUE;
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
 
-    -- Fail if we couldn't find a user
-    IF user_object.id IS NULL THEN
-        result.fail_part := 'no_user';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
+            IF NOT FOUND THEN
 
-    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
+                PERFORM 1
+                  FROM  biblio.peer_bib_copy_map pr
+                        JOIN asset.copy cp ON (cp.id = pr.target_copy)
+                  WHERE NOT cp.deleted
+                        AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                        AND pr.peer_record IN ( SELECT * FROM unnest( core_result.records ) )
+                  LIMIT 1;
 
-    -- Fail if we couldn't find a copy
-    IF item_object.id IS NULL THEN
-        result.fail_part := 'no_item';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
+                IF NOT FOUND THEN
 
-    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
-    result.matchpoint := matchpoint_id;
+                    PERFORM 1
+                      FROM  asset.call_number cn
+                            JOIN asset.copy cp ON (cp.call_number = cn.id)
+                      WHERE cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                            AND NOT cp.deleted
+                      LIMIT 1;
 
-    SELECT INTO ou_skip * FROM actor.org_unit_setting WHERE name = 'circ.holds.target_skip_me' AND org_unit = item_object.circ_lib;
+                    IF FOUND THEN
+                        -- RAISE NOTICE ' % and multi-home linked records were all visibility-excluded ... ', core_result.records;
+                        excluded_count := excluded_count + 1;
+                        CONTINUE;
+                    END IF;
+                END IF;
 
-    -- Fail if the circ_lib for the item has circ.holds.target_skip_me set to true
-    IF ou_skip.id IS NOT NULL AND ou_skip.value = 'true' THEN
-        result.fail_part := 'circ.holds.target_skip_me';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
+            END IF;
 
-    -- Fail if user is barred
-    IF user_object.barred IS TRUE THEN
-        result.fail_part := 'actor.usr.barred';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
+        END IF;
 
-    -- Fail if we couldn't find any matchpoint (requires a default)
-    IF matchpoint_id IS NULL THEN
-        result.fail_part := 'no_matchpoint';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-        RETURN;
-    END IF;
+        visible_count := visible_count + 1;
 
-    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
+        current_res.id = core_result.id;
+        current_res.rel = core_result.rel;
 
-    IF hold_test.holdable IS FALSE THEN
-        result.fail_part := 'config.hold_matrix_test.holdable';
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
-    END IF;
+        tmp_int := 1;
+        IF metarecord THEN
+            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+        END IF;
 
-    IF hold_test.transit_range IS NOT NULL THEN
-        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
-        IF hold_test.distance_is_from_owner THEN
-            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
+        IF tmp_int = 1 THEN
+            current_res.record = core_result.records[1];
         ELSE
-            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
+            current_res.record = NULL;
         END IF;
 
-        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
+        RETURN NEXT current_res;
 
-        IF NOT FOUND THEN
-            result.fail_part := 'transit_range';
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
+        IF visible_count % 1000 = 0 THEN
+            -- RAISE NOTICE ' % visible so far ... ', visible_count;
         END IF;
-    END IF;
-    FOR standing_penalty IN
-        SELECT  DISTINCT csp.*
-          FROM  actor.usr_standing_penalty usp
-                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
-          WHERE usr = match_user
-                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
-                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
-                AND csp.block_list LIKE '%HOLD%' LOOP
 
-        result.fail_part := standing_penalty.name;
-        result.success := FALSE;
-        done := TRUE;
-        RETURN NEXT result;
     END LOOP;
 
-    IF hold_test.stop_blocked_user IS TRUE THEN
-        FOR standing_penalty IN
-            SELECT  DISTINCT csp.*
-              FROM  actor.usr_standing_penalty usp
-                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
-              WHERE usr = match_user
-                    AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
-                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
-                    AND csp.block_list LIKE '%CIRC%' LOOP
-    
-            result.fail_part := standing_penalty.name;
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END LOOP;
-    END IF;
+    current_res.id = NULL;
+    current_res.rel = NULL;
+    current_res.record = NULL;
+    current_res.total = total_count;
+    current_res.checked = check_count;
+    current_res.deleted = deleted_count;
+    current_res.visible = visible_count;
+    current_res.excluded = excluded_count;
 
-    IF hold_test.max_holds IS NOT NULL AND NOT retargetting THEN
-        SELECT    INTO hold_count COUNT(*)
-          FROM    action.hold_request
-          WHERE    usr = match_user
-            AND fulfillment_time IS NULL
-            AND cancel_time IS NULL
-            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
+    CLOSE core_cursor;
 
-        IF hold_count >= hold_test.max_holds THEN
-            result.fail_part := 'config.hold_matrix_test.max_holds';
-            result.success := FALSE;
-            done := TRUE;
-            RETURN NEXT result;
-        END IF;
-    END IF;
+    RETURN NEXT current_res;
 
-    IF item_object.age_protect IS NOT NULL THEN
-        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
+END;
+$func$ LANGUAGE PLPGSQL;
 
-        IF item_object.create_date + age_protect_object.age > NOW() THEN
-            IF hold_test.distance_is_from_owner THEN
-                SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
-                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
-            ELSE
-                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
-            END IF;
 
-            IF hold_transit_prox > age_protect_object.prox THEN
-                result.fail_part := 'config.rule_age_hold_protect.prox';
-                result.success := FALSE;
-                done := TRUE;
-                RETURN NEXT result;
-            END IF;
-        END IF;
-    END IF;
+INSERT INTO config.upgrade_log (version) VALUES ('0633');
+INSERT INTO config.upgrade_log (version) VALUES ('0634');
 
-    IF NOT done THEN
-        RETURN NEXT result;
-    END IF;
+COMMIT;
 
-    RETURN;
-END;
-$func$ LANGUAGE plpgsql;
+--0633
+INSERT into config.org_unit_setting_type
+( name, grp, label, description, datatype ) VALUES
+(
+        'print.custom_js_file', 'circ',
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Printing: Custom Javascript File',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Full URL path to a Javascript File to be loaded when printing. Should'
+            || ' implement a print_custom function for DOM manipulation. Can change'
+            || ' the value of the do_print variable to false to cancel printing.',
+            'coust',
+            'description'
+        ),
+        'string'
+    );
 
--- do potentially large updates last to save time if upgrader needs
--- to manually tweak the upgrade script to resolve errors
 
--- 0505
-UPDATE metabib.facet_entry SET value = evergreen.force_unicode_normal_form(value,'NFC');
+--0634
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 513, 'DEBUG_CLIENT', oils_i18n_gettext( 513,
+    'Allows a user to use debug functions in the staff client', 'ppl', 'description' ));
 
-UPDATE asset.call_number SET id = id WHERE deleted IS FALSE OR deleted = FALSE;
 
--- Update reporter.materialized_simple_record with normalized ISBN values
--- This might not get all of them, but most ISBNs will have more than one hyphen
-DELETE FROM reporter.materialized_simple_record WHERE id IN (
-    SELECT record FROM metabib.full_rec WHERE tag = '020' AND subfield IN ('a', 'z') AND value LIKE '%-%-%'
+-- 0529
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_addresses', 
+  'Circ:  Patron Merge Address Delete', 
+  'Delete address(es) of subordinate user(s) in a patron merge', 
+   'bool'
 );
 
-INSERT INTO reporter.materialized_simple_record
-    SELECT DISTINCT rossr.* FROM reporter.old_super_simple_record rossr INNER JOIN metabib.full_rec mfr ON mfr.record = rossr.id
-        WHERE mfr.tag = '020' AND mfr.subfield IN ('a', 'z') AND mfr.value LIKE '%-%-%'
-;
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_cards', 
+  'Circ: Patron Merge Barcode Delete', 
+  'Delete barcode(s) of subordinate user(s) in a patron merge', 
+  'bool'
+);
 
-COMMIT;
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.deactivate_cards', 
+  'Circ:  Patron Merge Deactivate Card', 
+  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
+  'bool'
+);
 
 DROP TRIGGER IF EXISTS mat_summary_add_tgr ON money.cash_payment;
 DROP TRIGGER IF EXISTS mat_summary_upd_tgr ON money.cash_payment;
@@ -6029,3 +8897,24 @@ CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.check_payment FOR EACH
 CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('check_payment');
 CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('check_payment');
 
+
+UPDATE  metabib.record_attr
+  SET   attrs = attrs || asort
+  FROM  (SELECT record,
+                HSTORE('authorsort',FIRST(value)) AS asort
+          FROM  metabib.full_rec
+          WHERE tag like '1%'
+        GROUP BY 1) x
+  WHERE x.record = metabib.record_attr.id;
+
+UPDATE  metabib.record_attr
+  SET   attrs = attrs || tsort
+  FROM  (SELECT record,
+                HSTORE('titlesort',FIRST(value)) AS tsort
+          FROM  metabib.full_rec
+          WHERE tag = 'tnf'
+        GROUP BY 1) x
+  WHERE x.record = metabib.record_attr.id;
+
+
+
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.0-2.0.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.0-2.0.1-upgrade-db.sql
new file mode 100644 (file)
index 0000000..6c911f6
--- /dev/null
@@ -0,0 +1,340 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.1');
+INSERT INTO config.upgrade_log (version) VALUES ('0480');
+
+DROP FUNCTION IF EXISTS actor.usr_purge_data(INT, INT);
+CREATE FUNCTION actor.usr_purge_data(
+       src_usr  IN INTEGER,
+       specified_dest_usr IN INTEGER
+) RETURNS VOID AS $$
+DECLARE
+       suffix TEXT;
+       renamable_row RECORD;
+       dest_usr INTEGER;
+BEGIN
+
+       IF specified_dest_usr IS NULL THEN
+               dest_usr := 1; -- Admin user on stock installs
+       ELSE
+               dest_usr := specified_dest_usr;
+       END IF;
+
+       UPDATE actor.usr SET
+               active = FALSE,
+               card = NULL,
+               mailing_address = NULL,
+               billing_address = NULL
+       WHERE id = src_usr;
+
+       -- acq.*
+       UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr;
+       UPDATE acq.lineitem SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE acq.lineitem SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE acq.lineitem SET selector = dest_usr WHERE selector = src_usr;
+       UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr;
+       DELETE FROM acq.lineitem_usr_attr_definition WHERE usr = src_usr;
+
+       -- Update with a rename to avoid collisions
+       FOR renamable_row in
+               SELECT id, name
+               FROM   acq.picklist
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  acq.picklist
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+       UPDATE acq.picklist SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE acq.picklist SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr;
+       UPDATE acq.purchase_order SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE acq.purchase_order SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE acq.claim_event SET creator = dest_usr WHERE creator = src_usr;
+
+       -- action.*
+       DELETE FROM action.circulation WHERE usr = src_usr;
+       UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr;
+       UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr;
+       UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr;
+       UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr;
+       UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr;
+       DELETE FROM action.hold_request WHERE usr = src_usr;
+       UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr;
+       UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr;
+       DELETE FROM action.non_cataloged_circulation WHERE patron = src_usr;
+       UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr;
+       DELETE FROM action.survey_response WHERE usr = src_usr;
+       UPDATE action.fieldset SET owner = dest_usr WHERE owner = src_usr;
+
+       -- actor.*
+       DELETE FROM actor.card WHERE usr = src_usr;
+       DELETE FROM actor.stat_cat_entry_usr_map WHERE target_usr = src_usr;
+
+       -- The following update is intended to avoid transient violations of a foreign
+       -- key constraint, whereby actor.usr_address references itself.  It may not be
+       -- necessary, but it does no harm.
+       UPDATE actor.usr_address SET replaces = NULL
+               WHERE usr = src_usr AND replaces IS NOT NULL;
+       DELETE FROM actor.usr_address WHERE usr = src_usr;
+       DELETE FROM actor.usr_note WHERE usr = src_usr;
+       UPDATE actor.usr_note SET creator = dest_usr WHERE creator = src_usr;
+       DELETE FROM actor.usr_org_unit_opt_in WHERE usr = src_usr;
+       UPDATE actor.usr_org_unit_opt_in SET staff = dest_usr WHERE staff = src_usr;
+       DELETE FROM actor.usr_setting WHERE usr = src_usr;
+       DELETE FROM actor.usr_standing_penalty WHERE usr = src_usr;
+       UPDATE actor.usr_standing_penalty SET staff = dest_usr WHERE staff = src_usr;
+
+       -- asset.*
+       UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr;
+
+       -- auditor.*
+       DELETE FROM auditor.actor_usr_address_history WHERE id = src_usr;
+       DELETE FROM auditor.actor_usr_history WHERE id = src_usr;
+       UPDATE auditor.asset_call_number_history SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE auditor.asset_call_number_history SET editor  = dest_usr WHERE editor  = src_usr;
+       UPDATE auditor.asset_copy_history SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE auditor.asset_copy_history SET editor  = dest_usr WHERE editor  = src_usr;
+       UPDATE auditor.biblio_record_entry_history SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE auditor.biblio_record_entry_history SET editor  = dest_usr WHERE editor  = src_usr;
+
+       -- biblio.*
+       UPDATE biblio.record_entry SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE biblio.record_entry SET editor = dest_usr WHERE editor = src_usr;
+       UPDATE biblio.record_note SET creator = dest_usr WHERE creator = src_usr;
+       UPDATE biblio.record_note SET editor = dest_usr WHERE editor = src_usr;
+
+       -- container.*
+       -- Update buckets with a rename to avoid collisions
+       FOR renamable_row in
+               SELECT id, name
+               FROM   container.biblio_record_entry_bucket
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  container.biblio_record_entry_bucket
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+       FOR renamable_row in
+               SELECT id, name
+               FROM   container.call_number_bucket
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  container.call_number_bucket
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+       FOR renamable_row in
+               SELECT id, name
+               FROM   container.copy_bucket
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  container.copy_bucket
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+       FOR renamable_row in
+               SELECT id, name
+               FROM   container.user_bucket
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  container.user_bucket
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+       DELETE FROM container.user_bucket_item WHERE target_user = src_usr;
+
+       -- money.*
+       DELETE FROM money.billable_xact WHERE usr = src_usr;
+       DELETE FROM money.collections_tracker WHERE usr = src_usr;
+       UPDATE money.collections_tracker SET collector = dest_usr WHERE collector = src_usr;
+
+       -- permission.*
+       DELETE FROM permission.usr_grp_map WHERE usr = src_usr;
+       DELETE FROM permission.usr_object_perm_map WHERE usr = src_usr;
+       DELETE FROM permission.usr_perm_map WHERE usr = src_usr;
+       DELETE FROM permission.usr_work_ou_map WHERE usr = src_usr;
+
+       -- reporter.*
+       -- Update with a rename to avoid collisions
+       BEGIN
+               FOR renamable_row in
+                       SELECT id, name
+                       FROM   reporter.output_folder
+                       WHERE  owner = src_usr
+               LOOP
+                       suffix := ' (' || src_usr || ')';
+                       LOOP
+                               BEGIN
+                                       UPDATE  reporter.output_folder
+                                       SET     owner = dest_usr, name = name || suffix
+                                       WHERE   id = renamable_row.id;
+                               EXCEPTION WHEN unique_violation THEN
+                                       suffix := suffix || ' ';
+                                       CONTINUE;
+                               END;
+                               EXIT;
+                       END LOOP;
+               END LOOP;
+       EXCEPTION WHEN undefined_table THEN
+               -- do nothing
+       END;
+
+       BEGIN
+               UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr;
+       EXCEPTION WHEN undefined_table THEN
+               -- do nothing
+       END;
+
+       -- Update with a rename to avoid collisions
+       BEGIN
+               FOR renamable_row in
+                       SELECT id, name
+                       FROM   reporter.report_folder
+                       WHERE  owner = src_usr
+               LOOP
+                       suffix := ' (' || src_usr || ')';
+                       LOOP
+                               BEGIN
+                                       UPDATE  reporter.report_folder
+                                       SET     owner = dest_usr, name = name || suffix
+                                       WHERE   id = renamable_row.id;
+                               EXCEPTION WHEN unique_violation THEN
+                                       suffix := suffix || ' ';
+                                       CONTINUE;
+                               END;
+                               EXIT;
+                       END LOOP;
+               END LOOP;
+       EXCEPTION WHEN undefined_table THEN
+               -- do nothing
+       END;
+
+       BEGIN
+               UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr;
+       EXCEPTION WHEN undefined_table THEN
+               -- do nothing
+       END;
+
+       BEGIN
+               UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr;
+       EXCEPTION WHEN undefined_table THEN
+               -- do nothing
+       END;
+
+       -- Update with a rename to avoid collisions
+       BEGIN
+               FOR renamable_row in
+                       SELECT id, name
+                       FROM   reporter.template_folder
+                       WHERE  owner = src_usr
+               LOOP
+                       suffix := ' (' || src_usr || ')';
+                       LOOP
+                               BEGIN
+                                       UPDATE  reporter.template_folder
+                                       SET     owner = dest_usr, name = name || suffix
+                                       WHERE   id = renamable_row.id;
+                               EXCEPTION WHEN unique_violation THEN
+                                       suffix := suffix || ' ';
+                                       CONTINUE;
+                               END;
+                               EXIT;
+                       END LOOP;
+               END LOOP;
+       EXCEPTION WHEN undefined_table THEN
+       -- do nothing
+       END;
+
+       -- vandelay.*
+       -- Update with a rename to avoid collisions
+       FOR renamable_row in
+               SELECT id, name
+               FROM   vandelay.queue
+               WHERE  owner = src_usr
+       LOOP
+               suffix := ' (' || src_usr || ')';
+               LOOP
+                       BEGIN
+                               UPDATE  vandelay.queue
+                               SET     owner = dest_usr, name = name || suffix
+                               WHERE   id = renamable_row.id;
+                       EXCEPTION WHEN unique_violation THEN
+                               suffix := suffix || ' ';
+                               CONTINUE;
+                       END;
+                       EXIT;
+               END LOOP;
+       END LOOP;
+
+END;
+$$ LANGUAGE plpgsql;
+
+INSERT INTO config.upgrade_log(version) VALUES ('0481');
+
+-- We defined the same trigger on the parent table asset.copy
+-- but we need to define it on child tables explicitly as well
+CREATE TRIGGER autogenerate_placeholder_barcode
+   BEFORE INSERT OR UPDATE ON serial.unit 
+   FOR EACH ROW EXECUTE PROCEDURE asset.autogenerate_placeholder_barcode()
+;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.1-2.0.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.1-2.0.2-upgrade-db.sql
new file mode 100644 (file)
index 0000000..46c998a
--- /dev/null
@@ -0,0 +1,445 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.2');
+INSERT INTO config.upgrade_log (version) VALUES ('0484'); -- miker
+
+DROP FUNCTION asset.metarecord_copy_count ( INT, BIGINT, BOOL );
+DROP FUNCTION asset.record_copy_count ( INT, BIGINT, BOOL );
+
+DROP FUNCTION asset.opac_ou_record_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.opac_ou_record_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM  
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.opac_lasso_record_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.opac_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM  
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.staff_ou_record_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.staff_ou_record_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.staff_lasso_record_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.record_copy_count ( place INT, rid BIGINT, staff BOOL) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+BEGIN
+    IF staff IS TRUE THEN
+        IF place > 0 THEN
+            RETURN QUERY SELECT * FROM asset.staff_ou_record_copy_count( place, rid );
+        ELSE
+            RETURN QUERY SELECT * FROM asset.staff_lasso_record_copy_count( -place, rid );
+        END IF;
+    ELSE
+        IF place > 0 THEN
+            RETURN QUERY SELECT * FROM asset.opac_ou_record_copy_count( place, rid );
+        ELSE
+            RETURN QUERY SELECT * FROM asset.opac_lasso_record_copy_count( -place, rid );
+        END IF;
+    END IF;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.opac_ou_metarecord_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.opac_ou_metarecord_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+                JOIN metabib.metarecord_source_map m ON (m.source = av.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.opac_lasso_metarecord_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.opac_lasso_metarecord_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+                JOIN metabib.metarecord_source_map m ON (m.source = av.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.staff_ou_metarecord_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.staff_ou_metarecord_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number)
+                JOIN metabib.metarecord_source_map m ON (m.source = cn.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+DROP FUNCTION asset.staff_lasso_metarecord_copy_count (INT, BIGINT);
+CREATE OR REPLACE FUNCTION asset.staff_lasso_metarecord_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number)
+                JOIN metabib.metarecord_source_map m ON (m.source = cn.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.metarecord_copy_count ( place INT, rid BIGINT, staff BOOL) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+BEGIN
+    IF staff IS TRUE THEN
+        IF place > 0 THEN
+            RETURN QUERY SELECT * FROM asset.staff_ou_metarecord_copy_count( place, rid );
+        ELSE
+            RETURN QUERY SELECT * FROM asset.staff_lasso_metarecord_copy_count( -place, rid );
+        END IF;
+    ELSE
+        IF place > 0 THEN
+            RETURN QUERY SELECT * FROM asset.opac_ou_metarecord_copy_count( place, rid );
+        ELSE
+            RETURN QUERY SELECT * FROM asset.opac_lasso_metarecord_copy_count( -place, rid );
+        END IF;
+    END IF;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0485'); -- dbs
+
+CREATE OR REPLACE VIEW reporter.simple_record AS
+SELECT r.id,
+       s.metarecord,
+       r.fingerprint,
+       r.quality,
+       r.tcn_source,
+       r.tcn_value,
+       title.value AS title,
+       uniform_title.value AS uniform_title,
+       author.value AS author,
+       publisher.value AS publisher,
+       SUBSTRING(pubdate.value FROM $$\d+$$) AS pubdate,
+       series_title.value AS series_title,
+       series_statement.value AS series_statement,
+       summary.value AS summary,
+       ARRAY_ACCUM( DISTINCT REPLACE(SUBSTRING(isbn.value FROM $$^\S+$$), '-', '') ) AS isbn,
+       ARRAY_ACCUM( DISTINCT REGEXP_REPLACE(issn.value, E'^\\S*(\\d{4})[-\\s](\\d{3,4}x?)', E'\\1 \\2') ) AS issn,
+       ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '650' AND subfield = 'a' AND record = r.id)) AS topic_subject,
+       ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '651' AND subfield = 'a' AND record = r.id)) AS geographic_subject,
+       ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '655' AND subfield = 'a' AND record = r.id)) AS genre,
+       ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '600' AND subfield = 'a' AND record = r.id)) AS name_subject,
+       ARRAY((SELECT DISTINCT value FROM metabib.full_rec WHERE tag = '610' AND subfield = 'a' AND record = r.id)) AS corporate_subject,
+       ARRAY((SELECT value FROM metabib.full_rec WHERE tag = '856' AND subfield IN ('3','y','u') AND record = r.id ORDER BY CASE WHEN subfield IN ('3','y') THEN 0 ELSE 1 END)) AS external_uri
+  FROM biblio.record_entry r
+       JOIN metabib.metarecord_source_map s ON (s.source = r.id)
+       LEFT JOIN metabib.full_rec uniform_title ON (r.id = uniform_title.record AND uniform_title.tag = '240' AND uniform_title.subfield = 'a')
+       LEFT JOIN metabib.full_rec title ON (r.id = title.record AND title.tag = '245' AND title.subfield = 'a')
+       LEFT JOIN metabib.full_rec author ON (r.id = author.record AND author.tag = '100' AND author.subfield = 'a')
+       LEFT JOIN metabib.full_rec publisher ON (r.id = publisher.record AND publisher.tag = '260' AND publisher.subfield = 'b')
+       LEFT JOIN metabib.full_rec pubdate ON (r.id = pubdate.record AND pubdate.tag = '260' AND pubdate.subfield = 'c')
+       LEFT JOIN metabib.full_rec isbn ON (r.id = isbn.record AND isbn.tag IN ('024', '020') AND isbn.subfield IN ('a','z'))
+       LEFT JOIN metabib.full_rec issn ON (r.id = issn.record AND issn.tag = '022' AND issn.subfield = 'a')
+       LEFT JOIN metabib.full_rec series_title ON (r.id = series_title.record AND series_title.tag IN ('830','440') AND series_title.subfield = 'a')
+       LEFT JOIN metabib.full_rec series_statement ON (r.id = series_statement.record AND series_statement.tag = '490' AND series_statement.subfield = 'a')
+       LEFT JOIN metabib.full_rec summary ON (r.id = summary.record AND summary.tag = '520' AND summary.subfield = 'a')
+  GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14;
+
+CREATE OR REPLACE VIEW reporter.old_super_simple_record AS
+SELECT  r.id,
+    r.fingerprint,
+    r.quality,
+    r.tcn_source,
+    r.tcn_value,
+    FIRST(title.value) AS title,
+    FIRST(author.value) AS author,
+    ARRAY_TO_STRING(ARRAY_ACCUM( DISTINCT publisher.value), ', ') AS publisher,
+    ARRAY_TO_STRING(ARRAY_ACCUM( DISTINCT SUBSTRING(pubdate.value FROM $$\d+$$) ), ', ') AS pubdate,
+    ARRAY_ACCUM( DISTINCT REPLACE(SUBSTRING(isbn.value FROM $$^\S+$$), '-', '') ) AS isbn,
+    ARRAY_ACCUM( DISTINCT REGEXP_REPLACE(issn.value, E'^\\S*(\\d{4})[-\\s](\\d{3,4}x?)', E'\\1 \\2') ) AS issn
+  FROM  biblio.record_entry r
+    LEFT JOIN metabib.full_rec title ON (r.id = title.record AND title.tag = '245' AND title.subfield = 'a')
+    LEFT JOIN metabib.full_rec author ON (r.id = author.record AND author.tag IN ('100','110','111') AND author.subfield = 'a')
+    LEFT JOIN metabib.full_rec publisher ON (r.id = publisher.record AND publisher.tag = '260' AND publisher.subfield = 'b')
+    LEFT JOIN metabib.full_rec pubdate ON (r.id = pubdate.record AND pubdate.tag = '260' AND pubdate.subfield = 'c')
+    LEFT JOIN metabib.full_rec isbn ON (r.id = isbn.record AND isbn.tag IN ('024', '020') AND isbn.subfield IN ('a','z'))
+    LEFT JOIN metabib.full_rec issn ON (r.id = issn.record AND issn.tag = '022' AND issn.subfield = 'a')
+  GROUP BY 1,2,3,4,5;
+
+-- Update reporter.materialized_simple_record with normalized ISBN values
+-- This might not get all of them, but most ISBNs will have more than one hyphen
+DELETE FROM reporter.materialized_simple_record WHERE id IN (
+    SELECT record FROM metabib.full_rec WHERE tag = '020' AND subfield IN ('a', 'z') AND value LIKE '%-%-%'
+);
+
+INSERT INTO reporter.materialized_simple_record
+    SELECT DISTINCT rossr.* FROM reporter.old_super_simple_record rossr INNER JOIN metabib.full_rec mfr ON mfr.record = rossr.id
+        WHERE mfr.tag = '020' AND mfr.subfield IN ('a', 'z') AND mfr.value LIKE '%-%-%'
+;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0488'); -- dbs
+
+CREATE OR REPLACE FUNCTION maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield\s*[^<>]*?\s*tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+        END IF;
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || NEW.tcn_value || E'</subfield>' ||
+                '<subfield code="b">' || NEW.tcn_source || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.2-2.0.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.2-2.0.3-upgrade-db.sql
new file mode 100644 (file)
index 0000000..e65ea8c
--- /dev/null
@@ -0,0 +1,232 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.3');
+INSERT INTO config.upgrade_log (version) VALUES ('0490'); -- miker
+
+CREATE OR REPLACE FUNCTION asset.staff_ou_record_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE         
+    ans RECORD; 
+    trans INT;
+BEGIN           
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.staff_ou_metarecord_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE         
+    ans RECORD; 
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+                JOIN metabib.metarecord_source_map m ON (m.source = cn.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.staff_lasso_metarecord_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+                JOIN metabib.metarecord_source_map m ON (m.source = cn.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0491'); -- dbwells
+
+CREATE OR REPLACE FUNCTION maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield[^>]*?tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+        END IF;
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || NEW.tcn_value || E'</subfield>' ||
+                '<subfield code="b">' || NEW.tcn_source || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0492'); --miker
+UPDATE asset.call_number SET id = id;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0494'); -- dbs
+
+UPDATE config.metabib_field
+    SET xpath = $$//mods32:mods/mods32:subject$$
+    WHERE field_class = 'subject' AND name = 'complete';
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='099']$$
+    WHERE field_class = 'identifier' AND name = 'bibcn';
+
+INSERT INTO config.upgrade_log (version) VALUES ('0496'); -- dbs
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='024' and @ind1='1']/marc:subfield[@code='a' or @code='z']$$
+    WHERE field_class = 'identifier' AND name = 'upc';
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='024' and @ind1='2']/marc:subfield[@code='a' or @code='z']$$
+    WHERE field_class = 'identifier' AND name = 'ismn';
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='024' and @ind1='3']/marc:subfield[@code='a' or @code='z']$$
+    WHERE field_class = 'identifier' AND name = 'ean';
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='024' and @ind1='0']/marc:subfield[@code='a' or @code='z']$$
+    WHERE field_class = 'identifier' AND name = 'isrc';
+
+UPDATE config.metabib_field
+    SET xpath = $$//marc:datafield[@tag='024' and @ind1='4']/marc:subfield[@code='a' or @code='z']$$
+    WHERE field_class = 'identifier' AND name = 'sici';
+
+COMMIT;
@@ -1,5 +1,6 @@
 BEGIN;
 
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.4');
 INSERT INTO config.upgrade_log (version) VALUES ('0498');
 
 -- Rather than polluting the public schema with general Evergreen
@@ -161,4 +162,14 @@ $func$ LANGUAGE PLPERLU;
 
 UPDATE asset.call_number SET id = id;
 
+INSERT INTO config.upgrade_log (version) VALUES ('0500');
+
+CREATE OR REPLACE FUNCTION evergreen.change_db_setting(setting_name TEXT, settings TEXT[]) RETURNS VOID AS $$
+BEGIN
+EXECUTE 'ALTER DATABASE ' || quote_ident(current_database()) || ' SET ' || quote_ident(setting_name) || ' = ' || array_to_string(settings, ',');
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT evergreen.change_db_setting('search_path', ARRAY['public','pg_catalog']);
+
 COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.4-2.0.5-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.4-2.0.5-upgrade-db.sql
new file mode 100644 (file)
index 0000000..94489b7
--- /dev/null
@@ -0,0 +1,99 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.5');
+INSERT INTO config.upgrade_log (version) VALUES ('0502'); -- dbwells
+
+-- Dewey fields
+UPDATE asset.call_number_class
+    SET field = '080ab,082ab,092abef'
+    WHERE id = 2
+;
+
+-- LC fields
+UPDATE asset.call_number_class
+    SET field = '050ab,055ab,090abef'
+    WHERE id = 3
+;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0505'); --miker
+
+CREATE OR REPLACE FUNCTION force_unicode_normal_form(string TEXT, form TEXT) RETURNS TEXT AS $func$
+use Unicode::Normalize 'normalize';
+return normalize($_[1],$_[0]); # reverse the params
+$func$ LANGUAGE PLPERLU;
+
+UPDATE metabib.facet_entry SET value = force_unicode_normal_form(value,'NFC');
+
+CREATE OR REPLACE FUNCTION facet_force_nfc() RETURNS TRIGGER AS $$
+BEGIN
+    NEW.value := force_unicode_normal_form(NEW.value,'NFC');
+    RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER facet_force_nfc_tgr
+       BEFORE UPDATE OR INSERT ON metabib.facet_entry
+       FOR EACH ROW EXECUTE PROCEDURE facet_force_nfc();
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0506'); -- miker
+
+ALTER FUNCTION actor.org_unit_descendants( INT, INT ) ROWS 1;
+ALTER FUNCTION actor.org_unit_descendants( INT ) ROWS 1;
+ALTER FUNCTION actor.org_unit_ancestors( INT )  ROWS 1;
+ALTER FUNCTION actor.org_unit_full_path ( INT )  ROWS 2;
+ALTER FUNCTION actor.org_unit_full_path ( INT, INT ) ROWS 2;
+ALTER FUNCTION actor.org_unit_combined_ancestors ( INT, INT ) ROWS 1;
+ALTER FUNCTION actor.org_unit_common_ancestors ( INT, INT ) ROWS 1;
+ALTER FUNCTION actor.org_unit_ancestor_setting( TEXT, INT ) ROWS 1;
+ALTER FUNCTION permission.grp_ancestors ( INT ) ROWS 1;
+ALTER FUNCTION permission.usr_perms ( INT ) ROWS 10;
+ALTER FUNCTION permission.usr_has_perm_at_nd ( INT, TEXT) ROWS 1;
+ALTER FUNCTION permission.usr_has_perm_at_all_nd ( INT, TEXT ) ROWS 1;
+ALTER FUNCTION permission.usr_has_perm_at ( INT, TEXT ) ROWS 1;
+ALTER FUNCTION permission.usr_has_perm_at_all ( INT, TEXT ) ROWS 1;
+
+CREATE OR REPLACE FUNCTION permission.grp_ancestors_distance( INT ) RETURNS TABLE (id INT, distance INT) AS $$
+    WITH RECURSIVE grp_ancestors_distance(id, distance) AS (
+            SELECT $1, 0
+        UNION
+            SELECT pgt.parent, gad.distance+1
+            FROM permission.grp_tree pgt JOIN grp_ancestors_distance gad ON (pgt.id = gad.id)
+            WHERE pgt.parent IS NOT NULL
+    )
+    SELECT * FROM grp_ancestors_distance;
+$$ LANGUAGE SQL STABLE ROWS 1;
+
+CREATE OR REPLACE FUNCTION permission.grp_descendants_distance( INT ) RETURNS TABLE (id INT, distance INT) AS $$
+    WITH RECURSIVE grp_descendants_distance(id, distance) AS (
+            SELECT $1, 0
+        UNION
+            SELECT pgt.id, gdd.distance+1
+            FROM permission.grp_tree pgt JOIN grp_descendants_distance gdd ON (pgt.parent = gdd.id)
+    )
+    SELECT * FROM grp_descendants_distance;
+$$ LANGUAGE SQL STABLE ROWS 1;
+
+CREATE OR REPLACE FUNCTION actor.org_unit_descendants_distance( INT ) RETURNS TABLE (id INT, distance INT) AS $$
+    WITH RECURSIVE org_unit_descendants_distance(id, distance) AS (
+            SELECT $1, 0
+        UNION
+            SELECT ou.id, oudd.distance+1
+            FROM actor.org_unit ou JOIN org_unit_descendants_distance oudd ON (ou.parent_ou = oudd.id)
+    )
+    SELECT * FROM org_unit_descendants_distance;
+$$ LANGUAGE SQL STABLE ROWS 1;
+
+CREATE OR REPLACE FUNCTION actor.org_unit_ancestors_distance( INT ) RETURNS TABLE (id INT, distance INT) AS $$
+    WITH RECURSIVE org_unit_ancestors_distance(id, distance) AS (
+            SELECT $1, 0
+        UNION
+            SELECT ou.parent_ou, ouad.distance+1
+            FROM actor.org_unit ou JOIN org_unit_ancestors_distance ouad ON (ou.id = ouad.id)
+            WHERE ou.parent_ou IS NOT NULL
+    )
+    SELECT * FROM org_unit_ancestors_distance;
+$$ LANGUAGE SQL STABLE ROWS 1;
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.5-2.0.6-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.5-2.0.6-upgrade-db.sql
new file mode 100644 (file)
index 0000000..614460b
--- /dev/null
@@ -0,0 +1,972 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.6');
+INSERT INTO config.upgrade_log (version) VALUES ('0508'); -- gmc
+
+CREATE OR REPLACE FUNCTION maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+    norm_tcn_value TEXT;
+    norm_tcn_source TEXT;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield[^>]*?tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+            norm_tcn_value := NEW.tcn_value;
+        ELSE
+            -- yes, ampersands can show up in tcn_values ...
+            norm_tcn_value := REGEXP_REPLACE(NEW.tcn_value, E'&(?!\\S+;)', '&amp;', 'g');
+        END IF;
+        -- ... and TCN sources
+        -- FIXME we have here yet another (stub) version of entityize
+        norm_tcn_source := REGEXP_REPLACE(NEW.tcn_source, E'&(?!\\S+;)', '&amp;', 'g');
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || norm_tcn_value || E'</subfield>' ||
+                '<subfield code="b">' || norm_tcn_source || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0509'); -- gmc
+
+CREATE OR REPLACE FUNCTION evergreen.xml_escape(str TEXT) RETURNS text AS $$
+    SELECT REPLACE(REPLACE(REPLACE($1,
+       '&', '&amp;'),
+       '<', '&lt;'),
+       '>', '&gt;');
+$$ LANGUAGE SQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield[^>]*?tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+        END IF;
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || evergreen.xml_escape(NEW.tcn_value) || E'</subfield>' ||
+                '<subfield code="b">' || evergreen.xml_escape(NEW.tcn_source) || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0510'); -- miker
+
+SELECT evergreen.change_db_setting('search_path', ARRAY['evergreen','public','pg_catalog']);
+
+-- Fix function breakage due to short search path
+CREATE OR REPLACE FUNCTION evergreen.force_unicode_normal_form(string TEXT, form TEXT) RETURNS TEXT AS $func$
+use Unicode::Normalize 'normalize';
+return normalize($_[1],$_[0]); # reverse the params
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION evergreen.facet_force_nfc() RETURNS TRIGGER AS $$
+BEGIN
+    NEW.value := force_unicode_normal_form(NEW.value,'NFC');
+    RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+DROP TRIGGER facet_force_nfc_tgr ON metabib.facet_entry;
+
+CREATE TRIGGER facet_force_nfc_tgr
+    BEFORE UPDATE OR INSERT ON metabib.facet_entry
+    FOR EACH ROW EXECUTE PROCEDURE evergreen.facet_force_nfc();
+
+DROP FUNCTION IF EXISTS public.force_unicode_normal_form (TEXT,TEXT);
+DROP FUNCTION IF EXISTS public.facet_force_nfc ();
+
+CREATE OR REPLACE FUNCTION evergreen.xml_escape(str TEXT) RETURNS text AS $$
+    SELECT REPLACE(REPLACE(REPLACE($1,
+       '&', '&amp;'),
+       '<', '&lt;'),
+       '>', '&gt;');
+$$ LANGUAGE SQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield[^>]*?tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+        END IF;
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || evergreen.xml_escape(NEW.tcn_value) || E'</subfield>' ||
+                '<subfield code="b">' || evergreen.xml_escape(NEW.tcn_source) || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+DROP TRIGGER b_maintain_901 ON biblio.record_entry;
+DROP TRIGGER b_maintain_901 ON authority.record_entry;
+DROP TRIGGER b_maintain_901 ON serial.record_entry;
+
+CREATE TRIGGER b_maintain_901 BEFORE INSERT OR UPDATE ON biblio.record_entry FOR EACH ROW EXECUTE PROCEDURE evergreen.maintain_901();
+CREATE TRIGGER b_maintain_901 BEFORE INSERT OR UPDATE ON authority.record_entry FOR EACH ROW EXECUTE PROCEDURE evergreen.maintain_901();
+CREATE TRIGGER b_maintain_901 BEFORE INSERT OR UPDATE ON serial.record_entry FOR EACH ROW EXECUTE PROCEDURE evergreen.maintain_901();
+
+DROP FUNCTION IF EXISTS public.maintain_901 ();
+
+INSERT INTO config.upgrade_log (version) VALUES ('0511'); -- miker
+
+CREATE OR REPLACE FUNCTION evergreen.fake_fkey_tgr () RETURNS TRIGGER AS $F$
+DECLARE
+    copy_id BIGINT;
+BEGIN
+    EXECUTE 'SELECT ($1).' || quote_ident(TG_ARGV[0]) INTO copy_id USING NEW;
+    PERFORM * FROM asset.copy WHERE id = copy_id;
+    IF NOT FOUND THEN
+        RAISE EXCEPTION 'Key (%.%=%) does not exist in asset.copy', TG_TABLE_SCHEMA, TG_TABLE_NAME, copy_id;
+    END IF;
+    RETURN NULL;
+END;
+$F$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER action_circulation_target_copy_trig AFTER INSERT OR UPDATE ON action.circulation FOR EACH ROW EXECUTE PROCEDURE evergreen.fake_fkey_tgr('target_copy');
+
+INSERT INTO config.upgrade_log (version) VALUES ('0516'); 
+
+CREATE OR REPLACE FUNCTION public.extract_acq_marc_field ( BIGINT, TEXT, TEXT) RETURNS TEXT AS $$    
+    SELECT extract_marc_field('acq.lineitem', $1, $2, $3);
+$$ LANGUAGE SQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0517'); --miker
+
+CREATE OR REPLACE FUNCTION biblio.extract_located_uris( bib_id BIGINT, marcxml TEXT, editor_id INT ) RETURNS VOID AS $func$
+DECLARE
+    uris            TEXT[];
+    uri_xml         TEXT;
+    uri_label       TEXT;
+    uri_href        TEXT;
+    uri_use         TEXT;
+    uri_owner_list  TEXT[];
+    uri_owner       TEXT;
+    uri_owner_id    INT;
+    uri_id          INT;
+    uri_cn_id       INT;
+    uri_map_id      INT;
+BEGIN
+
+    uris := oils_xpath('//*[@tag="856" and (@ind1="4" or @ind1="1") and (@ind2="0" or @ind2="1")]',marcxml);
+    IF ARRAY_UPPER(uris,1) > 0 THEN
+        FOR i IN 1 .. ARRAY_UPPER(uris, 1) LOOP
+            -- First we pull info out of the 856
+            uri_xml     := uris[i];
+
+            uri_href    := (oils_xpath('//*[@code="u"]/text()',uri_xml))[1];
+            uri_label   := (oils_xpath('//*[@code="y"]/text()|//*[@code="3"]/text()|//*[@code="u"]/text()',uri_xml))[1];
+            uri_use     := (oils_xpath('//*[@code="z"]/text()|//*[@code="2"]/text()|//*[@code="n"]/text()|//*[@code="u"]/text()',uri_xml))[1];
+            CONTINUE WHEN uri_href IS NULL OR uri_label IS NULL;
+
+            -- Get the distinct list of libraries wanting to use 
+            SELECT  ARRAY_ACCUM(
+                        DISTINCT REGEXP_REPLACE(
+                            x,
+                            $re$^.*?\((\w+)\).*$$re$,
+                            E'\\1'
+                        )
+                    ) INTO uri_owner_list
+              FROM  UNNEST(
+                        oils_xpath(
+                            '//*[@code="9"]/text()|//*[@code="w"]/text()|//*[@code="n"]/text()',
+                            uri_xml
+                        )
+                    )x;
+
+            IF ARRAY_UPPER(uri_owner_list,1) > 0 THEN
+
+                -- look for a matching uri
+                SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                IF NOT FOUND THEN -- create one
+                    INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
+                    SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                END IF;
+
+                FOR j IN 1 .. ARRAY_UPPER(uri_owner_list, 1) LOOP
+                    uri_owner := uri_owner_list[j];
+
+                    SELECT id INTO uri_owner_id FROM actor.org_unit WHERE shortname = uri_owner;
+                    CONTINUE WHEN NOT FOUND;
+
+                    -- we need a call number to link through
+                    SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.call_number (owning_lib, record, create_date, edit_date, creator, editor, label)
+                            VALUES (uri_owner_id, bib_id, 'now', 'now', editor_id, editor_id, '##URI##');
+                        SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    END IF;
+
+                    -- now, link them if they're not already
+                    SELECT id INTO uri_map_id FROM asset.uri_call_number_map WHERE call_number = uri_cn_id AND uri = uri_id;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.uri_call_number_map (call_number, uri) VALUES (uri_cn_id, uri_id);
+                    END IF;
+
+                END LOOP;
+
+            END IF;
+
+        END LOOP;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0520'); --dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0521'); --dbs
+
+CREATE OR REPLACE FUNCTION biblio.extract_located_uris( bib_id BIGINT, marcxml TEXT, editor_id INT ) RETURNS VOID AS $func$
+DECLARE
+    uris            TEXT[];
+    uri_xml         TEXT;
+    uri_label       TEXT;
+    uri_href        TEXT;
+    uri_use         TEXT;
+    uri_owner_list  TEXT[];
+    uri_owner       TEXT;
+    uri_owner_id    INT;
+    uri_id          INT;
+    uri_cn_id       INT;
+    uri_map_id      INT;
+BEGIN
+
+    -- Clear any URI mappings and call numbers for this bib.
+    -- This leads to acn / auricnm inflation, but also enables
+    -- old acn/auricnm's to go away and for bibs to be deleted.
+    FOR uri_cn_id IN SELECT id FROM asset.call_number WHERE record = bib_id AND label = '##URI##' AND NOT deleted LOOP
+        DELETE FROM asset.uri_call_number_map WHERE call_number = uri_cn_id;
+        DELETE FROM asset.call_number WHERE id = uri_cn_id;
+    END LOOP;
+
+    uris := oils_xpath('//*[@tag="856" and (@ind1="4" or @ind1="1") and (@ind2="0" or @ind2="1")]',marcxml);
+    IF ARRAY_UPPER(uris,1) > 0 THEN
+        FOR i IN 1 .. ARRAY_UPPER(uris, 1) LOOP
+            -- First we pull info out of the 856
+            uri_xml     := uris[i];
+
+            uri_href    := (oils_xpath('//*[@code="u"]/text()',uri_xml))[1];
+            uri_label   := (oils_xpath('//*[@code="y"]/text()|//*[@code="3"]/text()|//*[@code="u"]/text()',uri_xml))[1];
+            uri_use     := (oils_xpath('//*[@code="z"]/text()|//*[@code="2"]/text()|//*[@code="n"]/text()',uri_xml))[1];
+            CONTINUE WHEN uri_href IS NULL OR uri_label IS NULL;
+
+            -- Get the distinct list of libraries wanting to use 
+            SELECT  ARRAY_ACCUM(
+                        DISTINCT REGEXP_REPLACE(
+                            x,
+                            $re$^.*?\((\w+)\).*$$re$,
+                            E'\\1'
+                        )
+                    ) INTO uri_owner_list
+              FROM  UNNEST(
+                        oils_xpath(
+                            '//*[@code="9"]/text()|//*[@code="w"]/text()|//*[@code="n"]/text()',
+                            uri_xml
+                        )
+                    )x;
+
+            IF ARRAY_UPPER(uri_owner_list,1) > 0 THEN
+
+                -- look for a matching uri
+                SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                IF NOT FOUND THEN -- create one
+                    INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
+                    IF uri_use IS NULL THEN
+                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction IS NULL AND active;
+                    ELSE
+                        SELECT id INTO uri_id FROM asset.uri WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                    END IF;
+                END IF;
+
+                FOR j IN 1 .. ARRAY_UPPER(uri_owner_list, 1) LOOP
+                    uri_owner := uri_owner_list[j];
+
+                    SELECT id INTO uri_owner_id FROM actor.org_unit WHERE shortname = uri_owner;
+                    CONTINUE WHEN NOT FOUND;
+
+                    -- we need a call number to link through
+                    SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.call_number (owning_lib, record, create_date, edit_date, creator, editor, label)
+                            VALUES (uri_owner_id, bib_id, 'now', 'now', editor_id, editor_id, '##URI##');
+                        SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    END IF;
+
+                    -- now, link them if they're not already
+                    SELECT id INTO uri_map_id FROM asset.uri_call_number_map WHERE call_number = uri_cn_id AND uri = uri_id;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.uri_call_number_map (call_number, uri) VALUES (uri_cn_id, uri_id);
+                    END IF;
+
+                END LOOP;
+
+            END IF;
+
+        END LOOP;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0528'); -- dbs
+
+CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$
+use strict;
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+use Encode;
+use Unicode::Normalize;
+
+MARC::Charset->assume_unicode(1);
+
+my $record = MARC::Record->new_from_xml($_TD->{new}{marc});
+my $schema = $_TD->{table_schema};
+my $rec_id = $_TD->{new}{id};
+
+# Short-circuit if maintaining control numbers per MARC21 spec is not enabled
+my $enable = spi_exec_query("SELECT enabled FROM config.global_flag WHERE name = 'cat.maintain_control_numbers'");
+if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') {
+    return;
+}
+
+# Get the control number identifier from an OU setting based on $_TD->{new}{owner}
+my $ou_cni = 'EVRGRN';
+
+my $owner;
+if ($schema eq 'serial') {
+    $owner = $_TD->{new}{owning_lib};
+} else {
+    # are.owner and bre.owner can be null, so fall back to the consortial setting
+    $owner = $_TD->{new}{owner} || 1;
+}
+
+my $ous_rv = spi_exec_query("SELECT value FROM actor.org_unit_ancestor_setting('cat.marc_control_number_identifier', $owner)");
+if ($ous_rv->{processed}) {
+    $ou_cni = $ous_rv->{rows}[0]->{value};
+    $ou_cni =~ s/"//g; # Stupid VIM syntax highlighting"
+} else {
+    # Fall back to the shortname of the OU if there was no OU setting
+    $ous_rv = spi_exec_query("SELECT shortname FROM actor.org_unit WHERE id = $owner");
+    if ($ous_rv->{processed}) {
+        $ou_cni = $ous_rv->{rows}[0]->{shortname};
+    }
+}
+
+my ($create, $munge) = (0, 0);
+
+my @scns = $record->field('035');
+
+foreach my $id_field ('001', '003') {
+    my $spec_value;
+    my @controls = $record->field($id_field);
+
+    if ($id_field eq '001') {
+        $spec_value = $rec_id;
+    } else {
+        $spec_value = $ou_cni;
+    }
+
+    # Create the 001/003 if none exist
+    if (scalar(@controls) == 1) {
+        # Only one field; check to see if we need to munge it
+        unless (grep $_->data() eq $spec_value, @controls) {
+            $munge = 1;
+        }
+    } else {
+        # Delete the other fields, as with more than 1 001/003 we do not know which 003/001 to match
+        foreach my $control (@controls) {
+            unless ($control->data() eq $spec_value) {
+                $record->delete_field($control);
+            }
+        }
+        $record->insert_fields_ordered(MARC::Field->new($id_field, $spec_value));
+        $create = 1;
+    }
+}
+
+# Now, if we need to munge the 001, we will first push the existing 001/003
+# into the 035; but if the record did not have one (and one only) 001 and 003
+# to begin with, skip this process
+if ($munge and not $create) {
+    my $scn = "(" . $record->field('003')->data() . ")" . $record->field('001')->data();
+
+    # Do not create duplicate 035 fields
+    unless (grep $_->subfield('a') eq $scn, @scns) {
+        $record->insert_fields_ordered(MARC::Field->new('035', '', '', 'a' => $scn));
+    }
+}
+
+# Set the 001/003 and update the MARC
+if ($create or $munge) {
+    $record->field('001')->data($rec_id);
+    $record->field('003')->data($ou_cni);
+
+    my $xml = $record->as_xml_record();
+    $xml =~ s/\n//sgo;
+    $xml =~ s/^<\?xml.+\?\s*>//go;
+    $xml =~ s/>\s+</></go;
+    $xml =~ s/\p{Cc}//go;
+
+    # Embed a version of OpenILS::Application::AppUtils->entityize()
+    # to avoid having to set PERL5LIB for PostgreSQL as well
+
+    # If we are going to convert non-ASCII characters to XML entities,
+    # we had better be dealing with a UTF8 string to begin with
+    $xml = decode_utf8($xml);
+
+    $xml = NFC($xml);
+
+    # Convert raw ampersands to entities
+    $xml =~ s/&(?!\S+;)/&amp;/gso;
+
+    # Convert Unicode characters to entities
+    $xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
+
+    $xml =~ s/[\x00-\x1f]//go;
+    $_TD->{new}{marc} = $xml;
+
+    return "MODIFY";
+}
+
+return;
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.generate_overlay_template ( TEXT, BIGINT ) RETURNS TEXT AS $func$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift;
+    my $r = MARC::Record->new_from_xml( $xml );
+
+    return undef unless ($r);
+
+    my $id = shift() || $r->subfield( '901' => 'c' );
+    $id =~ s/^\s*(?:\([^)]+\))?\s*(.+)\s*?$/$1/;
+    return undef unless ($id); # We need an ID!
+
+    my $tmpl = MARC::Record->new();
+    $tmpl->encoding( 'UTF-8' );
+
+    my @rule_fields;
+    for my $field ( $r->field( '1..' ) ) { # Get main entry fields from the authority record
+
+        my $tag = $field->tag;
+        my $i1 = $field->indicator(1);
+        my $i2 = $field->indicator(2);
+        my $sf = join '', map { $_->[0] } $field->subfields;
+        my @data = map { @$_ } $field->subfields;
+
+        my @replace_them;
+
+        # Map the authority field to bib fields it can control.
+        if ($tag >= 100 and $tag <= 111) {       # names
+            @replace_them = map { $tag + $_ } (0, 300, 500, 600, 700);
+        } elsif ($tag eq '130') {                # uniform title
+            @replace_them = qw/130 240 440 730 830/;
+        } elsif ($tag >= 150 and $tag <= 155) {  # subjects
+            @replace_them = ($tag + 500);
+        } elsif ($tag >= 180 and $tag <= 185) {  # floating subdivisions
+            @replace_them = qw/100 400 600 700 800 110 410 610 710 810 111 411 611 711 811 130 240 440 730 830 650 651 655/;
+        } else {
+            next;
+        }
+
+        # Dummy up the bib-side data
+        $tmpl->append_fields(
+            map {
+                MARC::Field->new( $_, $i1, $i2, @data )
+            } @replace_them
+        );
+
+        # Construct some 'replace' rules
+        push @rule_fields, map { $_ . $sf . '[0~\)' .$id . '$]' } @replace_them;
+    }
+
+    # Insert the replace rules into the template
+    $tmpl->append_fields(
+        MARC::Field->new( '905' => ' ' => ' ' => 'r' => join(',', @rule_fields ) )
+    );
+
+    $xml = $tmpl->as_xml_record;
+    $xml =~ s/^<\?.+?\?>$//mo;
+    $xml =~ s/\n//sgo;
+    $xml =~ s/>\s+</></sgo;
+
+    return $xml;
+
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+    use strict;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $target_xml = shift;
+    my $source_xml = shift;
+    my $field_spec = shift;
+    my $force_add = shift || 0;
+
+    my $target_r = MARC::Record->new_from_xml( $target_xml );
+    my $source_r = MARC::Record->new_from_xml( $source_xml );
+
+    return $target_xml unless ($target_r && $source_r);
+
+    my @field_list = split(',', $field_spec);
+
+    my %fields;
+    for my $f (@field_list) {
+        $f =~ s/^\s*//; $f =~ s/\s*$//;
+        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
+            my $field = $1;
+            $field =~ s/\s+//;
+            my $sf = $2;
+            $sf =~ s/\s+//;
+            my $match = $3;
+            $match =~ s/^\s*//; $match =~ s/\s*$//;
+            $fields{$field} = { sf => [ split('', $sf) ] };
+            if ($match) {
+                my ($msf,$mre) = split('~', $match);
+                if (length($msf) > 0 and length($mre) > 0) {
+                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
+                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
+                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
+                }
+            }
+        }
+    }
+
+    for my $f ( keys %fields) {
+        if ( @{$fields{$f}{sf}} ) {
+            for my $from_field ($source_r->field( $f )) {
+                my @tos = $target_r->field( $f );
+                if (!@tos) {
+                    next if (exists($fields{$f}{match}) and !$force_add);
+                    my @new_fields = map { $_->clone } $source_r->field( $f );
+                    $target_r->insert_fields_ordered( @new_fields );
+                } else {
+                    for my $to_field (@tos) {
+                        if (exists($fields{$f}{match})) {
+                            next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
+                        }
+                        my @new_sf = map { ($_ => $from_field->subfield($_)) } @{$fields{$f}{sf}};
+                        $to_field->add_subfields( @new_sf );
+                    }
+                }
+            }
+        } else {
+            my @new_fields = map { $_->clone } $source_r->field( $f );
+            $target_r->insert_fields_ordered( @new_fields );
+        }
+    }
+
+    $target_xml = $target_r->as_xml_record;
+    $target_xml =~ s/^<\?.+?\?>$//mo;
+    $target_xml =~ s/\n//sgo;
+    $target_xml =~ s/>\s+</></sgo;
+
+    return $target_xml;
+
+$_$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( TEXT ) RETURNS TEXT AS $func$
+    use strict;
+    use warnings;
+
+    use utf8;
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF8');
+    use MARC::Charset;
+    use UUID::Tiny ':std';
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift() or return undef;
+
+    my $r;
+
+    # Prevent errors in XML parsing from blowing out ungracefully
+    eval {
+        $r = MARC::Record->new_from_xml( $xml );
+        1;
+    } or do {
+       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
+    };
+
+    if (!$r) {
+       return 'BAD_MARCXML_' . create_uuid_as_string(UUID_MD5, $xml);
+    }
+
+    # From http://www.loc.gov/standards/sourcelist/subject.html
+    my $thes_code_map = {
+        a => 'lcsh',
+        b => 'lcshac',
+        c => 'mesh',
+        d => 'nal',
+        k => 'cash',
+        n => 'notapplicable',
+        r => 'aat',
+        s => 'sears',
+        v => 'rvm',
+    };
+
+    # Default to "No attempt to code" if the leader is horribly broken
+    my $fixed_field = $r->field('008');
+    my $thes_char = '|';
+    if ($fixed_field) { 
+        $thes_char = substr($fixed_field->data(), 11, 1) || '|';
+    }
+
+    my $thes_code = 'UNDEFINED';
+
+    if ($thes_char eq 'z') {
+        # Grab the 040 $f per http://www.loc.gov/marc/authority/ad040.html
+        $thes_code = $r->subfield('040', 'f') || 'UNDEFINED';
+    } elsif ($thes_code_map->{$thes_char}) {
+        $thes_code = $thes_code_map->{$thes_char};
+    }
+
+    my $auth_txt = '';
+    my $head = $r->field('1..');
+    if ($head) {
+        # Concatenate all of these subfields together, prefixed by their code
+        # to prevent collisions along the lines of "Fiction, North Carolina"
+        foreach my $sf ($head->subfields()) {
+            $auth_txt .= '‡' . $sf->[0] . ' ' . $sf->[1];
+        }
+    }
+    
+    if ($auth_txt) {
+        my $stmt = spi_prepare('SELECT public.naco_normalize($1) AS norm_text', 'TEXT');
+        my $result = spi_exec_prepared($stmt, $auth_txt);
+        my $norm_txt = $result->{rows}[0]->{norm_text};
+        spi_freeplan($stmt);
+        undef($stmt);
+        return $head->tag() . "_" . $thes_code . " " . $norm_txt;
+    }
+
+    return 'NOHEADING_' . $thes_code . ' ' . create_uuid_as_string(UUID_MD5, $xml);
+$func$ LANGUAGE 'plperlu' IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION vandelay.strip_field ( xml TEXT, field TEXT ) RETURNS TEXT AS $_$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+    use strict;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $xml = shift;
+    my $r = MARC::Record->new_from_xml( $xml );
+
+    return $xml unless ($r);
+
+    my $field_spec = shift;
+    my @field_list = split(',', $field_spec);
+
+    my %fields;
+    for my $f (@field_list) {
+        $f =~ s/^\s*//; $f =~ s/\s*$//;
+        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
+            my $field = $1;
+            $field =~ s/\s+//;
+            my $sf = $2;
+            $sf =~ s/\s+//;
+            my $match = $3;
+            $match =~ s/^\s*//; $match =~ s/\s*$//;
+            $fields{$field} = { sf => [ split('', $sf) ] };
+            if ($match) {
+                my ($msf,$mre) = split('~', $match);
+                if (length($msf) > 0 and length($mre) > 0) {
+                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
+                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
+                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
+                }
+            }
+        }
+    }
+
+    for my $f ( keys %fields) {
+        for my $to_field ($r->field( $f )) {
+            if (exists($fields{$f}{match})) {
+                next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
+            }
+
+            if ( @{$fields{$f}{sf}} ) {
+                $to_field->delete_subfield(code => $fields{$f}{sf});
+            } else {
+                $r->delete_field( $to_field );
+            }
+        }
+    }
+
+    $xml = $r->as_xml_record;
+    $xml =~ s/^<\?.+?\?>$//mo;
+    $xml =~ s/\n//sgo;
+    $xml =~ s/>\s+</></sgo;
+
+    return $xml;
+
+$_$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION biblio.flatten_marc ( TEXT ) RETURNS SETOF metabib.full_rec AS $func$
+
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+
+MARC::Charset->assume_unicode(1);
+
+my $xml = shift;
+my $r = MARC::Record->new_from_xml( $xml );
+
+return_next( { tag => 'LDR', value => $r->leader } );
+
+for my $f ( $r->fields ) {
+       if ($f->is_control_field) {
+               return_next({ tag => $f->tag, value => $f->data });
+       } else {
+               for my $s ($f->subfields) {
+                       return_next({
+                               tag      => $f->tag,
+                               ind1     => $f->indicator(1),
+                               ind2     => $f->indicator(2),
+                               subfield => $s->[0],
+                               value    => $s->[1]
+                       });
+
+                       if ( $f->tag eq '245' and $s->[0] eq 'a' ) {
+                               my $trim = $f->indicator(2) || 0;
+                               return_next({
+                                       tag      => 'tnf',
+                                       ind1     => $f->indicator(1),
+                                       ind2     => $f->indicator(2),
+                                       subfield => 'a',
+                                       value    => substr( $s->[1], $trim )
+                               });
+                       }
+               }
+       }
+}
+
+return undef;
+
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION authority.flatten_marc ( TEXT ) RETURNS SETOF authority.full_rec AS $func$
+
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+
+MARC::Charset->assume_unicode(1);
+
+my $xml = shift;
+my $r = MARC::Record->new_from_xml( $xml );
+
+return_next( { tag => 'LDR', value => $r->leader } );
+
+for my $f ( $r->fields ) {
+    if ($f->is_control_field) {
+        return_next({ tag => $f->tag, value => $f->data });
+    } else {
+        for my $s ($f->subfields) {
+            return_next({
+                tag      => $f->tag,
+                ind1     => $f->indicator(1),
+                ind2     => $f->indicator(2),
+                subfield => $s->[0],
+                value    => $s->[1]
+            });
+
+        }
+    }
+}
+
+return undef;
+
+$func$ LANGUAGE PLPERLU;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0529');
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_addresses', 
+  'Circ:  Patron Merge Address Delete', 
+  'Delete address(es) of subordinate user(s) in a patron merge', 
+   'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_cards', 
+  'Circ: Patron Merge Barcode Delete', 
+  'Delete barcode(s) of subordinate user(s) in a patron merge', 
+  'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.deactivate_cards', 
+  'Circ:  Patron Merge Deactivate Card', 
+  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
+  'bool'
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.6-2.0.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.6-2.0.7-upgrade-db.sql
new file mode 100644 (file)
index 0000000..97d79dc
--- /dev/null
@@ -0,0 +1,949 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.7');
+
+INSERT INTO config.upgrade_log (version) VALUES ('0534'); --gmc
+-- Superseded below, but keep the number in the log
+
+INSERT INTO config.upgrade_log (version) VALUES ('0535'); --dbs
+
+CREATE INDEX authority_record_deleted_idx ON authority.record_entry(deleted) WHERE deleted IS FALSE OR deleted = false;
+
+CREATE INDEX authority_full_rec_subfield_a_idx ON authority.full_rec (value) WHERE subfield = 'a';
+
+INSERT INTO config.upgrade_log (version) VALUES ('0538'); -- senator
+
+UPDATE action_trigger.event_definition
+SET template = '[% FILTER collapse %]' || template
+WHERE id = 22 AND
+    SUBSTR(template, 0, 24) NOT LIKE '%FILTER collapse%';
+
+-- Bring serial.unit into line with asset.copy
+INSERT INTO config.upgrade_log (version) VALUES ('0540'); -- dbwells
+
+CREATE TRIGGER sunit_status_changed_trig
+    BEFORE UPDATE ON serial.unit
+    FOR EACH ROW EXECUTE PROCEDURE asset.acp_status_changed();
+
+SELECT auditor.create_auditor ( 'serial', 'unit' );
+CREATE INDEX aud_serial_unit_hist_creator_idx      ON auditor.serial_unit_history ( creator );
+CREATE INDEX aud_serial_unit_hist_editor_idx       ON auditor.serial_unit_history ( editor );
+
+INSERT INTO config.upgrade_log (version) VALUES ('0541'); -- dbwells
+
+ALTER TABLE asset.call_number ALTER COLUMN label_class DROP DEFAULT;
+
+CREATE OR REPLACE FUNCTION asset.label_normalizer() RETURNS TRIGGER AS $func$
+DECLARE
+    sortkey        TEXT := '';
+BEGIN
+    sortkey := NEW.label_sortkey;
+
+    IF NEW.label_class IS NULL THEN
+        NEW.label_class := COALESCE(
+            (
+                SELECT substring(value from E'\\d+')::integer
+                FROM actor.org_unit_setting
+                WHERE name = 'cat.default_classification_scheme'
+                AND org_unit = NEW.owning_lib
+            ), 1
+        );
+    END IF;
+
+    EXECUTE 'SELECT ' || acnc.normalizer || '(' ||
+       quote_literal( NEW.label ) || ')'
+       FROM asset.call_number_class acnc
+       WHERE acnc.id = NEW.label_class
+       INTO sortkey;
+    NEW.label_sortkey = sortkey;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Reformat generated_coverage to be JSON arrays rather than simple comma-
+-- separated lists.
+
+-- This upgrade script is technically imperfect, but should do the right thing
+-- in 99.9% of cases, and any mistakes will be self-healing as more serials
+-- activity happens
+
+INSERT INTO config.upgrade_log (version) VALUES ('0543'); -- dbwells
+
+UPDATE serial.basic_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+UPDATE serial.supplement_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+UPDATE serial.index_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+-- Evergreen DB patch 0551.unnest_metabib_remap_metarecord_for_bib.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0551'); -- dbs
+
+CREATE OR REPLACE FUNCTION metabib.remap_metarecord_for_bib( bib_id BIGINT, fp TEXT ) RETURNS BIGINT AS $func$
+DECLARE
+    source_count    INT;
+    old_mr          BIGINT;
+    tmp_mr          metabib.metarecord%ROWTYPE;
+    deleted_mrs     BIGINT[];
+BEGIN
+
+    DELETE FROM metabib.metarecord_source_map WHERE source = bib_id; -- Rid ourselves of the search-estimate-killing linkage
+
+    FOR tmp_mr IN SELECT  m.* FROM  metabib.metarecord m JOIN metabib.metarecord_source_map s ON (s.metarecord = m.id) WHERE s.source = bib_id LOOP
+
+        IF old_mr IS NULL AND fp = tmp_mr.fingerprint THEN -- Find the first fingerprint-matching
+            old_mr := tmp_mr.id;
+        ELSE
+            SELECT COUNT(*) INTO source_count FROM metabib.metarecord_source_map WHERE metarecord = tmp_mr.id;
+            IF source_count = 0 THEN -- No other records
+                deleted_mrs := ARRAY_APPEND(deleted_mrs, tmp_mr.id);
+                DELETE FROM metabib.metarecord WHERE id = tmp_mr.id;
+            END IF;
+        END IF;
+
+    END LOOP;
+
+    IF old_mr IS NULL THEN -- we found no suitable, preexisting MR based on old source maps
+        SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp; -- is there one for our current fingerprint?
+        IF old_mr IS NULL THEN -- nope, create one and grab its id
+            INSERT INTO metabib.metarecord ( fingerprint, master_record ) VALUES ( fp, bib_id );
+            SELECT id INTO old_mr FROM metabib.metarecord WHERE fingerprint = fp;
+        ELSE -- indeed there is. update it with a null cache and recalcualated master record
+            UPDATE  metabib.metarecord
+              SET   mods = NULL,
+                    master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp ORDER BY quality DESC LIMIT 1)
+              WHERE id = old_mr;
+        END IF;
+    ELSE -- there was one we already attached to, update its mods cache and master_record
+        UPDATE  metabib.metarecord
+          SET   mods = NULL,
+                master_record = ( SELECT id FROM biblio.record_entry WHERE fingerprint = fp ORDER BY quality DESC LIMIT 1)
+          WHERE id = old_mr;
+    END IF;
+
+    INSERT INTO metabib.metarecord_source_map (metarecord, source) VALUES (old_mr, bib_id); -- new source mapping
+
+    IF ARRAY_UPPER(deleted_mrs,1) > 0 THEN
+        UPDATE action.hold_request SET target = old_mr WHERE target IN ( SELECT unnest(deleted_mrs) ) AND hold_type = 'M'; -- if we had to delete any MRs above, make sure their holds are moved
+    END IF;
+
+    RETURN old_mr;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0552.unnest_biblio_map_authority_linking.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0552'); -- dbs
+
+CREATE OR REPLACE FUNCTION biblio.map_authority_linking (bibid BIGINT, marc TEXT) RETURNS BIGINT AS $func$
+    DELETE FROM authority.bib_linking WHERE bib = $1;
+    INSERT INTO authority.bib_linking (bib, authority)
+        SELECT  y.bib,
+                y.authority
+          FROM (    SELECT  DISTINCT $1 AS bib,
+                            BTRIM(remove_paren_substring(txt))::BIGINT AS authority
+                      FROM  unnest(oils_xpath('//*[@code="0"]/text()',$2)) x(txt)
+                      WHERE BTRIM(remove_paren_substring(txt)) ~ $re$^\d+$$re$
+                ) y JOIN authority.record_entry r ON r.id = y.authority;
+    SELECT $1;
+$func$ LANGUAGE SQL;
+
+-- Evergreen DB patch 0553.unnest_action_hold_request_permit_test.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0553'); -- dbs
+
+CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
+DECLARE
+    matchpoint_id        INT;
+    user_object        actor.usr%ROWTYPE;
+    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
+    standing_penalty    config.standing_penalty%ROWTYPE;
+    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
+    transit_source        actor.org_unit%ROWTYPE;
+    item_object        asset.copy%ROWTYPE;
+    item_cn_object     asset.call_number%ROWTYPE;
+    ou_skip              actor.org_unit_setting%ROWTYPE;
+    result            action.matrix_test_result;
+    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
+    hold_count        INT;
+    hold_transit_prox    INT;
+    frozen_hold_count    INT;
+    context_org_list    INT[];
+    done            BOOL := FALSE;
+BEGIN
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
+
+    result.success := TRUE;
+
+    -- Fail if we couldn't find a user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
+
+    -- Fail if we couldn't find a copy
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
+    result.matchpoint := matchpoint_id;
+
+    SELECT INTO ou_skip * FROM actor.org_unit_setting WHERE name = 'circ.holds.target_skip_me' AND org_unit = item_object.circ_lib;
+
+    -- Fail if the circ_lib for the item has circ.holds.target_skip_me set to true
+    IF ou_skip.id IS NOT NULL AND ou_skip.value = 'true' THEN
+        result.fail_part := 'circ.holds.target_skip_me';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if we couldn't find any matchpoint (requires a default)
+    IF matchpoint_id IS NULL THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
+
+    IF hold_test.holdable IS FALSE THEN
+        result.fail_part := 'config.hold_matrix_test.holdable';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    IF hold_test.transit_range IS NOT NULL THEN
+        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
+        ELSE
+            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
+        END IF;
+
+        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
+
+        IF NOT FOUND THEN
+            result.fail_part := 'transit_range';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE '%HOLD%' LOOP
+
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
+
+    IF hold_test.stop_blocked_user IS TRUE THEN
+        FOR standing_penalty IN
+            SELECT  DISTINCT csp.*
+              FROM  actor.usr_standing_penalty usp
+                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+              WHERE usr = match_user
+                    AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                    AND csp.block_list LIKE '%CIRC%' LOOP
+    
+            result.fail_part := standing_penalty.name;
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END LOOP;
+    END IF;
+
+    IF hold_test.max_holds IS NOT NULL AND NOT retargetting THEN
+        SELECT    INTO hold_count COUNT(*)
+          FROM    action.hold_request
+          WHERE    usr = match_user
+            AND fulfillment_time IS NULL
+            AND cancel_time IS NULL
+            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
+
+        IF hold_count >= hold_test.max_holds THEN
+            result.fail_part := 'config.hold_matrix_test.max_holds';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    IF item_object.age_protect IS NOT NULL THEN
+        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
+
+        IF item_object.create_date + age_protect_object.age > NOW() THEN
+            IF hold_test.distance_is_from_owner THEN
+                SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
+            ELSE
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
+            END IF;
+
+            IF hold_transit_prox > age_protect_object.prox THEN
+                result.fail_part := 'config.rule_age_hold_protect.prox';
+                result.success := FALSE;
+                done := TRUE;
+                RETURN NEXT result;
+            END IF;
+        END IF;
+    END IF;
+
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
+
+-- Evergreen DB patch 0554.unnest_search_query_parser_fts.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0554'); -- dbs
+
+CREATE OR REPLACE FUNCTION search.query_parser_fts (
+
+    param_search_ou INT,
+    param_depth     INT,
+    param_query     TEXT,
+    param_statuses  INT[],
+    param_locations INT[],
+    param_offset    INT,
+    param_check     INT,
+    param_limit     INT,
+    metarecord      BOOL,
+    staff           BOOL
+) RETURNS SETOF search.search_result AS $func$
+DECLARE
+
+    current_res         search.search_result%ROWTYPE;
+    search_org_list     INT[];
+
+    check_limit         INT;
+    core_limit          INT;
+    core_offset         INT;
+    tmp_int             INT;
+
+    core_result         RECORD;
+    core_cursor         REFCURSOR;
+    core_rel_query      TEXT;
+
+    total_count         INT := 0;
+    check_count         INT := 0;
+    deleted_count       INT := 0;
+    visible_count       INT := 0;
+    excluded_count      INT := 0;
+
+BEGIN
+
+    check_limit := COALESCE( param_check, 1000 );
+    core_limit  := COALESCE( param_limit, 25000 );
+    core_offset := COALESCE( param_offset, 0 );
+
+    -- core_skip_chk := COALESCE( param_skip_chk, 1 );
+
+    IF param_search_ou > 0 THEN
+        IF param_depth IS NOT NULL THEN
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
+        ELSE
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
+        END IF;
+    ELSIF param_search_ou < 0 THEN
+        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
+    ELSIF param_search_ou = 0 THEN
+        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
+    END IF;
+
+    OPEN core_cursor FOR EXECUTE param_query;
+
+    LOOP
+
+        FETCH core_cursor INTO core_result;
+        EXIT WHEN NOT FOUND;
+        EXIT WHEN total_count >= core_limit;
+
+        total_count := total_count + 1;
+
+        CONTINUE WHEN total_count NOT BETWEEN  core_offset + 1 AND check_limit + core_offset;
+
+        check_count := check_count + 1;
+
+        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
+        IF NOT FOUND THEN
+            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
+            deleted_count := deleted_count + 1;
+            CONTINUE;
+        END IF;
+
+        PERFORM 1
+          FROM  biblio.record_entry b
+                JOIN config.bib_source s ON (b.source = s.id)
+          WHERE s.transcendant
+                AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
+
+        IF FOUND THEN
+            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
+            visible_count := visible_count + 1;
+
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
+
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
+
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
+
+            RETURN NEXT current_res;
+
+            CONTINUE;
+        END IF;
+
+        PERFORM 1
+          FROM  asset.call_number cn
+                JOIN asset.uri_call_number_map map ON (map.call_number = cn.id)
+                JOIN asset.uri uri ON (map.uri = uri.id)
+          WHERE NOT cn.deleted
+                AND cn.label = '##URI##'
+                AND uri.active
+                AND ( param_locations IS NULL OR array_upper(param_locations, 1) IS NULL )
+                AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                AND cn.owning_lib IN ( SELECT * FROM unnest( search_org_list ) )
+          LIMIT 1;
+
+        IF FOUND THEN
+            -- RAISE NOTICE ' % have at least one URI ... ', core_result.records;
+            visible_count := visible_count + 1;
+
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
+
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
+
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
+
+            RETURN NEXT current_res;
+
+            CONTINUE;
+        END IF;
+
+        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        END IF;
+
+        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all copy_location-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        END IF;
+
+        IF staff IS NULL OR NOT staff THEN
+
+            PERFORM 1
+              FROM  asset.opac_visible_copies
+              WHERE circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        ELSE
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+
+                PERFORM 1
+                  FROM  asset.call_number cn
+                  WHERE cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                  LIMIT 1;
+
+                IF FOUND THEN
+                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
+                    excluded_count := excluded_count + 1;
+                    CONTINUE;
+                END IF;
+
+            END IF;
+
+        END IF;
+
+        visible_count := visible_count + 1;
+
+        current_res.id = core_result.id;
+        current_res.rel = core_result.rel;
+
+        tmp_int := 1;
+        IF metarecord THEN
+            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+        END IF;
+
+        IF tmp_int = 1 THEN
+            current_res.record = core_result.records[1];
+        ELSE
+            current_res.record = NULL;
+        END IF;
+
+        RETURN NEXT current_res;
+
+        IF visible_count % 1000 = 0 THEN
+            -- RAISE NOTICE ' % visible so far ... ', visible_count;
+        END IF;
+
+    END LOOP;
+
+    current_res.id = NULL;
+    current_res.rel = NULL;
+    current_res.record = NULL;
+    current_res.total = total_count;
+    current_res.checked = check_count;
+    current_res.deleted = deleted_count;
+    current_res.visible = visible_count;
+    current_res.excluded = excluded_count;
+
+    CLOSE core_cursor;
+
+    RETURN NEXT current_res;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0555.unnest_oils_xpath_table.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0555'); -- dbs
+
+CREATE OR REPLACE FUNCTION oils_xpath_table ( key TEXT, document_field TEXT, relation_name TEXT, xpaths TEXT, criteria TEXT ) RETURNS SETOF RECORD AS $func$
+DECLARE
+    xpath_list  TEXT[];
+    select_list TEXT[];
+    where_list  TEXT[];
+    q           TEXT;
+    out_record  RECORD;
+    empty_test  RECORD;
+BEGIN
+    xpath_list := STRING_TO_ARRAY( xpaths, '|' );
+
+    select_list := ARRAY_APPEND( select_list, key || '::INT AS key' );
+
+    FOR i IN 1 .. ARRAY_UPPER(xpath_list,1) LOOP
+        IF xpath_list[i] = 'null()' THEN
+            select_list := ARRAY_APPEND( select_list, 'NULL::TEXT AS c_' || i );
+        ELSE
+            select_list := ARRAY_APPEND(
+                select_list,
+                $sel$
+                unnest(
+                    COALESCE(
+                        NULLIF(
+                            oils_xpath(
+                                $sel$ ||
+                                    quote_literal(
+                                        CASE
+                                            WHEN xpath_list[i] ~ $re$/[^/[]*@[^/]+$$re$ OR xpath_list[i] ~ $re$text\(\)$$re$ THEN xpath_list[i]
+                                            ELSE xpath_list[i] || '//text()'
+                                        END
+                                    ) ||
+                                $sel$,
+                                $sel$ || document_field || $sel$
+                            ),
+                           '{}'::TEXT[]
+                        ),
+                        '{NULL}'::TEXT[]
+                    )
+                ) AS c_$sel$ || i
+            );
+            where_list := ARRAY_APPEND(
+                where_list,
+                'c_' || i || ' IS NOT NULL'
+            );
+        END IF;
+    END LOOP;
+
+    q := $q$
+SELECT * FROM (
+    SELECT $q$ || ARRAY_TO_STRING( select_list, ', ' ) || $q$ FROM $q$ || relation_name || $q$ WHERE ($q$ || criteria || $q$)
+)x WHERE $q$ || ARRAY_TO_STRING( where_list, ' OR ' );
+    -- RAISE NOTICE 'query: %', q;
+
+    FOR out_record IN EXECUTE q LOOP
+        RETURN NEXT out_record;
+    END LOOP;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL IMMUTABLE;
+
+-- Evergreen DB patch 0556.unnest_biblio_extract_metabib_field_entry.sql
+--
+-- Replace usage of custom explode_array() function with native unnest()
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0556'); -- dbs
+
+CREATE OR REPLACE FUNCTION biblio.extract_metabib_field_entry ( rid BIGINT, default_joiner TEXT ) RETURNS SETOF metabib.field_entry_template AS $func$
+DECLARE
+    bib     biblio.record_entry%ROWTYPE;
+    idx     config.metabib_field%ROWTYPE;
+    xfrm        config.xml_transform%ROWTYPE;
+    prev_xfrm   TEXT;
+    transformed_xml TEXT;
+    xml_node    TEXT;
+    xml_node_list   TEXT[];
+    facet_text  TEXT;
+    raw_text    TEXT;
+    curr_text   TEXT;
+    joiner      TEXT := default_joiner; -- XXX will index defs supply a joiner?
+    output_row  metabib.field_entry_template%ROWTYPE;
+BEGIN
+
+    -- Get the record
+    SELECT INTO bib * FROM biblio.record_entry WHERE id = rid;
+
+    -- Loop over the indexing entries
+    FOR idx IN SELECT * FROM config.metabib_field ORDER BY format LOOP
+
+        SELECT INTO xfrm * from config.xml_transform WHERE name = idx.format;
+
+        -- See if we can skip the XSLT ... it's expensive
+        IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+            -- Can't skip the transform
+            IF xfrm.xslt <> '---' THEN
+                transformed_xml := oils_xslt_process(bib.marc,xfrm.xslt);
+            ELSE
+                transformed_xml := bib.marc;
+            END IF;
+
+            prev_xfrm := xfrm.name;
+        END IF;
+
+        xml_node_list := oils_xpath( idx.xpath, transformed_xml, ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]] );
+
+        raw_text := NULL;
+        FOR xml_node IN SELECT x FROM unnest(xml_node_list) AS x LOOP
+            CONTINUE WHEN xml_node !~ E'^\\s*<';
+
+            curr_text := ARRAY_TO_STRING(
+                oils_xpath( '//text()',
+                    REGEXP_REPLACE( -- This escapes all &s not followed by "amp;".  Data ise returned from oils_xpath (above) in UTF-8, not entity encoded
+                        REGEXP_REPLACE( -- This escapes embeded <s
+                            xml_node,
+                            $re$(>[^<]+)(<)([^>]+<)$re$,
+                            E'\\1&lt;\\3',
+                            'g'
+                        ),
+                        '&(?!amp;)',
+                        '&amp;',
+                        'g'
+                    )
+                ),
+                ' '
+            );
+
+            CONTINUE WHEN curr_text IS NULL OR curr_text = '';
+
+            IF raw_text IS NOT NULL THEN
+                raw_text := raw_text || joiner;
+            END IF;
+
+            raw_text := COALESCE(raw_text,'') || curr_text;
+
+            -- insert raw node text for faceting
+            IF idx.facet_field THEN
+
+                IF idx.facet_xpath IS NOT NULL AND idx.facet_xpath <> '' THEN
+                    facet_text := oils_xpath_string( idx.facet_xpath, xml_node, joiner, ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]] );
+                ELSE
+                    facet_text := curr_text;
+                END IF;
+
+                output_row.field_class = idx.field_class;
+                output_row.field = -1 * idx.id;
+                output_row.source = rid;
+                output_row.value = BTRIM(REGEXP_REPLACE(facet_text, E'\\s+', ' ', 'g'));
+
+                RETURN NEXT output_row;
+            END IF;
+
+        END LOOP;
+
+        CONTINUE WHEN raw_text IS NULL OR raw_text = '';
+
+        -- insert combined node text for searching
+        IF idx.search_field THEN
+            output_row.field_class = idx.field_class;
+            output_row.field = idx.id;
+            output_row.source = rid;
+            output_row.value = BTRIM(REGEXP_REPLACE(raw_text, E'\\s+', ' ', 'g'));
+
+            RETURN NEXT output_row;
+        END IF;
+
+    END LOOP;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0559.schema.biblio.extract_located_uris.sql
+--
+-- * Add a stored procedure to reingest problematic URIs
+-- * Avoid duplicate row issues in biblio.extract_located_uris
+-- * Fix LP 797304 and 797307 - asset.uri parsing bugs
+--
+
+
+-- check whether patch can be applied
+INSERT INTO config.upgrade_log (version) VALUES ('0559'); -- dbs
+
+-- FIXME: add/check SQL statements to perform the upgrade
+CREATE OR REPLACE FUNCTION biblio.extract_located_uris( bib_id BIGINT, marcxml TEXT, editor_id INT ) RETURNS VOID AS $func$
+DECLARE
+    uris            TEXT[];
+    uri_xml         TEXT;
+    uri_label       TEXT;
+    uri_href        TEXT;
+    uri_use         TEXT;
+    uri_owner_list  TEXT[];
+    uri_owner       TEXT;
+    uri_owner_id    INT;
+    uri_id          INT;
+    uri_cn_id       INT;
+    uri_map_id      INT;
+BEGIN
+
+    -- Clear any URI mappings and call numbers for this bib.
+    -- This leads to acn / auricnm inflation, but also enables
+    -- old acn/auricnm's to go away and for bibs to be deleted.
+    FOR uri_cn_id IN SELECT id FROM asset.call_number WHERE record = bib_id AND label = '##URI##' AND NOT deleted LOOP
+        DELETE FROM asset.uri_call_number_map WHERE call_number = uri_cn_id;
+        DELETE FROM asset.call_number WHERE id = uri_cn_id;
+    END LOOP;
+
+    uris := oils_xpath('//*[@tag="856" and (@ind1="4" or @ind1="1") and (@ind2="0" or @ind2="1")]',marcxml);
+    IF ARRAY_UPPER(uris,1) > 0 THEN
+        FOR i IN 1 .. ARRAY_UPPER(uris, 1) LOOP
+            -- First we pull info out of the 856
+            uri_xml     := uris[i];
+
+            uri_href    := (oils_xpath('//*[@code="u"]/text()',uri_xml))[1];
+            uri_label   := (oils_xpath('//*[@code="y"]/text()|//*[@code="3"]/text()',uri_xml))[1];
+            uri_use     := (oils_xpath('//*[@code="z"]/text()|//*[@code="2"]/text()|//*[@code="n"]/text()',uri_xml))[1];
+
+            IF uri_label IS NULL THEN
+                uri_label := uri_href;
+            END IF;
+            CONTINUE WHEN uri_href IS NULL;
+
+            -- Get the distinct list of libraries wanting to use 
+            SELECT  ARRAY_ACCUM(
+                        DISTINCT REGEXP_REPLACE(
+                            x,
+                            $re$^.*?\((\w+)\).*$$re$,
+                            E'\\1'
+                        )
+                    ) INTO uri_owner_list
+              FROM  UNNEST(
+                        oils_xpath(
+                            '//*[@code="9"]/text()|//*[@code="w"]/text()|//*[@code="n"]/text()',
+                            uri_xml
+                        )
+                    )x;
+
+            IF ARRAY_UPPER(uri_owner_list,1) > 0 THEN
+
+                -- look for a matching uri
+                IF uri_use IS NULL THEN
+                    SELECT id INTO uri_id
+                        FROM asset.uri
+                        WHERE label = uri_label AND href = uri_href AND use_restriction IS NULL AND active
+                        ORDER BY id LIMIT 1;
+                    IF NOT FOUND THEN -- create one
+                        INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
+                        SELECT id INTO uri_id
+                            FROM asset.uri
+                            WHERE label = uri_label AND href = uri_href AND use_restriction IS NULL AND active;
+                    END IF;
+                ELSE
+                    SELECT id INTO uri_id
+                        FROM asset.uri
+                        WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active
+                        ORDER BY id LIMIT 1;
+                    IF NOT FOUND THEN -- create one
+                        INSERT INTO asset.uri (label, href, use_restriction) VALUES (uri_label, uri_href, uri_use);
+                        SELECT id INTO uri_id
+                            FROM asset.uri
+                            WHERE label = uri_label AND href = uri_href AND use_restriction = uri_use AND active;
+                    END IF;
+                END IF;
+
+                FOR j IN 1 .. ARRAY_UPPER(uri_owner_list, 1) LOOP
+                    uri_owner := uri_owner_list[j];
+
+                    SELECT id INTO uri_owner_id FROM actor.org_unit WHERE shortname = uri_owner;
+                    CONTINUE WHEN NOT FOUND;
+
+                    -- we need a call number to link through
+                    SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.call_number (owning_lib, record, create_date, edit_date, creator, editor, label)
+                            VALUES (uri_owner_id, bib_id, 'now', 'now', editor_id, editor_id, '##URI##');
+                        SELECT id INTO uri_cn_id FROM asset.call_number WHERE owning_lib = uri_owner_id AND record = bib_id AND label = '##URI##' AND NOT deleted;
+                    END IF;
+
+                    -- now, link them if they're not already
+                    SELECT id INTO uri_map_id FROM asset.uri_call_number_map WHERE call_number = uri_cn_id AND uri = uri_id;
+                    IF NOT FOUND THEN
+                        INSERT INTO asset.uri_call_number_map (call_number, uri) VALUES (uri_cn_id, uri_id);
+                    END IF;
+
+                END LOOP;
+
+            END IF;
+
+        END LOOP;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION biblio.reingest_uris() RETURNS VOID AS $func$
+DECLARE
+    rec_id BIGINT;
+BEGIN
+    -- Get the distinct set of record IDs that need to be reingested
+    -- (assuming that href = label is a reasonable red flag)
+    FOR rec_id IN SELECT rec_uris.id FROM (
+        SELECT acn.record AS id
+            FROM asset.call_number acn
+                INNER JOIN asset.uri_call_number_map auricnm ON auricnm.call_number = acn.id
+                INNER JOIN asset.uri auri ON auri.id = auricnm.uri
+                INNER JOIN biblio.record_entry bre ON acn.record = bre.id
+            WHERE auri.href = auri.label
+                AND xml_is_well_formed(bre.marc)
+            GROUP BY acn.record
+            ORDER BY acn.record
+        ) AS rec_uris
+    LOOP
+        -- Reingest the offending records
+        PERFORM biblio.extract_located_uris(rec_id, bre.marc, 1)
+            FROM biblio.record_entry bre
+            WHERE bre.id = rec_id;
+    END LOOP;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Kick off the reingest; this may take a while
+SELECT biblio.reingest_uris();
+
+-- Hopefully this isn't something we'll need to run again
+DROP FUNCTION biblio.reingest_uris();
+
+INSERT INTO config.upgrade_log (version) VALUES ('0561'); -- miker
+
+CREATE INDEX metabib_full_rec_tnf_idx ON metabib.real_full_rec (record, tag, subfield) WHERE tag = 'tnf' AND subfield = 'a';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.7-2.0.8-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.7-2.0.8-upgrade-db.sql
new file mode 100644 (file)
index 0000000..854a7df
--- /dev/null
@@ -0,0 +1,637 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0573'); -- miker
+
+CREATE OR REPLACE FUNCTION search.query_parser_fts (
+
+    param_search_ou INT,
+    param_depth     INT,
+    param_query     TEXT,
+    param_statuses  INT[],
+    param_locations INT[],
+    param_offset    INT,
+    param_check     INT,
+    param_limit     INT,
+    metarecord      BOOL,
+    staff           BOOL
+) RETURNS SETOF search.search_result AS $func$
+DECLARE
+
+    current_res         search.search_result%ROWTYPE;
+    search_org_list     INT[];
+
+    check_limit         INT;
+    core_limit          INT;
+    core_offset         INT;
+    tmp_int             INT;
+
+    core_result         RECORD;
+    core_cursor         REFCURSOR;
+    core_rel_query      TEXT;
+
+    total_count         INT := 0;
+    check_count         INT := 0;
+    deleted_count       INT := 0;
+    visible_count       INT := 0;
+    excluded_count      INT := 0;
+
+BEGIN
+
+    check_limit := COALESCE( param_check, 1000 );
+    core_limit  := COALESCE( param_limit, 25000 );
+    core_offset := COALESCE( param_offset, 0 );
+
+    -- core_skip_chk := COALESCE( param_skip_chk, 1 );
+
+    IF param_search_ou > 0 THEN
+        IF param_depth IS NOT NULL THEN
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou, param_depth );
+        ELSE
+            SELECT array_accum(distinct id) INTO search_org_list FROM actor.org_unit_descendants( param_search_ou );
+        END IF;
+    ELSIF param_search_ou < 0 THEN
+        SELECT array_accum(distinct org_unit) INTO search_org_list FROM actor.org_lasso_map WHERE lasso = -param_search_ou;
+    ELSIF param_search_ou = 0 THEN
+        -- reserved for user lassos (ou_buckets/type='lasso') with ID passed in depth ... hack? sure.
+    END IF;
+
+    OPEN core_cursor FOR EXECUTE param_query;
+
+    LOOP
+
+        FETCH core_cursor INTO core_result;
+        EXIT WHEN NOT FOUND;
+        EXIT WHEN total_count >= core_limit;
+
+        total_count := total_count + 1;
+
+        CONTINUE WHEN total_count NOT BETWEEN  core_offset + 1 AND check_limit + core_offset;
+
+        check_count := check_count + 1;
+
+        PERFORM 1 FROM biblio.record_entry b WHERE NOT b.deleted AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
+        IF NOT FOUND THEN
+            -- RAISE NOTICE ' % were all deleted ... ', core_result.records;
+            deleted_count := deleted_count + 1;
+            CONTINUE;
+        END IF;
+
+        PERFORM 1
+          FROM  biblio.record_entry b
+                JOIN config.bib_source s ON (b.source = s.id)
+          WHERE s.transcendant
+                AND b.id IN ( SELECT * FROM unnest( core_result.records ) );
+
+        IF FOUND THEN
+            -- RAISE NOTICE ' % were all transcendant ... ', core_result.records;
+            visible_count := visible_count + 1;
+
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
+
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
+
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
+
+            RETURN NEXT current_res;
+
+            CONTINUE;
+        END IF;
+
+        PERFORM 1
+          FROM  asset.call_number cn
+                JOIN asset.uri_call_number_map map ON (map.call_number = cn.id)
+                JOIN asset.uri uri ON (map.uri = uri.id)
+          WHERE NOT cn.deleted
+                AND cn.label = '##URI##'
+                AND uri.active
+                AND ( param_locations IS NULL OR array_upper(param_locations, 1) IS NULL )
+                AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                AND cn.owning_lib IN ( SELECT * FROM unnest( search_org_list ) )
+          LIMIT 1;
+
+        IF FOUND THEN
+            -- RAISE NOTICE ' % have at least one URI ... ', core_result.records;
+            visible_count := visible_count + 1;
+
+            current_res.id = core_result.id;
+            current_res.rel = core_result.rel;
+
+            tmp_int := 1;
+            IF metarecord THEN
+                SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+            END IF;
+
+            IF tmp_int = 1 THEN
+                current_res.record = core_result.records[1];
+            ELSE
+                current_res.record = NULL;
+            END IF;
+
+            RETURN NEXT current_res;
+
+            CONTINUE;
+        END IF;
+
+        IF param_statuses IS NOT NULL AND array_upper(param_statuses, 1) > 0 THEN
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.status IN ( SELECT * FROM unnest( param_statuses ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all status-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        END IF;
+
+        IF param_locations IS NOT NULL AND array_upper(param_locations, 1) > 0 THEN
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.location IN ( SELECT * FROM unnest( param_locations ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all copy_location-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        END IF;
+
+        IF staff IS NULL OR NOT staff THEN
+
+            PERFORM 1
+              FROM  asset.opac_visible_copies
+              WHERE circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+                -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
+                excluded_count := excluded_count + 1;
+                CONTINUE;
+            END IF;
+
+        ELSE
+
+            PERFORM 1
+              FROM  asset.call_number cn
+                    JOIN asset.copy cp ON (cp.call_number = cn.id)
+              WHERE NOT cn.deleted
+                    AND NOT cp.deleted
+                    AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) )
+                    AND cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+              LIMIT 1;
+
+            IF NOT FOUND THEN
+
+                PERFORM 1
+                  FROM  asset.call_number cn
+                        JOIN asset.copy cp ON (cp.call_number = cn.id)
+                  WHERE cn.record IN ( SELECT * FROM unnest( core_result.records ) )
+                        AND NOT cp.deleted
+                  LIMIT 1;
+
+                IF FOUND THEN
+                    -- RAISE NOTICE ' % were all visibility-excluded ... ', core_result.records;
+                    excluded_count := excluded_count + 1;
+                    CONTINUE;
+                END IF;
+
+            END IF;
+
+        END IF;
+
+        visible_count := visible_count + 1;
+
+        current_res.id = core_result.id;
+        current_res.rel = core_result.rel;
+
+        tmp_int := 1;
+        IF metarecord THEN
+            SELECT COUNT(DISTINCT s.source) INTO tmp_int FROM metabib.metarecord_source_map s WHERE s.metarecord = core_result.id;
+        END IF;
+
+        IF tmp_int = 1 THEN
+            current_res.record = core_result.records[1];
+        ELSE
+            current_res.record = NULL;
+        END IF;
+
+        RETURN NEXT current_res;
+
+        IF visible_count % 1000 = 0 THEN
+            -- RAISE NOTICE ' % visible so far ... ', visible_count;
+        END IF;
+
+    END LOOP;
+
+    current_res.id = NULL;
+    current_res.rel = NULL;
+    current_res.record = NULL;
+    current_res.total = total_count;
+    current_res.checked = check_count;
+    current_res.deleted = deleted_count;
+    current_res.visible = visible_count;
+    current_res.excluded = excluded_count;
+
+    CLOSE core_cursor;
+
+    RETURN NEXT current_res;
+
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+-- Evergreen DB patch 0576.fix_maintain_901_quoting.sql
+--
+-- Fix for bug LP#809540 - fixes crash when inserting or updating
+-- bib whose tcn_value contains regex metacharacters.
+--
+
+-- check whether patch can be applied
+INSERT INTO config.upgrade_log (version) VALUES ('0576');
+
+CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$
+DECLARE
+    use_id_for_tcn BOOLEAN;
+BEGIN
+    -- Remove any existing 901 fields before we insert the authoritative one
+    NEW.marc := REGEXP_REPLACE(NEW.marc, E'<datafield[^>]*?tag="901".+?</datafield>', '', 'g');
+
+    IF TG_TABLE_SCHEMA = 'biblio' THEN
+        -- Set TCN value to record ID?
+        SELECT enabled FROM config.global_flag INTO use_id_for_tcn
+            WHERE name = 'cat.bib.use_id_for_tcn';
+
+        IF use_id_for_tcn = 't' THEN
+            NEW.tcn_value := NEW.id;
+        END IF;
+
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="a">' || REPLACE(evergreen.xml_escape(NEW.tcn_value), E'\\', E'\\\\') || E'</subfield>' ||
+                '<subfield code="b">' || REPLACE(evergreen.xml_escape(NEW.tcn_source), E'\\', E'\\\\') || E'</subfield>' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                CASE WHEN NEW.owner IS NOT NULL THEN '<subfield code="o">' || NEW.owner || E'</subfield>' ELSE '' END ||
+                CASE WHEN NEW.share_depth IS NOT NULL THEN '<subfield code="d">' || NEW.share_depth || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'authority' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    ELSIF TG_TABLE_SCHEMA = 'serial' THEN
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+                '<subfield code="o">' || NEW.owning_lib || E'</subfield>' ||
+                CASE WHEN NEW.record IS NOT NULL THEN '<subfield code="r">' || NEW.record || E'</subfield>' ELSE '' END ||
+             E'</datafield>\\1'
+        );
+    ELSE
+        NEW.marc := REGEXP_REPLACE(
+            NEW.marc,
+            E'(</(?:[^:]*?:)?record>)',
+            E'<datafield tag="901" ind1=" " ind2=" ">' ||
+                '<subfield code="c">' || NEW.id || E'</subfield>' ||
+                '<subfield code="t">' || TG_TABLE_SCHEMA || E'</subfield>' ||
+             E'</datafield>\\1'
+        );
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0580'); -- tsbere via miker
+
+CREATE OR REPLACE FUNCTION actor.org_unit_parent_protect () RETURNS TRIGGER AS $$
+    DECLARE
+        current_aou actor.org_unit%ROWTYPE;
+        seen_ous    INT[];
+        depth_count INT;
+       BEGIN
+        current_aou := NEW;
+        depth_count := 0;
+        seen_ous := ARRAY[NEW.id];
+        IF TG_OP = 'INSERT' OR NEW.parent_ou IS DISTINCT FROM OLD.parent_ou THEN
+            LOOP
+                IF current_aou.parent_ou IS NULL THEN -- Top of the org tree?
+                    RETURN NEW; -- No loop. Carry on.
+                END IF;
+                IF current_aou.parent_ou = ANY(seen_ous) THEN -- Parent is one we have seen?
+                    RAISE 'OU LOOP: Saw % twice', current_aou.parent_ou; -- LOOP! ABORT!
+                END IF;
+                -- Get the next one!
+                SELECT INTO current_aou * FROM actor.org_unit WHERE id = current_aou.parent_ou;
+                seen_ous := seen_ous || current_aou.id;
+                depth_count := depth_count + 1;
+                IF depth_count = 100 THEN
+                    RAISE 'OU CHECK TOO DEEP';
+                END IF;
+            END LOOP;
+        END IF;
+               RETURN NEW;
+       END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER actor_org_unit_parent_protect_trigger
+    BEFORE INSERT OR UPDATE ON actor.org_unit FOR EACH ROW
+    EXECUTE PROCEDURE actor.org_unit_parent_protect ();
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0581'); -- tsbere via miker
+
+INSERT INTO config.global_flag (name, label, enabled)
+    VALUES (
+        'circ.opac_renewal.use_original_circ_lib',
+        oils_i18n_gettext(
+            'circ.opac_renewal.use_original_circ_lib',
+            'Circ: Use original circulation library on opac renewal instead of user home library',
+            'cgf',
+            'label'
+        ),
+        FALSE
+    );
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0582'); -- miker
+
+CREATE OR REPLACE VIEW action.all_circulation AS
+    SELECT  id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recurring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recurring_fine_rule,
+        max_fine_rule, stop_fines, workstation, checkin_workstation, checkin_scan_time, parent_circ
+      FROM  action.aged_circulation
+            UNION ALL
+    SELECT  DISTINCT circ.id,COALESCE(a.post_code,b.post_code) AS usr_post_code, p.home_ou AS usr_home_ou, p.profile AS usr_profile, EXTRACT(YEAR FROM p.dob)::INT AS usr_birth_year,
+        cp.call_number AS copy_call_number, cp.location AS copy_location, cn.owning_lib AS copy_owning_lib, cp.circ_lib AS copy_circ_lib,
+        cn.record AS copy_bib_record, circ.xact_start, circ.xact_finish, circ.target_copy, circ.circ_lib, circ.circ_staff, circ.checkin_staff,
+        circ.checkin_lib, circ.renewal_remaining, circ.due_date, circ.stop_fines_time, circ.checkin_time, circ.create_time, circ.duration,
+        circ.fine_interval, circ.recurring_fine, circ.max_fine, circ.phone_renewal, circ.desk_renewal, circ.opac_renewal, circ.duration_rule,
+        circ.recurring_fine_rule, circ.max_fine_rule, circ.stop_fines, circ.workstation, circ.checkin_workstation, circ.checkin_scan_time,
+        circ.parent_circ
+      FROM  action.circulation circ
+        JOIN asset.copy cp ON (circ.target_copy = cp.id)
+        JOIN asset.call_number cn ON (cp.call_number = cn.id)
+        JOIN actor.usr p ON (circ.usr = p.id)
+        LEFT JOIN actor.usr_address a ON (p.mailing_address = a.id)
+        LEFT JOIN actor.usr_address b ON (p.billing_address = b.id);
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0587'); -- dbs/berick
+
+CREATE OR REPLACE FUNCTION maintain_control_numbers() RETURNS TRIGGER AS $func$
+use strict;
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+use Encode;
+use Unicode::Normalize;
+
+MARC::Charset->assume_unicode(1);
+
+my $record = MARC::Record->new_from_xml($_TD->{new}{marc});
+my $schema = $_TD->{table_schema};
+my $rec_id = $_TD->{new}{id};
+
+# Short-circuit if maintaining control numbers per MARC21 spec is not enabled
+my $enable = spi_exec_query("SELECT enabled FROM config.global_flag WHERE name = 'cat.maintain_control_numbers'");
+if (!($enable->{processed}) or $enable->{rows}[0]->{enabled} eq 'f') {
+    return;
+}
+
+# Get the control number identifier from an OU setting based on $_TD->{new}{owner}
+my $ou_cni = 'EVRGRN';
+
+my $owner;
+if ($schema eq 'serial') {
+    $owner = $_TD->{new}{owning_lib};
+} else {
+    # are.owner and bre.owner can be null, so fall back to the consortial setting
+    $owner = $_TD->{new}{owner} || 1;
+}
+
+my $ous_rv = spi_exec_query("SELECT value FROM actor.org_unit_ancestor_setting('cat.marc_control_number_identifier', $owner)");
+if ($ous_rv->{processed}) {
+    $ou_cni = $ous_rv->{rows}[0]->{value};
+    $ou_cni =~ s/"//g; # Stupid VIM syntax highlighting"
+} else {
+    # Fall back to the shortname of the OU if there was no OU setting
+    $ous_rv = spi_exec_query("SELECT shortname FROM actor.org_unit WHERE id = $owner");
+    if ($ous_rv->{processed}) {
+        $ou_cni = $ous_rv->{rows}[0]->{shortname};
+    }
+}
+
+my ($create, $munge) = (0, 0);
+
+my @scns = $record->field('035');
+
+foreach my $id_field ('001', '003') {
+    my $spec_value;
+    my @controls = $record->field($id_field);
+
+    if ($id_field eq '001') {
+        $spec_value = $rec_id;
+    } else {
+        $spec_value = $ou_cni;
+    }
+
+    # Create the 001/003 if none exist
+    if (scalar(@controls) == 1) {
+        # Only one field; check to see if we need to munge it
+        unless (grep $_->data() eq $spec_value, @controls) {
+            $munge = 1;
+        }
+    } else {
+        # Delete the other fields, as with more than 1 001/003 we do not know which 003/001 to match
+        foreach my $control (@controls) {
+            $record->delete_field($control);
+        }
+        $record->insert_fields_ordered(MARC::Field->new($id_field, $spec_value));
+        $create = 1;
+    }
+}
+
+my $cn = $record->field('001')->data();
+# Special handling of OCLC numbers, often found in records that lack 003
+if ($cn =~ /^oc[nm]/) {
+    $cn =~ s/^oc[nm]0*(\d+)/$1/;
+    $record->field('003')->data('OCoLC');
+    $create = 0;
+}
+
+# Now, if we need to munge the 001, we will first push the existing 001/003
+# into the 035; but if the record did not have one (and one only) 001 and 003
+# to begin with, skip this process
+if ($munge and not $create) {
+
+    my $scn = "(" . $record->field('003')->data() . ")" . $cn;
+
+    # Do not create duplicate 035 fields
+    unless (grep $_->subfield('a') eq $scn, @scns) {
+        $record->insert_fields_ordered(MARC::Field->new('035', '', '', 'a' => $scn));
+    }
+}
+
+# Set the 001/003 and update the MARC
+if ($create or $munge) {
+    $record->field('001')->data($rec_id);
+    $record->field('003')->data($ou_cni);
+
+    my $xml = $record->as_xml_record();
+    $xml =~ s/\n//sgo;
+    $xml =~ s/^<\?xml.+\?\s*>//go;
+    $xml =~ s/>\s+</></go;
+    $xml =~ s/\p{Cc}//go;
+
+    # Embed a version of OpenILS::Application::AppUtils->entityize()
+    # to avoid having to set PERL5LIB for PostgreSQL as well
+
+    # If we are going to convert non-ASCII characters to XML entities,
+    # we had better be dealing with a UTF8 string to begin with
+    $xml = decode_utf8($xml);
+
+    $xml = NFC($xml);
+
+    # Convert raw ampersands to entities
+    $xml =~ s/&(?!\S+;)/&amp;/gso;
+
+    # Convert Unicode characters to entities
+    $xml =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe;
+
+    $xml =~ s/[\x00-\x1f]//go;
+    $_TD->{new}{marc} = $xml;
+
+    return "MODIFY";
+}
+
+return;
+$func$ LANGUAGE PLPERLU;
+
+INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath) VALUES
+    (29, 'identifier', 'scn', oils_i18n_gettext(28, 'System Control Number', 'cmf', 'label'), 'marcxml', $$//marc:datafield[@tag='035']/marc:subfield[@code="a"]$$);
+INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath) VALUES
+    (30, 'identifier', 'lccn', oils_i18n_gettext(28, 'LC Control Number', 'cmf', 'label'), 'marcxml', $$//marc:datafield[@tag='010']/marc:subfield[@code="a" or @code='z']$$);
+
+-- Far from perfect, but much faster than reingesting every record
+INSERT INTO metabib.identifier_field_entry(source, field, value) 
+    SELECT record, 29, value FROM metabib.full_rec WHERE tag = '035' AND subfield = 'a';
+INSERT INTO metabib.identifier_field_entry(source, field, value) 
+    SELECT record, 30, value FROM metabib.full_rec WHERE tag = '010' AND subfield IN ('a', 'z');
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0588');
+
+CREATE OR REPLACE FUNCTION vandelay.replace_field ( target_xml TEXT, source_xml TEXT, field TEXT ) RETURNS TEXT AS $_$
+DECLARE
+    xml_output TEXT;
+    parsed_target TEXT;
+    curr_field TEXT;
+BEGIN
+
+    parsed_target := vandelay.strip_field( target_xml, ''); -- this dance normalizes the format of the xml for the IF below
+    xml_output := parsed_target; -- if there are no replace rules, just return the input
+
+    FOR curr_field IN SELECT UNNEST( STRING_TO_ARRAY(field, ',') ) LOOP -- naive split, but it's the same we use in the perl
+
+        xml_output := vandelay.strip_field( parsed_target, curr_field);
+
+        IF xml_output <> parsed_target  AND curr_field ~ E'~' THEN
+            -- we removed something, and there was a regexp restriction in the curr_field definition, so proceed
+            xml_output := vandelay.add_field( xml_output, source_xml, curr_field, 1 );
+        ELSIF curr_field !~ E'~' THEN
+            -- No regexp restriction, add the curr_field
+            xml_output := vandelay.add_field( xml_output, source_xml, curr_field, 0 );
+        END IF;
+
+        parsed_target := xml_output; -- in prep for any following loop iterations
+
+    END LOOP;
+
+    RETURN xml_output;
+END;
+$_$ LANGUAGE PLPGSQL;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0589');
+
+DROP TRIGGER IF EXISTS mat_summary_add_tgr ON money.cash_payment;
+DROP TRIGGER IF EXISTS mat_summary_upd_tgr ON money.cash_payment;
+DROP TRIGGER IF EXISTS mat_summary_del_tgr ON money.cash_payment;
+
+CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('cash_payment');
+CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('cash_payment');
+CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.cash_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('cash_payment');
+DROP TRIGGER IF EXISTS mat_summary_add_tgr ON money.check_payment;
+DROP TRIGGER IF EXISTS mat_summary_upd_tgr ON money.check_payment;
+DROP TRIGGER IF EXISTS mat_summary_del_tgr ON money.check_payment;
+
+CREATE TRIGGER mat_summary_add_tgr AFTER INSERT ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_add ('check_payment');
+CREATE TRIGGER mat_summary_upd_tgr AFTER UPDATE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_update ('check_payment');
+CREATE TRIGGER mat_summary_del_tgr BEFORE DELETE ON money.check_payment FOR EACH ROW EXECUTE PROCEDURE money.materialized_summary_payment_del ('check_payment');
+
+
+--Upgrade script for lp818311.
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0592');
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 512, 'ACQ_INVOICE_REOPEN', oils_i18n_gettext( 512,
+    'Allows a user to reopen an Acquisitions invoice', 'ppl', 'description' ));
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Acquisitions Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code = 'ACQ_INVOICE_REOPEN';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.8-2.0.9-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.8-2.0.9-upgrade-db.sql
new file mode 100644 (file)
index 0000000..e28b163
--- /dev/null
@@ -0,0 +1,249 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.9');
+
+
+-- Fix LP#825303 by allowing for ancestor OUs to be checked
+-- when retrieving the default classification scheme.
+--
+INSERT INTO config.upgrade_log (version) VALUES ('0600');
+
+CREATE OR REPLACE FUNCTION asset.label_normalizer() RETURNS TRIGGER AS $func$
+DECLARE
+    sortkey        TEXT := '';
+BEGIN
+    sortkey := NEW.label_sortkey;
+
+    IF NEW.label_class IS NULL THEN
+            NEW.label_class := COALESCE(
+            (
+                SELECT substring(value from E'\\d+')::integer
+                FROM actor.org_unit_ancestor_setting('cat.default_classification_scheme', NEW.owning_lib)
+            ), 1
+        );
+    END IF;
+
+    EXECUTE 'SELECT ' || acnc.normalizer || '(' || 
+       quote_literal( NEW.label ) || ')'
+       FROM asset.call_number_class acnc
+       WHERE acnc.id = NEW.label_class
+       INTO sortkey;
+    NEW.label_sortkey = sortkey;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+-- Correct actor.org_unit_ancestor_setting so that it returns
+-- at most one setting value, rather than the entire set
+-- of values defined for the OU and its ancestors.
+--
+INSERT INTO config.upgrade_log (version) VALUES ('0601');
+
+CREATE OR REPLACE FUNCTION actor.org_unit_ancestor_setting( setting_name TEXT, org_id INT ) RETURNS SETOF actor.org_unit_setting AS $$
+DECLARE
+    setting RECORD;
+    cur_org INT;
+BEGIN
+    cur_org := org_id;
+    LOOP
+        SELECT INTO setting * FROM actor.org_unit_setting WHERE org_unit = cur_org AND name = setting_name;
+        IF FOUND THEN
+            RETURN NEXT setting;
+            EXIT;
+        END IF;
+        SELECT INTO cur_org parent_ou FROM actor.org_unit WHERE id = cur_org;
+        EXIT WHEN cur_org IS NULL;
+    END LOOP;
+    RETURN;
+END;
+$$ LANGUAGE plpgsql STABLE ROWS 1;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0602'); -- dbs via miker
+
+CREATE OR REPLACE FUNCTION asset.opac_lasso_metarecord_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+                JOIN metabib.metarecord_source_map m ON (m.source = av.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;   
+                
+    RETURN;     
+END;            
+$f$ LANGUAGE PLPGSQL;
+
+
+CREATE OR REPLACE FUNCTION asset.staff_lasso_metarecord_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+                JOIN metabib.metarecord_source_map m ON (m.source = cn.record)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.opac_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;   
+                
+    RETURN;     
+END;            
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( cp.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+-- Correct the fact that actor.org_unit_parent_protect() may not work
+-- due to 'IF' conditions in PL/pgSQL not necessarily processing in the
+-- order written
+--
+INSERT INTO config.upgrade_log (version) VALUES ('0605'); --dbwells via dbs
+
+CREATE OR REPLACE FUNCTION actor.org_unit_parent_protect () RETURNS TRIGGER AS $$
+       DECLARE
+               current_aou actor.org_unit%ROWTYPE;
+               seen_ous    INT[];
+               depth_count INT;
+       BEGIN
+               current_aou := NEW;
+               depth_count := 0;
+               seen_ous := ARRAY[NEW.id];
+
+               IF (TG_OP = 'UPDATE') THEN
+                       IF (NEW.parent_ou IS NOT DISTINCT FROM OLD.parent_ou) THEN
+                               RETURN NEW; -- Doing an UPDATE with no change, just return it
+                       END IF;
+               END IF;
+
+               LOOP
+                       IF current_aou.parent_ou IS NULL THEN -- Top of the org tree?
+                               RETURN NEW; -- No loop. Carry on.
+                       END IF;
+                       IF current_aou.parent_ou = ANY(seen_ous) THEN -- Parent is one we have seen?
+                               RAISE 'OU LOOP: Saw % twice', current_aou.parent_ou; -- LOOP! ABORT!
+                       END IF;
+                       -- Get the next one!
+                       SELECT INTO current_aou * FROM actor.org_unit WHERE id = current_aou.parent_ou;
+                       seen_ous := seen_ous || current_aou.id;
+                       depth_count := depth_count + 1;
+                       IF depth_count = 100 THEN
+                               RAISE 'OU CHECK TOO DEEP';
+                       END IF;
+               END LOOP;
+
+               RETURN NEW;
+       END;
+$$ LANGUAGE PLPGSQL;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0607');
+
+CREATE OR REPLACE FUNCTION actor.org_unit_ancestors( INT ) RETURNS SETOF actor.org_unit AS $$
+    WITH RECURSIVE org_unit_ancestors_distance(id, distance) AS (
+            SELECT $1, 0
+        UNION
+            SELECT ou.parent_ou, ouad.distance+1
+            FROM actor.org_unit ou JOIN org_unit_ancestors_distance ouad ON (ou.id = ouad.id)
+            WHERE ou.parent_ou IS NOT NULL
+    )
+    SELECT ou.* FROM actor.org_unit ou JOIN org_unit_ancestors_distance ouad USING (id) ORDER BY ouad.distance DESC;
+$$ LANGUAGE SQL ROWS 1;
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.0.9-2.0.10-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.0.9-2.0.10-upgrade-db.sql
new file mode 100644 (file)
index 0000000..b2f0b8e
--- /dev/null
@@ -0,0 +1,14 @@
+-- Evergreen DB patch XXXX.data.jedi-template.sql
+--
+--
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0629');
+INSERT INTO config.upgrade_log (version) VALUES ('2.0.10'); 
+
+UPDATE action_trigger.event_definition
+    SET template =
+        REPLACE(template, 'helpers.get_li_attr', 'helpers.get_li_attr_jedi')
+    WHERE id = 23;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
new file mode 100644 (file)
index 0000000..d1b5ba3
--- /dev/null
@@ -0,0 +1,6474 @@
+--Upgrade Script for 2.1 to 2.2-alpha1
+
+-- DROP objects that might have existed from a prior run of 0526
+-- Yes this is ironic.
+DROP TABLE IF EXISTS config.db_patch_dependencies;
+ALTER TABLE config.upgrade_log DROP COLUMN applied_to;
+DROP FUNCTION evergreen.upgrade_list_applied_deprecates(TEXT);
+DROP FUNCTION evergreen.upgrade_list_applied_supersedes(TEXT);
+
+BEGIN;
+INSERT INTO config.upgrade_log (version) VALUES ('2.2-alpha1');
+
+INSERT INTO config.upgrade_log (version) VALUES ('0526'); --miker
+
+CREATE TABLE config.db_patch_dependencies (
+  db_patch      TEXT PRIMARY KEY,
+  supersedes    TEXT[],
+  deprecates    TEXT[]
+);
+
+CREATE OR REPLACE FUNCTION evergreen.array_overlap_check (/* field */) RETURNS TRIGGER AS $$
+DECLARE
+    fld     TEXT;
+    cnt     INT;
+BEGIN
+    fld := TG_ARGV[1];
+    EXECUTE 'SELECT COUNT(*) FROM '|| TG_TABLE_SCHEMA ||'.'|| TG_TABLE_NAME ||' WHERE '|| fld ||' && ($1).'|| fld INTO cnt USING NEW;
+    IF cnt > 0 THEN
+        RAISE EXCEPTION 'Cannot insert duplicate array into field % of table %', fld, TG_TABLE_SCHEMA ||'.'|| TG_TABLE_NAME;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER no_overlapping_sups
+    BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
+    FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('supersedes');
+
+CREATE TRIGGER no_overlapping_deps
+    BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
+    FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
+
+ALTER TABLE config.upgrade_log
+    ADD COLUMN applied_to TEXT;
+
+-- Provide a named type for patching functions
+CREATE TYPE evergreen.patch AS (patch TEXT);
+
+-- List applied db patches that are deprecated by (and block the application of) my_db_patch
+CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_deprecates ( my_db_patch TEXT ) RETURNS SETOF evergreen.patch AS $$
+    SELECT  DISTINCT l.version
+      FROM  config.upgrade_log l
+            JOIN config.db_patch_dependencies d ON (l.version::TEXT[] && d.deprecates)
+      WHERE d.db_patch = $1
+$$ LANGUAGE SQL;
+
+-- List applied db patches that are superseded by (and block the application of) my_db_patch
+CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_supersedes ( my_db_patch TEXT ) RETURNS SETOF evergreen.patch AS $$
+    SELECT  DISTINCT l.version
+      FROM  config.upgrade_log l
+            JOIN config.db_patch_dependencies d ON (l.version::TEXT[] && d.supersedes)
+      WHERE d.db_patch = $1
+$$ LANGUAGE SQL;
+
+-- List applied db patches that deprecates (and block the application of) my_db_patch
+CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_deprecated ( my_db_patch TEXT ) RETURNS TEXT AS $$
+    SELECT  db_patch
+      FROM  config.db_patch_dependencies
+      WHERE ARRAY[$1]::TEXT[] && deprecates
+$$ LANGUAGE SQL;
+
+-- List applied db patches that supersedes (and block the application of) my_db_patch
+CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_superseded ( my_db_patch TEXT ) RETURNS TEXT AS $$
+    SELECT  db_patch
+      FROM  config.db_patch_dependencies
+      WHERE ARRAY[$1]::TEXT[] && supersedes
+$$ LANGUAGE SQL;
+
+-- Make sure that no deprecated or superseded db patches are currently applied
+CREATE OR REPLACE FUNCTION evergreen.upgrade_verify_no_dep_conflicts ( my_db_patch TEXT ) RETURNS BOOL AS $$
+    SELECT  COUNT(*) = 0
+      FROM  (SELECT * FROM evergreen.upgrade_list_applied_deprecates( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_supersedes( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_deprecated( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_superseded( $1 ))x
+$$ LANGUAGE SQL;
+
+-- Raise an exception if there are, in fact, dep/sup confilct
+CREATE OR REPLACE FUNCTION evergreen.upgrade_deps_block_check ( my_db_patch TEXT, my_applied_to TEXT ) RETURNS BOOL AS $$
+DECLARE 
+    deprecates TEXT;
+    supersedes TEXT;
+BEGIN
+    IF NOT evergreen.upgrade_verify_no_dep_conflicts( my_db_patch ) THEN
+        SELECT  STRING_AGG(patch, ', ') INTO deprecates FROM evergreen.upgrade_list_applied_deprecates(my_db_patch);
+        SELECT  STRING_AGG(patch, ', ') INTO supersedes FROM evergreen.upgrade_list_applied_supersedes(my_db_patch);
+        RAISE EXCEPTION '
+Upgrade script % can not be applied:
+  applied deprecated scripts %
+  applied superseded scripts %
+  deprecated by %
+  superseded by %',
+            my_db_patch,
+            ARRAY_AGG(evergreen.upgrade_list_applied_deprecates(my_db_patch)),
+            ARRAY_AGG(evergreen.upgrade_list_applied_supersedes(my_db_patch)),
+            evergreen.upgrade_list_applied_deprecated(my_db_patch),
+            evergreen.upgrade_list_applied_superseded(my_db_patch);
+    END IF;
+
+    INSERT INTO config.upgrade_log (version, applied_to) VALUES (my_db_patch, my_applied_to);
+    RETURN TRUE;
+END;
+$$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0536.schema.lazy_circ-barcode_lookup.sql
+--
+-- FIXME: insert description of change, if needed
+--
+
+-- check whether patch can be applied
+INSERT INTO config.upgrade_log (version) VALUES ('0536');
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype) VALUES ( 'circ.staff_client.actor_on_checkout', 'Load patron from Checkout', 'When scanning barcodes into Checkout auto-detect if a new patron barcode is scanned and auto-load the new patron.', 'bool');
+
+CREATE TABLE config.barcode_completion (
+    id          SERIAL  PRIMARY KEY,
+    active      BOOL    NOT NULL DEFAULT true,
+    org_unit    INT     NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    prefix      TEXT,
+    suffix      TEXT,
+    length      INT     NOT NULL DEFAULT 0,
+    padding     TEXT,
+    padding_end BOOL    NOT NULL DEFAULT false,
+    asset       BOOL    NOT NULL DEFAULT true,
+    actor       BOOL    NOT NULL DEFAULT true
+);
+
+CREATE TYPE evergreen.barcode_set AS (type TEXT, id BIGINT, barcode TEXT);
+
+CREATE OR REPLACE FUNCTION evergreen.get_barcodes(select_ou INT, type TEXT, in_barcode TEXT) RETURNS SETOF evergreen.barcode_set AS $$
+DECLARE
+    cur_barcode TEXT;
+    barcode_len INT;
+    completion_len  INT;
+    asset_barcodes  TEXT[];
+    actor_barcodes  TEXT[];
+    do_asset    BOOL = false;
+    do_serial   BOOL = false;
+    do_booking  BOOL = false;
+    do_actor    BOOL = false;
+    completion_set  config.barcode_completion%ROWTYPE;
+BEGIN
+
+    IF position('asset' in type) > 0 THEN
+        do_asset = true;
+    END IF;
+    IF position('serial' in type) > 0 THEN
+        do_serial = true;
+    END IF;
+    IF position('booking' in type) > 0 THEN
+        do_booking = true;
+    END IF;
+    IF do_asset OR do_serial OR do_booking THEN
+        asset_barcodes = asset_barcodes || in_barcode;
+    END IF;
+    IF position('actor' in type) > 0 THEN
+        do_actor = true;
+        actor_barcodes = actor_barcodes || in_barcode;
+    END IF;
+
+    barcode_len := length(in_barcode);
+
+    FOR completion_set IN
+      SELECT * FROM config.barcode_completion
+        WHERE active
+        AND org_unit IN (SELECT aou.id FROM actor.org_unit_ancestors(select_ou) aou)
+        LOOP
+        IF completion_set.prefix IS NULL THEN
+            completion_set.prefix := '';
+        END IF;
+        IF completion_set.suffix IS NULL THEN
+            completion_set.suffix := '';
+        END IF;
+        IF completion_set.length = 0 OR completion_set.padding IS NULL OR length(completion_set.padding) = 0 THEN
+            cur_barcode = completion_set.prefix || in_barcode || completion_set.suffix;
+        ELSE
+            completion_len = completion_set.length - length(completion_set.prefix) - length(completion_set.suffix);
+            IF completion_len >= barcode_len THEN
+                IF completion_set.padding_end THEN
+                    cur_barcode = rpad(in_barcode, completion_len, completion_set.padding);
+                ELSE
+                    cur_barcode = lpad(in_barcode, completion_len, completion_set.padding);
+                END IF;
+                cur_barcode = completion_set.prefix || cur_barcode || completion_set.suffix;
+            END IF;
+        END IF;
+        IF completion_set.actor THEN
+            actor_barcodes = actor_barcodes || cur_barcode;
+        END IF;
+        IF completion_set.asset THEN
+            asset_barcodes = asset_barcodes || cur_barcode;
+        END IF;
+    END LOOP;
+
+    IF do_asset AND do_serial THEN
+        RETURN QUERY SELECT 'asset'::TEXT, id, barcode FROM ONLY asset.copy WHERE barcode = ANY(asset_barcodes) AND deleted = false;
+        RETURN QUERY SELECT 'serial'::TEXT, id, barcode FROM serial.unit WHERE barcode = ANY(asset_barcodes) AND deleted = false;
+    ELSIF do_asset THEN
+        RETURN QUERY SELECT 'asset'::TEXT, id, barcode FROM asset.copy WHERE barcode = ANY(asset_barcodes) AND deleted = false;
+    ELSIF do_serial THEN
+        RETURN QUERY SELECT 'serial'::TEXT, id, barcode FROM serial.unit WHERE barcode = ANY(asset_barcodes) AND deleted = false;
+    END IF;
+    IF do_booking THEN
+        RETURN QUERY SELECT 'booking'::TEXT, id::BIGINT, barcode FROM booking.resource WHERE barcode = ANY(asset_barcodes);
+    END IF;
+    IF do_actor THEN
+        RETURN QUERY SELECT 'actor'::TEXT, c.usr::BIGINT, c.barcode FROM actor.card c JOIN actor.usr u ON c.usr = u.id WHERE c.barcode = ANY(actor_barcodes) AND c.active AND NOT u.deleted ORDER BY usr;
+    END IF;
+    RETURN;
+END;
+$$ LANGUAGE plpgsql;
+
+COMMENT ON FUNCTION evergreen.get_barcodes(INT, TEXT, TEXT) IS $$
+Given user input, find an appropriate barcode in the proper class.
+
+Will add prefix/suffix information to do so, and return all results.
+$$;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0537'); --miker
+
+DROP FUNCTION evergreen.upgrade_deps_block_check(text,text);
+DROP FUNCTION evergreen.upgrade_verify_no_dep_conflicts(text);
+DROP FUNCTION evergreen.upgrade_list_applied_deprecated(text);
+DROP FUNCTION evergreen.upgrade_list_applied_superseded(text);
+
+-- List applied db patches that deprecates (and block the application of) my_db_patch
+CREATE FUNCTION evergreen.upgrade_list_applied_deprecated ( my_db_patch TEXT ) RETURNS SETOF TEXT AS $$
+    SELECT  db_patch
+      FROM  config.db_patch_dependencies
+      WHERE ARRAY[$1]::TEXT[] && deprecates
+$$ LANGUAGE SQL;
+
+-- List applied db patches that supersedes (and block the application of) my_db_patch
+CREATE FUNCTION evergreen.upgrade_list_applied_superseded ( my_db_patch TEXT ) RETURNS SETOF TEXT AS $$
+    SELECT  db_patch
+      FROM  config.db_patch_dependencies
+      WHERE ARRAY[$1]::TEXT[] && supersedes
+$$ LANGUAGE SQL;
+
+-- Make sure that no deprecated or superseded db patches are currently applied
+CREATE FUNCTION evergreen.upgrade_verify_no_dep_conflicts ( my_db_patch TEXT ) RETURNS BOOL AS $$
+    SELECT  COUNT(*) = 0
+      FROM  (SELECT * FROM evergreen.upgrade_list_applied_deprecates( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_supersedes( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_deprecated( $1 )
+                UNION
+             SELECT * FROM evergreen.upgrade_list_applied_superseded( $1 ))x
+$$ LANGUAGE SQL;
+
+-- Raise an exception if there are, in fact, dep/sup confilct
+CREATE FUNCTION evergreen.upgrade_deps_block_check ( my_db_patch TEXT, my_applied_to TEXT ) RETURNS BOOL AS $$
+BEGIN
+    IF NOT evergreen.upgrade_verify_no_dep_conflicts( my_db_patch ) THEN
+        RAISE EXCEPTION '
+Upgrade script % can not be applied:
+  applied deprecated scripts %
+  applied superseded scripts %
+  deprecated by %
+  superseded by %',
+            my_db_patch,
+            ARRAY_ACCUM(evergreen.upgrade_list_applied_deprecates(my_db_patch)),
+            ARRAY_ACCUM(evergreen.upgrade_list_applied_supersedes(my_db_patch)),
+            evergreen.upgrade_list_applied_deprecated(my_db_patch),
+            evergreen.upgrade_list_applied_superseded(my_db_patch);
+    END IF;
+
+    INSERT INTO config.upgrade_log (version, applied_to) VALUES (my_db_patch, my_applied_to);
+    RETURN TRUE;
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0544');
+
+INSERT INTO config.usr_setting_type 
+( name, opac_visible, label, description, datatype) VALUES 
+( 'circ.collections.exempt',
+  FALSE, 
+  oils_i18n_gettext('circ.collections.exempt', 'Collections: Exempt', 'cust', 'description'),
+  oils_i18n_gettext('circ.collections.exempt', 'User is exempt from collections tracking/processing', 'cust', 'description'),
+  'bool'
+);
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0545', :eg_version);
+
+INSERT INTO permission.perm_list VALUES
+ (507, 'ABORT_TRANSIT_ON_LOST', oils_i18n_gettext(507, 'Allows a user to abort a transit on a copy with status of LOST', 'ppl', 'description')),
+ (508, 'ABORT_TRANSIT_ON_MISSING', oils_i18n_gettext(508, 'Allows a user to abort a transit on a copy with status of MISSING', 'ppl', 'description'));
+
+--- stock Circulation Administrator group
+
+INSERT INTO permission.grp_perm_map ( grp, perm, depth, grantable )
+    SELECT
+        4,
+        id,
+        0,
+        't'
+    FROM permission.perm_list
+    WHERE code in ('ABORT_TRANSIT_ON_LOST', 'ABORT_TRANSIT_ON_MISSING');
+
+-- Evergreen DB patch 0546.schema.sip_statcats.sql
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0546', :eg_version);
+
+CREATE TABLE actor.stat_cat_sip_fields (
+    field   CHAR(2) PRIMARY KEY,
+    name    TEXT    NOT NULL,
+    one_only  BOOL    NOT NULL DEFAULT FALSE
+);
+COMMENT ON TABLE actor.stat_cat_sip_fields IS $$
+Actor Statistical Category SIP Fields
+
+Contains the list of valid SIP Field identifiers for
+Statistical Categories.
+$$;
+ALTER TABLE actor.stat_cat
+    ADD COLUMN sip_field   CHAR(2) REFERENCES actor.stat_cat_sip_fields(field) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN sip_format  TEXT;
+
+CREATE FUNCTION actor.stat_cat_check() RETURNS trigger AS $func$
+DECLARE
+    sipfield actor.stat_cat_sip_fields%ROWTYPE;
+    use_count INT;
+BEGIN
+    IF NEW.sip_field IS NOT NULL THEN
+        SELECT INTO sipfield * FROM actor.stat_cat_sip_fields WHERE field = NEW.sip_field;
+        IF sipfield.one_only THEN
+            SELECT INTO use_count count(id) FROM actor.stat_cat WHERE sip_field = NEW.sip_field AND id != NEW.id;
+            IF use_count > 0 THEN
+                RAISE EXCEPTION 'Sip field cannot be used twice';
+            END IF;
+        END IF;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER actor_stat_cat_sip_update_trigger
+    BEFORE INSERT OR UPDATE ON actor.stat_cat FOR EACH ROW
+    EXECUTE PROCEDURE actor.stat_cat_check();
+
+CREATE TABLE asset.stat_cat_sip_fields (
+    field   CHAR(2) PRIMARY KEY,
+    name    TEXT    NOT NULL,
+    one_only BOOL    NOT NULL DEFAULT FALSE
+);
+COMMENT ON TABLE asset.stat_cat_sip_fields IS $$
+Asset Statistical Category SIP Fields
+
+Contains the list of valid SIP Field identifiers for
+Statistical Categories.
+$$;
+
+ALTER TABLE asset.stat_cat
+    ADD COLUMN sip_field   CHAR(2) REFERENCES asset.stat_cat_sip_fields(field) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN sip_format  TEXT;
+
+CREATE FUNCTION asset.stat_cat_check() RETURNS trigger AS $func$
+DECLARE
+    sipfield asset.stat_cat_sip_fields%ROWTYPE;
+    use_count INT;
+BEGIN
+    IF NEW.sip_field IS NOT NULL THEN
+        SELECT INTO sipfield * FROM asset.stat_cat_sip_fields WHERE field = NEW.sip_field;
+        IF sipfield.one_only THEN
+            SELECT INTO use_count count(id) FROM asset.stat_cat WHERE sip_field = NEW.sip_field AND id != NEW.id;
+            IF use_count > 0 THEN
+                RAISE EXCEPTION 'Sip field cannot be used twice';
+            END IF;
+        END IF;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER asset_stat_cat_sip_update_trigger
+    BEFORE INSERT OR UPDATE ON asset.stat_cat FOR EACH ROW
+    EXECUTE PROCEDURE asset.stat_cat_check();
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0548', :eg_version); -- dbwells
+
+\qecho This redoes the original part 1 of 0547 which did not apply to rel_2_1,
+\qecho and is being added for the sake of clarity
+
+-- delete errant inserts from 0545 (group 4 is NOT the circulation admin group)
+DELETE FROM permission.grp_perm_map WHERE grp = 4 AND perm IN (
+       SELECT id FROM permission.perm_list
+       WHERE code in ('ABORT_TRANSIT_ON_LOST', 'ABORT_TRANSIT_ON_MISSING')
+);
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'Consortium' AND
+               perm.code IN (
+                       'ABORT_TRANSIT_ON_LOST',
+                       'ABORT_TRANSIT_ON_MISSING'
+               ) AND NOT EXISTS (
+                       SELECT 1
+                       FROM permission.grp_perm_map AS map
+                       WHERE
+                               map.grp = pgt.id
+                               AND map.perm = perm.id
+               );
+
+-- Evergreen DB patch XXXX.data.transit-checkin-interval.sql
+--
+-- New org unit setting "circ.transit.min_checkin_interval"
+-- New TRANSIT_CHECKIN_INTERVAL_BLOCK.override permission
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0549', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+    'circ.transit.min_checkin_interval',
+    oils_i18n_gettext( 
+        'circ.transit.min_checkin_interval', 
+        'Circ:  Minimum Transit Checkin Interval',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext( 
+        'circ.transit.min_checkin_interval', 
+        'In-Transit items checked in this close to the transit start time will be prevented from checking in',
+        'coust',
+        'label'
+    ),
+    'interval'
+);
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES (  
+    509, 
+    'TRANSIT_CHECKIN_INTERVAL_BLOCK.override', 
+    oils_i18n_gettext(
+        509,
+        'Allows a user to override the TRANSIT_CHECKIN_INTERVAL_BLOCK event', 
+        'ppl', 
+        'description'
+    )
+);
+
+-- add the perm to the default circ admin group
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+       SELECT
+               pgt.id, perm.id, aout.depth, TRUE
+       FROM
+               permission.grp_tree pgt,
+               permission.perm_list perm,
+               actor.org_unit_type aout
+       WHERE
+               pgt.name = 'Circulation Administrator' AND
+               aout.name = 'System' AND
+               perm.code IN ( 'TRANSIT_CHECKIN_INTERVAL_BLOCK.override' );
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0550', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+    'org.patron_opt_boundary',
+    oils_i18n_gettext( 
+        'org.patron_opt_boundary',
+        'Circ: Patron Opt-In Boundary',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext( 
+        'org.patron_opt_boundary',
+        'This determines at which depth above which patrons must be opted in, and below which patrons will be assumed to be opted in.',
+        'coust',
+        'label'
+    ),
+    'integer'
+);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+    'org.patron_opt_default',
+    oils_i18n_gettext( 
+        'org.patron_opt_default',
+        'Circ: Patron Opt-In Default',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext( 
+        'org.patron_opt_default',
+        'This is the default depth at which a patron is opted in; it is calculated as an org unit relative to the current workstation.',
+        'coust',
+        'label'
+    ),
+    'integer'
+);
+
+-- Evergreen DB patch 0562.schema.copy_active_date.sql
+--
+-- Active Date
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0562', :eg_version);
+
+ALTER TABLE asset.copy
+    ADD COLUMN active_date TIMESTAMP WITH TIME ZONE;
+
+ALTER TABLE auditor.asset_copy_history
+    ADD COLUMN active_date TIMESTAMP WITH TIME ZONE;
+
+ALTER TABLE auditor.serial_unit_history
+    ADD COLUMN active_date TIMESTAMP WITH TIME ZONE;
+
+ALTER TABLE config.copy_status
+    ADD COLUMN copy_active BOOL NOT NULL DEFAULT FALSE;
+
+ALTER TABLE config.circ_matrix_weights
+    ADD COLUMN item_age NUMERIC(6,2) NOT NULL DEFAULT 0.0;
+
+ALTER TABLE config.hold_matrix_weights
+    ADD COLUMN item_age NUMERIC(6,2) NOT NULL DEFAULT 0.0;
+
+-- The two defaults above were to stop erroring on NOT NULL
+-- Remove them here
+ALTER TABLE config.circ_matrix_weights
+    ALTER COLUMN item_age DROP DEFAULT;
+
+ALTER TABLE config.hold_matrix_weights
+    ALTER COLUMN item_age DROP DEFAULT;
+
+ALTER TABLE config.circ_matrix_matchpoint
+    ADD COLUMN item_age INTERVAL;
+
+ALTER TABLE config.hold_matrix_matchpoint
+    ADD COLUMN item_age INTERVAL;
+
+CREATE OR REPLACE FUNCTION asset.acp_status_changed()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF NEW.status <> OLD.status THEN
+        NEW.status_changed_time := now();
+        IF NEW.active_date IS NULL AND NEW.status IN (SELECT id FROM config.copy_status WHERE copy_active = true) THEN
+            NEW.active_date := now();
+        END IF;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION asset.acp_created()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF NEW.active_date IS NULL AND NEW.status IN (SELECT id FROM config.copy_status WHERE copy_active = true) THEN
+        NEW.active_date := now();
+    END IF;
+    IF NEW.status_changed_time IS NULL THEN
+        NEW.status_changed_time := now();
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER acp_created_trig
+    BEFORE INSERT ON asset.copy
+    FOR EACH ROW EXECUTE PROCEDURE asset.acp_created();
+
+CREATE TRIGGER sunit_created_trig
+    BEFORE INSERT ON serial.unit
+    FOR EACH ROW EXECUTE PROCEDURE asset.acp_created();
+
+CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
+DECLARE
+    matchpoint_id        INT;
+    user_object        actor.usr%ROWTYPE;
+    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
+    standing_penalty    config.standing_penalty%ROWTYPE;
+    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
+    transit_source        actor.org_unit%ROWTYPE;
+    item_object        asset.copy%ROWTYPE;
+    item_cn_object     asset.call_number%ROWTYPE;
+    ou_skip              actor.org_unit_setting%ROWTYPE;
+    result            action.matrix_test_result;
+    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
+    use_active_date   TEXT;
+    age_protect_date  TIMESTAMP WITH TIME ZONE;
+    hold_count        INT;
+    hold_transit_prox    INT;
+    frozen_hold_count    INT;
+    context_org_list    INT[];
+    done            BOOL := FALSE;
+BEGIN
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
+
+    result.success := TRUE;
+
+    -- Fail if we couldn't find a user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
+
+    -- Fail if we couldn't find a copy
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
+    result.matchpoint := matchpoint_id;
+
+    SELECT INTO ou_skip * FROM actor.org_unit_setting WHERE name = 'circ.holds.target_skip_me' AND org_unit = item_object.circ_lib;
+
+    -- Fail if the circ_lib for the item has circ.holds.target_skip_me set to true
+    IF ou_skip.id IS NOT NULL AND ou_skip.value = 'true' THEN
+        result.fail_part := 'circ.holds.target_skip_me';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if we couldn't find any matchpoint (requires a default)
+    IF matchpoint_id IS NULL THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
+
+    IF hold_test.holdable IS FALSE THEN
+        result.fail_part := 'config.hold_matrix_test.holdable';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    IF hold_test.transit_range IS NOT NULL THEN
+        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
+        ELSE
+            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
+        END IF;
+
+        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
+
+        IF NOT FOUND THEN
+            result.fail_part := 'transit_range';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM explode_array(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE '%HOLD%' LOOP
+
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
+
+    IF hold_test.stop_blocked_user IS TRUE THEN
+        FOR standing_penalty IN
+            SELECT  DISTINCT csp.*
+              FROM  actor.usr_standing_penalty usp
+                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+              WHERE usr = match_user
+                    AND usp.org_unit IN ( SELECT * FROM explode_array(context_org_list) )
+                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                    AND csp.block_list LIKE '%CIRC%' LOOP
+    
+            result.fail_part := standing_penalty.name;
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END LOOP;
+    END IF;
+
+    IF hold_test.max_holds IS NOT NULL AND NOT retargetting THEN
+        SELECT    INTO hold_count COUNT(*)
+          FROM    action.hold_request
+          WHERE    usr = match_user
+            AND fulfillment_time IS NULL
+            AND cancel_time IS NULL
+            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
+
+        IF hold_count >= hold_test.max_holds THEN
+            result.fail_part := 'config.hold_matrix_test.max_holds';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    IF item_object.age_protect IS NOT NULL THEN
+        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO use_active_date value FROM actor.org_unit_ancestor_setting('circ.holds.age_protect.active_date', item_cn_object.owning_lib);
+        ELSE
+            SELECT INTO use_active_date value FROM actor.org_unit_ancestor_setting('circ.holds.age_protect.active_date', item_object.circ_lib);
+        END IF;
+        IF use_active_date = 'true' THEN
+            age_protect_date := COALESCE(item_object.active_date, NOW());
+        ELSE
+            age_protect_date := item_object.create_date;
+        END IF;
+        IF age_protect_date + age_protect_object.age > NOW() THEN
+            IF hold_test.distance_is_from_owner THEN
+                SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
+            ELSE
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
+            END IF;
+
+            IF hold_transit_prox > age_protect_object.prox THEN
+                result.fail_part := 'config.rule_age_hold_protect.prox';
+                result.success := FALSE;
+                done := TRUE;
+                RETURN NEXT result;
+            END IF;
+        END IF;
+    END IF;
+
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, item_object asset.copy, user_object actor.usr, renewal BOOL ) RETURNS action.found_circ_matrix_matchpoint AS $func$
+DECLARE
+    cn_object       asset.call_number%ROWTYPE;
+    rec_descriptor  metabib.rec_descriptor%ROWTYPE;
+    cur_matchpoint  config.circ_matrix_matchpoint%ROWTYPE;
+    matchpoint      config.circ_matrix_matchpoint%ROWTYPE;
+    weights         config.circ_matrix_weights%ROWTYPE;
+    user_age        INTERVAL;
+    my_item_age     INTERVAL;
+    denominator     NUMERIC(6,2);
+    row_list        INT[];
+    result          action.found_circ_matrix_matchpoint;
+BEGIN
+    -- Assume failure
+    result.success = false;
+
+    -- Fetch useful data
+    SELECT INTO cn_object       * FROM asset.call_number        WHERE id = item_object.call_number;
+    SELECT INTO rec_descriptor  * FROM metabib.rec_descriptor   WHERE record = cn_object.record;
+
+    -- Pre-generate this so we only calc it once
+    IF user_object.dob IS NOT NULL THEN
+        SELECT INTO user_age age(user_object.dob);
+    END IF;
+
+    -- Ditto
+    SELECT INTO my_item_age age(coalesce(item_object.active_date, now()));
+
+    -- Grab the closest set circ weight setting.
+    SELECT INTO weights cw.*
+      FROM config.weight_assoc wa
+           JOIN config.circ_matrix_weights cw ON (cw.id = wa.circ_weights)
+           JOIN actor.org_unit_ancestors_distance( context_ou ) d ON (wa.org_unit = d.id)
+      WHERE active
+      ORDER BY d.distance
+      LIMIT 1;
+
+    -- No weights? Bad admin! Defaults to handle that anyway.
+    IF weights.id IS NULL THEN
+        weights.grp                 := 11.0;
+        weights.org_unit            := 10.0;
+        weights.circ_modifier       := 5.0;
+        weights.marc_type           := 4.0;
+        weights.marc_form           := 3.0;
+        weights.marc_bib_level      := 2.0;
+        weights.marc_vr_format      := 2.0;
+        weights.copy_circ_lib       := 8.0;
+        weights.copy_owning_lib     := 8.0;
+        weights.user_home_ou        := 8.0;
+        weights.ref_flag            := 1.0;
+        weights.juvenile_flag       := 6.0;
+        weights.is_renewal          := 7.0;
+        weights.usr_age_lower_bound := 0.0;
+        weights.usr_age_upper_bound := 0.0;
+        weights.item_age            := 0.0;
+    END IF;
+
+    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
+    -- If you break your org tree with funky parenting this may be wrong
+    -- Note: This CTE is duplicated in the find_hold_matrix_matchpoint function, and it may be a good idea to split it off to a function
+    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
+    WITH all_distance(distance) AS (
+            SELECT depth AS distance FROM actor.org_unit_type
+        UNION
+                   SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
+       )
+    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+
+    -- Loop over all the potential matchpoints
+    FOR cur_matchpoint IN
+        SELECT m.*
+          FROM  config.circ_matrix_matchpoint m
+                /*LEFT*/ JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.grp = upgad.id
+                /*LEFT*/ JOIN actor.org_unit_ancestors_distance( context_ou ) ctoua ON m.org_unit = ctoua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( cn_object.owning_lib ) cnoua ON m.copy_owning_lib = cnoua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.copy_circ_lib = iooua.id
+                LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
+          WHERE m.active
+                -- Permission Groups
+             -- AND (m.grp                      IS NULL OR upgad.id IS NOT NULL) -- Optional Permission Group?
+                -- Org Units
+             -- AND (m.org_unit                 IS NULL OR ctoua.id IS NOT NULL) -- Optional Org Unit?
+                AND (m.copy_owning_lib          IS NULL OR cnoua.id IS NOT NULL)
+                AND (m.copy_circ_lib            IS NULL OR iooua.id IS NOT NULL)
+                AND (m.user_home_ou             IS NULL OR uhoua.id IS NOT NULL)
+                -- Circ Type
+                AND (m.is_renewal               IS NULL OR m.is_renewal = renewal)
+                -- Static User Checks
+                AND (m.juvenile_flag            IS NULL OR m.juvenile_flag = user_object.juvenile)
+                AND (m.usr_age_lower_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_lower_bound < user_age))
+                AND (m.usr_age_upper_bound      IS NULL OR (user_age IS NOT NULL AND m.usr_age_upper_bound > user_age))
+                -- Static Item Checks
+                AND (m.circ_modifier            IS NULL OR m.circ_modifier = item_object.circ_modifier)
+                AND (m.marc_type                IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
+                AND (m.marc_form                IS NULL OR m.marc_form = rec_descriptor.item_form)
+                AND (m.marc_bib_level           IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
+                AND (m.marc_vr_format           IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
+                AND (m.ref_flag                 IS NULL OR m.ref_flag = item_object.ref)
+                AND (m.item_age                 IS NULL OR (my_item_age IS NOT NULL AND m.item_age > my_item_age))
+          ORDER BY
+                -- Permission Groups
+                CASE WHEN upgad.distance        IS NOT NULL THEN 2^(2*weights.grp - (upgad.distance/denominator)) ELSE 0.0 END +
+                -- Org Units
+                CASE WHEN ctoua.distance        IS NOT NULL THEN 2^(2*weights.org_unit - (ctoua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN cnoua.distance        IS NOT NULL THEN 2^(2*weights.copy_owning_lib - (cnoua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN iooua.distance        IS NOT NULL THEN 2^(2*weights.copy_circ_lib - (iooua.distance/denominator)) ELSE 0.0 END +
+                CASE WHEN uhoua.distance        IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
+                -- Circ Type                    -- Note: 4^x is equiv to 2^(2*x)
+                CASE WHEN m.is_renewal          IS NOT NULL THEN 4^weights.is_renewal ELSE 0.0 END +
+                -- Static User Checks
+                CASE WHEN m.juvenile_flag       IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
+                CASE WHEN m.usr_age_lower_bound IS NOT NULL THEN 4^weights.usr_age_lower_bound ELSE 0.0 END +
+                CASE WHEN m.usr_age_upper_bound IS NOT NULL THEN 4^weights.usr_age_upper_bound ELSE 0.0 END +
+                -- Static Item Checks
+                CASE WHEN m.circ_modifier       IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
+                CASE WHEN m.marc_type           IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
+                CASE WHEN m.marc_form           IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
+                CASE WHEN m.marc_vr_format      IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
+                CASE WHEN m.ref_flag            IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END +
+                -- Item age has a slight adjustment to weight based on value.
+                -- This should ensure that a shorter age limit comes first when all else is equal.
+                -- NOTE: This assumes that intervals will normally be in days.
+                CASE WHEN m.item_age            IS NOT NULL THEN 4^weights.item_age - 1 + 86400/EXTRACT(EPOCH FROM m.item_age) ELSE 0.0 END DESC,
+                -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
+                -- This prevents "we changed the table order by updating a rule, and we started getting different results"
+                m.id LOOP
+
+        -- Record the full matching row list
+        row_list := row_list || cur_matchpoint.id;
+
+        -- No matchpoint yet?
+        IF matchpoint.id IS NULL THEN
+            -- Take the entire matchpoint as a starting point
+            matchpoint := cur_matchpoint;
+            CONTINUE; -- No need to look at this row any more.
+        END IF;
+
+        -- Incomplete matchpoint?
+        IF matchpoint.circulate IS NULL THEN
+            matchpoint.circulate := cur_matchpoint.circulate;
+        END IF;
+        IF matchpoint.duration_rule IS NULL THEN
+            matchpoint.duration_rule := cur_matchpoint.duration_rule;
+        END IF;
+        IF matchpoint.recurring_fine_rule IS NULL THEN
+            matchpoint.recurring_fine_rule := cur_matchpoint.recurring_fine_rule;
+        END IF;
+        IF matchpoint.max_fine_rule IS NULL THEN
+            matchpoint.max_fine_rule := cur_matchpoint.max_fine_rule;
+        END IF;
+        IF matchpoint.hard_due_date IS NULL THEN
+            matchpoint.hard_due_date := cur_matchpoint.hard_due_date;
+        END IF;
+        IF matchpoint.total_copy_hold_ratio IS NULL THEN
+            matchpoint.total_copy_hold_ratio := cur_matchpoint.total_copy_hold_ratio;
+        END IF;
+        IF matchpoint.available_copy_hold_ratio IS NULL THEN
+            matchpoint.available_copy_hold_ratio := cur_matchpoint.available_copy_hold_ratio;
+        END IF;
+        IF matchpoint.renewals IS NULL THEN
+            matchpoint.renewals := cur_matchpoint.renewals;
+        END IF;
+        IF matchpoint.grace_period IS NULL THEN
+            matchpoint.grace_period := cur_matchpoint.grace_period;
+        END IF;
+    END LOOP;
+
+    -- Check required fields
+    IF matchpoint.circulate             IS NOT NULL AND
+       matchpoint.duration_rule         IS NOT NULL AND
+       matchpoint.recurring_fine_rule   IS NOT NULL AND
+       matchpoint.max_fine_rule         IS NOT NULL THEN
+        -- All there? We have a completed match.
+        result.success := true;
+    END IF;
+
+    -- Include the assembled matchpoint, even if it isn't complete
+    result.matchpoint := matchpoint;
+
+    -- Include (for debugging) the full list of matching rows
+    result.buildrows := row_list;
+
+    -- Hand the result back to caller
+    RETURN result;
+END;
+$func$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION action.find_hold_matrix_matchpoint(pickup_ou integer, request_ou integer, match_item bigint, match_user integer, match_requestor integer)
+  RETURNS integer AS
+$func$
+DECLARE
+    requestor_object    actor.usr%ROWTYPE;
+    user_object         actor.usr%ROWTYPE;
+    item_object         asset.copy%ROWTYPE;
+    item_cn_object      asset.call_number%ROWTYPE;
+    my_item_age         INTERVAL;
+    rec_descriptor      metabib.rec_descriptor%ROWTYPE;
+    matchpoint          config.hold_matrix_matchpoint%ROWTYPE;
+    weights             config.hold_matrix_weights%ROWTYPE;
+    denominator         NUMERIC(6,2);
+BEGIN
+    SELECT INTO user_object         * FROM actor.usr                WHERE id = match_user;
+    SELECT INTO requestor_object    * FROM actor.usr                WHERE id = match_requestor;
+    SELECT INTO item_object         * FROM asset.copy               WHERE id = match_item;
+    SELECT INTO item_cn_object      * FROM asset.call_number        WHERE id = item_object.call_number;
+    SELECT INTO rec_descriptor      * FROM metabib.rec_descriptor   WHERE record = item_cn_object.record;
+
+    SELECT INTO my_item_age age(coalesce(item_object.active_date, now()));
+
+    -- The item's owner should probably be the one determining if the item is holdable
+    -- How to decide that is debatable. Decided to default to the circ library (where the item lives)
+    -- This flag will allow for setting it to the owning library (where the call number "lives")
+    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.weight_owner_not_circ' AND enabled;
+
+    -- Grab the closest set circ weight setting.
+    IF NOT FOUND THEN
+        -- Default to circ library
+        SELECT INTO weights hw.*
+          FROM config.weight_assoc wa
+               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
+               JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) d ON (wa.org_unit = d.id)
+          WHERE active
+          ORDER BY d.distance
+          LIMIT 1;
+    ELSE
+        -- Flag is set, use owning library
+        SELECT INTO weights hw.*
+          FROM config.weight_assoc wa
+               JOIN config.hold_matrix_weights hw ON (hw.id = wa.hold_weights)
+               JOIN actor.org_unit_ancestors_distance( item_cn_object.owning_lib ) d ON (wa.org_unit = d.id)
+          WHERE active
+          ORDER BY d.distance
+          LIMIT 1;
+    END IF;
+
+    -- No weights? Bad admin! Defaults to handle that anyway.
+    IF weights.id IS NULL THEN
+        weights.user_home_ou    := 5.0;
+        weights.request_ou      := 5.0;
+        weights.pickup_ou       := 5.0;
+        weights.item_owning_ou  := 5.0;
+        weights.item_circ_ou    := 5.0;
+        weights.usr_grp         := 7.0;
+        weights.requestor_grp   := 8.0;
+        weights.circ_modifier   := 4.0;
+        weights.marc_type       := 3.0;
+        weights.marc_form       := 2.0;
+        weights.marc_bib_level  := 1.0;
+        weights.marc_vr_format  := 1.0;
+        weights.juvenile_flag   := 4.0;
+        weights.ref_flag        := 0.0;
+        weights.item_age        := 0.0;
+    END IF;
+
+    -- Determine the max (expected) depth (+1) of the org tree and max depth of the permisson tree
+    -- If you break your org tree with funky parenting this may be wrong
+    -- Note: This CTE is duplicated in the find_circ_matrix_matchpoint function, and it may be a good idea to split it off to a function
+    -- We use one denominator for all tree-based checks for when permission groups and org units have the same weighting
+    WITH all_distance(distance) AS (
+            SELECT depth AS distance FROM actor.org_unit_type
+        UNION
+            SELECT distance AS distance FROM permission.grp_ancestors_distance((SELECT id FROM permission.grp_tree WHERE parent IS NULL))
+       )
+    SELECT INTO denominator MAX(distance) + 1 FROM all_distance;
+
+    -- To ATTEMPT to make this work like it used to, make it reverse the user/requestor profile ids.
+    -- This may be better implemented as part of the upgrade script?
+    -- Set usr_grp = requestor_grp, requestor_grp = 1 or something when this flag is already set
+    -- Then remove this flag, of course.
+    PERFORM * FROM config.internal_flag WHERE name = 'circ.holds.usr_not_requestor' AND enabled;
+
+    IF FOUND THEN
+        -- Note: This, to me, is REALLY hacky. I put it in anyway.
+        -- If you can't tell, this is a single call swap on two variables.
+        SELECT INTO user_object.profile, requestor_object.profile
+                    requestor_object.profile, user_object.profile;
+    END IF;
+
+    -- Select the winning matchpoint into the matchpoint variable for returning
+    SELECT INTO matchpoint m.*
+      FROM  config.hold_matrix_matchpoint m
+            /*LEFT*/ JOIN permission.grp_ancestors_distance( requestor_object.profile ) rpgad ON m.requestor_grp = rpgad.id
+            LEFT JOIN permission.grp_ancestors_distance( user_object.profile ) upgad ON m.usr_grp = upgad.id
+            LEFT JOIN actor.org_unit_ancestors_distance( pickup_ou ) puoua ON m.pickup_ou = puoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( request_ou ) rqoua ON m.request_ou = rqoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( item_cn_object.owning_lib ) cnoua ON m.item_owning_ou = cnoua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( item_object.circ_lib ) iooua ON m.item_circ_ou = iooua.id
+            LEFT JOIN actor.org_unit_ancestors_distance( user_object.home_ou  ) uhoua ON m.user_home_ou = uhoua.id
+      WHERE m.active
+            -- Permission Groups
+         -- AND (m.requestor_grp        IS NULL OR upgad.id IS NOT NULL) -- Optional Requestor Group?
+            AND (m.usr_grp              IS NULL OR upgad.id IS NOT NULL)
+            -- Org Units
+            AND (m.pickup_ou            IS NULL OR (puoua.id IS NOT NULL AND (puoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.request_ou           IS NULL OR (rqoua.id IS NOT NULL AND (rqoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.item_owning_ou       IS NULL OR (cnoua.id IS NOT NULL AND (cnoua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.item_circ_ou         IS NULL OR (iooua.id IS NOT NULL AND (iooua.distance = 0 OR NOT m.strict_ou_match)))
+            AND (m.user_home_ou         IS NULL OR (uhoua.id IS NOT NULL AND (uhoua.distance = 0 OR NOT m.strict_ou_match)))
+            -- Static User Checks
+            AND (m.juvenile_flag        IS NULL OR m.juvenile_flag = user_object.juvenile)
+            -- Static Item Checks
+            AND (m.circ_modifier        IS NULL OR m.circ_modifier = item_object.circ_modifier)
+            AND (m.marc_type            IS NULL OR m.marc_type = COALESCE(item_object.circ_as_type, rec_descriptor.item_type))
+            AND (m.marc_form            IS NULL OR m.marc_form = rec_descriptor.item_form)
+            AND (m.marc_bib_level       IS NULL OR m.marc_bib_level = rec_descriptor.bib_level)
+            AND (m.marc_vr_format       IS NULL OR m.marc_vr_format = rec_descriptor.vr_format)
+            AND (m.ref_flag             IS NULL OR m.ref_flag = item_object.ref)
+            AND (m.item_age             IS NULL OR (my_item_age IS NOT NULL AND m.item_age > my_item_age))
+      ORDER BY
+            -- Permission Groups
+            CASE WHEN rpgad.distance    IS NOT NULL THEN 2^(2*weights.requestor_grp - (rpgad.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN upgad.distance    IS NOT NULL THEN 2^(2*weights.usr_grp - (upgad.distance/denominator)) ELSE 0.0 END +
+            -- Org Units
+            CASE WHEN puoua.distance    IS NOT NULL THEN 2^(2*weights.pickup_ou - (puoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN rqoua.distance    IS NOT NULL THEN 2^(2*weights.request_ou - (rqoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN cnoua.distance    IS NOT NULL THEN 2^(2*weights.item_owning_ou - (cnoua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN iooua.distance    IS NOT NULL THEN 2^(2*weights.item_circ_ou - (iooua.distance/denominator)) ELSE 0.0 END +
+            CASE WHEN uhoua.distance    IS NOT NULL THEN 2^(2*weights.user_home_ou - (uhoua.distance/denominator)) ELSE 0.0 END +
+            -- Static User Checks       -- Note: 4^x is equiv to 2^(2*x)
+            CASE WHEN m.juvenile_flag   IS NOT NULL THEN 4^weights.juvenile_flag ELSE 0.0 END +
+            -- Static Item Checks
+            CASE WHEN m.circ_modifier   IS NOT NULL THEN 4^weights.circ_modifier ELSE 0.0 END +
+            CASE WHEN m.marc_type       IS NOT NULL THEN 4^weights.marc_type ELSE 0.0 END +
+            CASE WHEN m.marc_form       IS NOT NULL THEN 4^weights.marc_form ELSE 0.0 END +
+            CASE WHEN m.marc_vr_format  IS NOT NULL THEN 4^weights.marc_vr_format ELSE 0.0 END +
+            CASE WHEN m.ref_flag        IS NOT NULL THEN 4^weights.ref_flag ELSE 0.0 END +
+            -- Item age has a slight adjustment to weight based on value.
+            -- This should ensure that a shorter age limit comes first when all else is equal.
+            -- NOTE: This assumes that intervals will normally be in days.
+            CASE WHEN m.item_age            IS NOT NULL THEN 4^weights.item_age - 86400/EXTRACT(EPOCH FROM m.item_age) ELSE 0.0 END DESC,
+            -- Final sort on id, so that if two rules have the same sorting in the previous sort they have a defined order
+            -- This prevents "we changed the table order by updating a rule, and we started getting different results"
+            m.id;
+
+    -- Return just the ID for now
+    RETURN matchpoint.id;
+END;
+$func$ LANGUAGE 'plpgsql';
+
+DROP INDEX IF EXISTS config.ccmm_once_per_paramset;
+
+DROP INDEX IF EXISTS config.chmm_once_per_paramset;
+
+CREATE UNIQUE INDEX ccmm_once_per_paramset ON config.circ_matrix_matchpoint (org_unit, grp, COALESCE(circ_modifier, ''), COALESCE(marc_type, ''), COALESCE(marc_form, ''), COALESCE(marc_bib_level,''), COALESCE(marc_vr_format, ''), COALESCE(copy_circ_lib::TEXT, ''), COALESCE(copy_owning_lib::TEXT, ''), COALESCE(user_home_ou::TEXT, ''), COALESCE(ref_flag::TEXT, ''), COALESCE(juvenile_flag::TEXT, ''), COALESCE(is_renewal::TEXT, ''), COALESCE(usr_age_lower_bound::TEXT, ''), COALESCE(usr_age_upper_bound::TEXT, ''), COALESCE(item_age::TEXT, '')) WHERE active;
+
+CREATE UNIQUE INDEX chmm_once_per_paramset ON config.hold_matrix_matchpoint (COALESCE(user_home_ou::TEXT, ''), COALESCE(request_ou::TEXT, ''), COALESCE(pickup_ou::TEXT, ''), COALESCE(item_owning_ou::TEXT, ''), COALESCE(item_circ_ou::TEXT, ''), COALESCE(usr_grp::TEXT, ''), COALESCE(requestor_grp::TEXT, ''), COALESCE(circ_modifier, ''), COALESCE(marc_type, ''), COALESCE(marc_form, ''), COALESCE(marc_bib_level, ''), COALESCE(marc_vr_format, ''), COALESCE(juvenile_flag::TEXT, ''), COALESCE(ref_flag::TEXT, ''), COALESCE(item_age::TEXT, '')) WHERE active;
+
+UPDATE config.copy_status SET copy_active = true WHERE id IN (0, 1, 7, 8, 10, 12, 15);
+
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype ) VALUES
+( 'circ.holds.age_protect.active_date', 'Holds: Use Active Date for Age Protection', 'When calculating age protection rules use the active date instead of the creation date.', 'bool');
+
+-- Assume create date when item is in status we would update active date for anyway
+UPDATE asset.copy SET active_date = create_date WHERE status IN (SELECT id FROM config.copy_status WHERE copy_active = true);
+
+-- Assume create date for any item with circs
+UPDATE asset.copy SET active_date = create_date WHERE id IN (SELECT id FROM extend_reporter.full_circ_count WHERE circ_count > 0);
+
+-- Assume create date for status change time while we are at it. Because being created WAS a change in status.
+UPDATE asset.copy SET status_changed_time = create_date WHERE status_changed_time IS NULL;
+
+-- Evergreen DB patch 0564.data.delete_empty_volume.sql
+--
+-- New org setting cat.volume.delete_on_empty
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0564', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) 
+    VALUES ( 
+        'cat.volume.delete_on_empty',
+        oils_i18n_gettext('cat.volume.delete_on_empty', 'Cat: Delete volume with last copy', 'coust', 'label'),
+        oils_i18n_gettext('cat.volume.delete_on_empty', 'Automatically delete a volume when the last linked copy is deleted', 'coust', 'description'),
+        'bool'
+    );
+
+
+-- Evergreen DB patch 0565.schema.action-trigger.event_definition.hold-cancel-no-target-notification.sql
+--
+-- New action trigger event definition: Hold Cancelled (No Target) Email Notification
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0565', :eg_version);
+
+INSERT INTO action_trigger.event_definition (id, active, owner, name, hook, validator, reactor, delay, delay_field, group_field, template)
+    VALUES (38, FALSE, 1, 
+        'Hold Cancelled (No Target) Email Notification', 
+        'hold_request.cancel.expire_no_target', 
+        'HoldIsCancelled', 'SendEmail', '30 minutes', 'cancel_time', 'usr',
+$$
+[%- USE date -%]
+[%- user = target.0.usr -%]
+To: [%- params.recipient_email || user.email %]
+From: [%- params.sender_email || default_sender %]
+Subject: Hold Request Cancelled
+
+Dear [% user.family_name %], [% user.first_given_name %]
+The following holds were cancelled because no items were found to fullfil the hold.
+
+[% FOR hold IN target %]
+    Title: [% hold.bib_rec.bib_record.simple_record.title %]
+    Author: [% hold.bib_rec.bib_record.simple_record.author %]
+    Library: [% hold.pickup_lib.name %]
+    Request Date: [% date.format(helpers.format_date(hold.rrequest_time), '%Y-%m-%d') %]
+[% END %]
+
+$$);
+
+INSERT INTO action_trigger.environment (event_def, path) VALUES
+    (38, 'usr'),
+    (38, 'pickup_lib'),
+    (38, 'bib_rec.bib_record.simple_record');
+
+-- Evergreen DB patch XXXX.data.ou_setting_generate_overdue_on_lost.sql.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0567', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+    'circ.lost.generate_overdue_on_checkin',
+    oils_i18n_gettext( 
+        'circ.lost.generate_overdue_on_checkin',
+        'Circ:  Lost Checkin Generates New Overdues',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext( 
+        'circ.lost.generate_overdue_on_checkin',
+        'Enabling this setting causes retroactive creation of not-yet-existing overdue fines on lost item checkin, up to the point of checkin time (or max fines is reached).  This is different than "restore overdue on lost", because it only creates new overdue fines.  Use both settings together to get the full complement of overdue fines for a lost item',
+        'coust',
+        'label'
+    ),
+    'bool'
+);
+
+-- Evergreen DB patch 0572.vandelay-record-matching-and-quality.sql
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0572', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.array_remove_item_by_value(inp ANYARRAY, el ANYELEMENT) RETURNS anyarray AS $$ SELECT ARRAY_ACCUM(x.e) FROM UNNEST( $1 ) x(e) WHERE x.e <> $2; $$ LANGUAGE SQL;
+
+CREATE TABLE vandelay.match_set (
+    id      SERIAL  PRIMARY KEY,
+    name    TEXT        NOT NULL,
+    owner   INT     NOT NULL REFERENCES actor.org_unit (id) ON DELETE CASCADE,
+    mtype   TEXT        NOT NULL DEFAULT 'biblio', -- 'biblio','authority','mfhd'?, others?
+    CONSTRAINT name_once_per_owner_mtype UNIQUE (name, owner, mtype)
+);
+
+-- Table to define match points, either FF via SVF or tag+subfield
+CREATE TABLE vandelay.match_set_point (
+    id          SERIAL  PRIMARY KEY,
+    match_set   INT     REFERENCES vandelay.match_set (id) ON DELETE CASCADE,
+    parent      INT     REFERENCES vandelay.match_set_point (id),
+    bool_op     TEXT    CHECK (bool_op IS NULL OR (bool_op IN ('AND','OR','NOT'))),
+    svf         TEXT    REFERENCES config.record_attr_definition (name),
+    tag         TEXT,
+    subfield    TEXT,
+    negate      BOOL    DEFAULT FALSE,
+    quality     INT     NOT NULL DEFAULT 1, -- higher is better
+    CONSTRAINT vmsp_need_a_subfield_with_a_tag CHECK ((tag IS NOT NULL AND subfield IS NOT NULL) OR tag IS NULL),
+    CONSTRAINT vmsp_need_a_tag_or_a_ff_or_a_bo CHECK (
+        (tag IS NOT NULL AND svf IS NULL AND bool_op IS NULL) OR
+        (tag IS NULL AND svf IS NOT NULL AND bool_op IS NULL) OR
+        (tag IS NULL AND svf IS NULL AND bool_op IS NOT NULL)
+    )
+);
+
+CREATE TABLE vandelay.match_set_quality (
+    id          SERIAL  PRIMARY KEY,
+    match_set   INT     NOT NULL REFERENCES vandelay.match_set (id) ON DELETE CASCADE,
+    svf         TEXT    REFERENCES config.record_attr_definition,
+    tag         TEXT,
+    subfield    TEXT,
+    value       TEXT    NOT NULL,
+    quality     INT     NOT NULL DEFAULT 1, -- higher is better
+    CONSTRAINT vmsq_need_a_subfield_with_a_tag CHECK ((tag IS NOT NULL AND subfield IS NOT NULL) OR tag IS NULL),
+    CONSTRAINT vmsq_need_a_tag_or_a_ff CHECK ((tag IS NOT NULL AND svf IS NULL) OR (tag IS NULL AND svf IS NOT NULL))
+);
+CREATE UNIQUE INDEX vmsq_def_once_per_set ON vandelay.match_set_quality (match_set, COALESCE(tag,''), COALESCE(subfield,''), COALESCE(svf,''), value);
+
+
+-- ALTER TABLEs...
+ALTER TABLE vandelay.queue ADD COLUMN match_set INT REFERENCES vandelay.match_set (id) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vandelay.queued_record ADD COLUMN quality INT NOT NULL DEFAULT 0;
+ALTER TABLE vandelay.bib_attr_definition DROP COLUMN ident;
+
+CREATE TABLE vandelay.import_error (
+    code        TEXT    PRIMARY KEY,
+    description TEXT    NOT NULL -- i18n
+);
+
+ALTER TABLE vandelay.queued_bib_record
+    ADD COLUMN import_error TEXT REFERENCES vandelay.import_error (code) ON DELETE SET NULL ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN error_detail TEXT;
+
+ALTER TABLE vandelay.bib_match
+    DROP COLUMN field_type,
+    DROP COLUMN matched_attr,
+    ADD COLUMN quality INT NOT NULL DEFAULT 1,
+    ADD COLUMN match_score INT NOT NULL DEFAULT 0;
+
+ALTER TABLE vandelay.import_item
+    ADD COLUMN import_error TEXT REFERENCES vandelay.import_error (code) ON DELETE SET NULL ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN error_detail TEXT,
+    ADD COLUMN imported_as BIGINT REFERENCES asset.copy (id) DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN import_time TIMESTAMP WITH TIME ZONE;
+
+ALTER TABLE vandelay.merge_profile ADD COLUMN lwm_ratio NUMERIC;
+
+CREATE OR REPLACE FUNCTION vandelay.marc21_record_type( marc TEXT ) RETURNS config.marc21_rec_type_map AS $func$
+DECLARE
+    ldr         TEXT;
+    tval        TEXT;
+    tval_rec    RECORD;
+    bval        TEXT;
+    bval_rec    RECORD;
+    retval      config.marc21_rec_type_map%ROWTYPE;
+BEGIN
+    ldr := oils_xpath_string( '//*[local-name()="leader"]', marc );
+
+    IF ldr IS NULL OR ldr = '' THEN
+        SELECT * INTO retval FROM config.marc21_rec_type_map WHERE code = 'BKS';
+        RETURN retval;
+    END IF;
+
+    SELECT * INTO tval_rec FROM config.marc21_ff_pos_map WHERE fixed_field = 'Type' LIMIT 1; -- They're all the same
+    SELECT * INTO bval_rec FROM config.marc21_ff_pos_map WHERE fixed_field = 'BLvl' LIMIT 1; -- They're all the same
+
+
+    tval := SUBSTRING( ldr, tval_rec.start_pos + 1, tval_rec.length );
+    bval := SUBSTRING( ldr, bval_rec.start_pos + 1, bval_rec.length );
+
+    -- RAISE NOTICE 'type %, blvl %, ldr %', tval, bval, ldr;
+
+    SELECT * INTO retval FROM config.marc21_rec_type_map WHERE type_val LIKE '%' || tval || '%' AND blvl_val LIKE '%' || bval || '%';
+
+
+    IF retval.code IS NULL THEN
+        SELECT * INTO retval FROM config.marc21_rec_type_map WHERE code = 'BKS';
+    END IF;
+
+    RETURN retval;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field( marc TEXT, ff TEXT ) RETURNS TEXT AS $func$
+DECLARE
+    rtype       TEXT;
+    ff_pos      RECORD;
+    tag_data    RECORD;
+    val         TEXT;
+BEGIN
+    rtype := (vandelay.marc21_record_type( marc )).code;
+    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE fixed_field = ff AND rec_type = rtype ORDER BY tag DESC LOOP
+        IF ff_pos.tag = 'ldr' THEN
+            val := oils_xpath_string('//*[local-name()="leader"]', marc);
+            IF val IS NOT NULL THEN
+                val := SUBSTRING( val, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN val;
+            END IF;
+        ELSE
+            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
+                val := SUBSTRING( tag_data.value, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN val;
+            END LOOP;
+        END IF;
+        val := REPEAT( ff_pos.default_val, ff_pos.length );
+        RETURN val;
+    END LOOP;
+
+    RETURN NULL;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT ) RETURNS SETOF biblio.record_ff_map AS $func$
+DECLARE
+    tag_data    TEXT;
+    rtype       TEXT;
+    ff_pos      RECORD;
+    output      biblio.record_ff_map%ROWTYPE;
+BEGIN
+    rtype := (vandelay.marc21_record_type( marc )).code;
+
+    FOR ff_pos IN SELECT * FROM config.marc21_ff_pos_map WHERE rec_type = rtype ORDER BY tag DESC LOOP
+        output.ff_name  := ff_pos.fixed_field;
+        output.ff_value := NULL;
+
+        IF ff_pos.tag = 'ldr' THEN
+            output.ff_value := oils_xpath_string('//*[local-name()="leader"]', marc);
+            IF output.ff_value IS NOT NULL THEN
+                output.ff_value := SUBSTRING( output.ff_value, ff_pos.start_pos + 1, ff_pos.length );
+                RETURN NEXT output;
+                output.ff_value := NULL;
+            END IF;
+        ELSE
+            FOR tag_data IN SELECT value FROM UNNEST( oils_xpath( '//*[@tag="' || UPPER(ff_pos.tag) || '"]/text()', marc ) ) x(value) LOOP
+                output.ff_value := SUBSTRING( tag_data, ff_pos.start_pos + 1, ff_pos.length );
+                IF output.ff_value IS NULL THEN output.ff_value := REPEAT( ff_pos.default_val, ff_pos.length ); END IF;
+                RETURN NEXT output;
+                output.ff_value := NULL;
+            END LOOP;
+        END IF;
+    
+    END LOOP;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.marc21_physical_characteristics( marc TEXT) RETURNS SETOF biblio.marc21_physical_characteristics AS $func$
+DECLARE
+    rowid   INT := 0;
+    _007    TEXT;
+    ptype   config.marc21_physical_characteristic_type_map%ROWTYPE;
+    psf     config.marc21_physical_characteristic_subfield_map%ROWTYPE;
+    pval    config.marc21_physical_characteristic_value_map%ROWTYPE;
+    retval  biblio.marc21_physical_characteristics%ROWTYPE;
+BEGIN
+
+    _007 := oils_xpath_string( '//*[@tag="007"]', marc );
+
+    IF _007 IS NOT NULL AND _007 <> '' THEN
+        SELECT * INTO ptype FROM config.marc21_physical_characteristic_type_map WHERE ptype_key = SUBSTRING( _007, 1, 1 );
+
+        IF ptype.ptype_key IS NOT NULL THEN
+            FOR psf IN SELECT * FROM config.marc21_physical_characteristic_subfield_map WHERE ptype_key = ptype.ptype_key LOOP
+                SELECT * INTO pval FROM config.marc21_physical_characteristic_value_map WHERE ptype_subfield = psf.id AND value = SUBSTRING( _007, psf.start_pos + 1, psf.length );
+
+                IF pval.id IS NOT NULL THEN
+                    rowid := rowid + 1;
+                    retval.id := rowid;
+                    retval.ptype := ptype.ptype_key;
+                    retval.subfield := psf.id;
+                    retval.value := pval.id;
+                    RETURN NEXT retval;
+                END IF;
+
+            END LOOP;
+        END IF;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE TYPE vandelay.flat_marc AS ( tag CHAR(3), ind1 TEXT, ind2 TEXT, subfield TEXT, value TEXT );
+CREATE OR REPLACE FUNCTION vandelay.flay_marc ( TEXT ) RETURNS SETOF vandelay.flat_marc AS $func$
+
+use MARC::Record;
+use MARC::File::XML (BinaryEncoding => 'UTF-8');
+use MARC::Charset;
+use strict;
+
+MARC::Charset->assume_unicode(1);
+
+my $xml = shift;
+my $r = MARC::Record->new_from_xml( $xml );
+
+return_next( { tag => 'LDR', value => $r->leader } );
+
+for my $f ( $r->fields ) {
+    if ($f->is_control_field) {
+        return_next({ tag => $f->tag, value => $f->data });
+    } else {
+        for my $s ($f->subfields) {
+            return_next({
+                tag      => $f->tag,
+                ind1     => $f->indicator(1),
+                ind2     => $f->indicator(2),
+                subfield => $s->[0],
+                value    => $s->[1]
+            });
+
+            if ( $f->tag eq '245' and $s->[0] eq 'a' ) {
+                my $trim = $f->indicator(2) || 0;
+                return_next({
+                    tag      => 'tnf',
+                    ind1     => $f->indicator(1),
+                    ind2     => $f->indicator(2),
+                    subfield => 'a',
+                    value    => substr( $s->[1], $trim )
+                });
+            }
+        }
+    }
+}
+
+return undef;
+
+$func$ LANGUAGE PLPERLU;
+
+CREATE OR REPLACE FUNCTION vandelay.flatten_marc ( marc TEXT ) RETURNS SETOF vandelay.flat_marc AS $func$
+DECLARE
+    output  vandelay.flat_marc%ROWTYPE;
+    field   RECORD;
+BEGIN
+    FOR field IN SELECT * FROM vandelay.flay_marc( marc ) LOOP
+        output.ind1 := field.ind1;
+        output.ind2 := field.ind2;
+        output.tag := field.tag;
+        output.subfield := field.subfield;
+        IF field.subfield IS NOT NULL AND field.tag NOT IN ('020','022','024') THEN -- exclude standard numbers and control fields
+            output.value := naco_normalize(field.value, field.subfield);
+        ELSE
+            output.value := field.value;
+        END IF;
+
+        CONTINUE WHEN output.value IS NULL;
+
+        RETURN NEXT output;
+    END LOOP;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.extract_rec_attrs ( xml TEXT, attr_defs TEXT[]) RETURNS hstore AS $_$
+DECLARE
+    transformed_xml TEXT;
+    prev_xfrm       TEXT;
+    normalizer      RECORD;
+    xfrm            config.xml_transform%ROWTYPE;
+    attr_value      TEXT;
+    new_attrs       HSTORE := ''::HSTORE;
+    attr_def        config.record_attr_definition%ROWTYPE;
+BEGIN
+
+    FOR attr_def IN SELECT * FROM config.record_attr_definition WHERE name IN (SELECT * FROM UNNEST(attr_defs)) ORDER BY format LOOP
+
+        IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
+            SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(x.value), COALESCE(attr_def.joiner,' ')) INTO attr_value
+              FROM  vandelay.flatten_marc(xml) AS x
+              WHERE x.tag LIKE attr_def.tag
+                    AND CASE
+                        WHEN attr_def.sf_list IS NOT NULL
+                            THEN POSITION(x.subfield IN attr_def.sf_list) > 0
+                        ELSE TRUE
+                        END
+              GROUP BY x.tag
+              ORDER BY x.tag
+              LIMIT 1;
+
+        ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
+            attr_value := vandelay.marc21_extract_fixed_field(xml, attr_def.fixed_field);
+
+        ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+
+            SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
+
+            -- See if we can skip the XSLT ... it's expensive
+            IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+                -- Can't skip the transform
+                IF xfrm.xslt <> '---' THEN
+                    transformed_xml := oils_xslt_process(xml,xfrm.xslt);
+                ELSE
+                    transformed_xml := xml;
+                END IF;
+
+                prev_xfrm := xfrm.name;
+            END IF;
+
+            IF xfrm.name IS NULL THEN
+                -- just grab the marcxml (empty) transform
+                SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
+                prev_xfrm := xfrm.name;
+            END IF;
+
+            attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
+
+        ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
+            SELECT  m.value::TEXT INTO attr_value
+              FROM  vandelay.marc21_physical_characteristics(xml) v
+                    JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value)
+              WHERE v.subfield = attr_def.phys_char_sf
+              LIMIT 1; -- Just in case ...
+
+        END IF;
+
+        -- apply index normalizers to attr_value
+        FOR normalizer IN
+            SELECT  n.func AS func,
+                    n.param_count AS param_count,
+                    m.params AS params
+              FROM  config.index_normalizer n
+                    JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
+              WHERE attr = attr_def.name
+              ORDER BY m.pos LOOP
+                EXECUTE 'SELECT ' || normalizer.func || '(' ||
+                    quote_literal( attr_value ) ||
+                    CASE
+                        WHEN normalizer.param_count > 0
+                            THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+                            ELSE ''
+                        END ||
+                    ')' INTO attr_value;
+
+        END LOOP;
+
+        -- Add the new value to the hstore
+        new_attrs := new_attrs || hstore( attr_def.name, attr_value );
+
+    END LOOP;
+
+    RETURN new_attrs;
+END;
+$_$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.extract_rec_attrs ( xml TEXT ) RETURNS hstore AS $_$
+    SELECT vandelay.extract_rec_attrs( $1, (SELECT ARRAY_ACCUM(name) FROM config.record_attr_definition));
+$_$ LANGUAGE SQL;
+
+-- Everything between this comment and the beginning of the definition of
+-- vandelay.match_bib_record() is strictly in service of that function.
+CREATE TYPE vandelay.match_set_test_result AS (record BIGINT, quality INTEGER);
+
+CREATE OR REPLACE FUNCTION vandelay.match_set_test_marcxml(
+    match_set_id INTEGER, record_xml TEXT
+) RETURNS SETOF vandelay.match_set_test_result AS $$
+DECLARE
+    tags_rstore HSTORE;
+    svf_rstore  HSTORE;
+    coal        TEXT;
+    joins       TEXT;
+    query_      TEXT;
+    wq          TEXT;
+    qvalue      INTEGER;
+    rec         RECORD;
+BEGIN
+    tags_rstore := vandelay.flatten_marc_hstore(record_xml);
+    svf_rstore := vandelay.extract_rec_attrs(record_xml);
+
+    CREATE TEMPORARY TABLE _vandelay_tmp_qrows (q INTEGER);
+    CREATE TEMPORARY TABLE _vandelay_tmp_jrows (j TEXT);
+
+    -- generate the where clause and return that directly (into wq), and as
+    -- a side-effect, populate the _vandelay_tmp_[qj]rows tables.
+    wq := vandelay.get_expr_from_match_set(match_set_id);
+
+    query_ := 'SELECT bre.id AS record, ';
+
+    -- qrows table is for the quality bits we add to the SELECT clause
+    SELECT ARRAY_TO_STRING(
+        ARRAY_ACCUM('COALESCE(n' || q::TEXT || '.quality, 0)'), ' + '
+    ) INTO coal FROM _vandelay_tmp_qrows;
+
+    -- our query string so far is the SELECT clause and the inital FROM.
+    -- no JOINs yet nor the WHERE clause
+    query_ := query_ || coal || ' AS quality ' || E'\n' ||
+        'FROM biblio.record_entry bre ';
+
+    -- jrows table is for the joins we must make (and the real text conditions)
+    SELECT ARRAY_TO_STRING(ARRAY_ACCUM(j), E'\n') INTO joins
+        FROM _vandelay_tmp_jrows;
+
+    -- add those joins and the where clause to our query.
+    query_ := query_ || joins || E'\n' || 'WHERE ' || wq || ' AND not bre.deleted';
+
+    -- this will return rows of record,quality
+    FOR rec IN EXECUTE query_ USING tags_rstore, svf_rstore LOOP
+        RETURN NEXT rec;
+    END LOOP;
+
+    DROP TABLE _vandelay_tmp_qrows;
+    DROP TABLE _vandelay_tmp_jrows;
+    RETURN;
+END;
+
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.flatten_marc_hstore(
+    record_xml TEXT
+) RETURNS HSTORE AS $$
+BEGIN
+    RETURN (SELECT
+        HSTORE(
+            ARRAY_ACCUM(tag || (COALESCE(subfield, ''))),
+            ARRAY_ACCUM(value)
+        )
+        FROM (
+            SELECT tag, subfield, ARRAY_ACCUM(value)::TEXT AS value
+                FROM vandelay.flatten_marc(record_xml)
+                GROUP BY tag, subfield ORDER BY tag, subfield
+        ) subquery
+    );
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.get_expr_from_match_set(
+    match_set_id INTEGER
+) RETURNS TEXT AS $$
+DECLARE
+    root    vandelay.match_set_point;
+BEGIN
+    SELECT * INTO root FROM vandelay.match_set_point
+        WHERE parent IS NULL AND match_set = match_set_id;
+
+    RETURN vandelay.get_expr_from_match_set_point(root);
+END;
+$$  LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.get_expr_from_match_set_point(
+    node vandelay.match_set_point
+) RETURNS TEXT AS $$
+DECLARE
+    q           TEXT;
+    i           INTEGER;
+    this_op     TEXT;
+    children    INTEGER[];
+    child       vandelay.match_set_point;
+BEGIN
+    SELECT ARRAY_ACCUM(id) INTO children FROM vandelay.match_set_point
+        WHERE parent = node.id;
+
+    IF ARRAY_LENGTH(children, 1) > 0 THEN
+        this_op := vandelay._get_expr_render_one(node);
+        q := '(';
+        i := 1;
+        WHILE children[i] IS NOT NULL LOOP
+            SELECT * INTO child FROM vandelay.match_set_point
+                WHERE id = children[i];
+            IF i > 1 THEN
+                q := q || ' ' || this_op || ' ';
+            END IF;
+            i := i + 1;
+            q := q || vandelay.get_expr_from_match_set_point(child);
+        END LOOP;
+        q := q || ')';
+        RETURN q;
+    ELSIF node.bool_op IS NULL THEN
+        PERFORM vandelay._get_expr_push_qrow(node);
+        PERFORM vandelay._get_expr_push_jrow(node);
+        RETURN vandelay._get_expr_render_one(node);
+    ELSE
+        RETURN '';
+    END IF;
+END;
+$$  LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay._get_expr_push_qrow(
+    node vandelay.match_set_point
+) RETURNS VOID AS $$
+DECLARE
+BEGIN
+    INSERT INTO _vandelay_tmp_qrows (q) VALUES (node.id);
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay._get_expr_push_jrow(
+    node vandelay.match_set_point
+) RETURNS VOID AS $$
+DECLARE
+    jrow        TEXT;
+    my_alias    TEXT;
+    op          TEXT;
+    tagkey      TEXT;
+BEGIN
+    IF node.negate THEN
+        op := '<>';
+    ELSE
+        op := '=';
+    END IF;
+
+    IF node.tag IS NOT NULL THEN
+        tagkey := node.tag;
+        IF node.subfield IS NOT NULL THEN
+            tagkey := tagkey || node.subfield;
+        END IF;
+    END IF;
+
+    my_alias := 'n' || node.id::TEXT;
+
+    jrow := 'LEFT JOIN (SELECT *, ' || node.quality ||
+        ' AS quality FROM metabib.';
+    IF node.tag IS NOT NULL THEN
+        jrow := jrow || 'full_rec) ' || my_alias || ' ON (' ||
+            my_alias || '.record = bre.id AND ' || my_alias || '.tag = ''' ||
+            node.tag || '''';
+        IF node.subfield IS NOT NULL THEN
+            jrow := jrow || ' AND ' || my_alias || '.subfield = ''' ||
+                node.subfield || '''';
+        END IF;
+        jrow := jrow || ' AND (' || my_alias || '.value ' || op ||
+            ' ANY(($1->''' || tagkey || ''')::TEXT[])))';
+    ELSE    -- svf
+        jrow := jrow || 'record_attr) ' || my_alias || ' ON (' ||
+            my_alias || '.id = bre.id AND (' ||
+            my_alias || '.attrs->''' || node.svf ||
+            ''' ' || op || ' $2->''' || node.svf || '''))';
+    END IF;
+    INSERT INTO _vandelay_tmp_jrows (j) VALUES (jrow);
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay._get_expr_render_one(
+    node vandelay.match_set_point
+) RETURNS TEXT AS $$
+DECLARE
+    s           TEXT;
+BEGIN
+    IF node.bool_op IS NOT NULL THEN
+        RETURN node.bool_op;
+    ELSE
+        RETURN '(n' || node.id::TEXT || '.id IS NOT NULL)';
+    END IF;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.match_bib_record() RETURNS TRIGGER AS $func$
+DECLARE
+    incoming_existing_id    TEXT;
+    test_result             vandelay.match_set_test_result%ROWTYPE;
+    tmp_rec                 BIGINT;
+    match_set               INT;
+BEGIN
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    DELETE FROM vandelay.bib_match WHERE queued_record = NEW.id;
+
+    SELECT q.match_set INTO match_set FROM vandelay.bib_queue q WHERE q.id = NEW.queue;
+
+    IF match_set IS NOT NULL THEN
+        NEW.quality := vandelay.measure_record_quality( NEW.marc, match_set );
+    END IF;
+
+    -- Perfect matches on 901$c exit early with a match with high quality.
+    incoming_existing_id :=
+        oils_xpath_string('//*[@tag="901"]/*[@code="c"][1]', NEW.marc);
+
+    IF incoming_existing_id IS NOT NULL AND incoming_existing_id != '' THEN
+        SELECT id INTO tmp_rec FROM biblio.record_entry WHERE id = incoming_existing_id::bigint;
+        IF tmp_rec IS NOT NULL THEN
+            INSERT INTO vandelay.bib_match (queued_record, eg_record, match_score, quality) 
+                SELECT
+                    NEW.id, 
+                    b.id,
+                    9999,
+                    -- note: no match_set means quality==0
+                    vandelay.measure_record_quality( b.marc, match_set )
+                FROM biblio.record_entry b
+                WHERE id = incoming_existing_id::bigint;
+        END IF;
+    END IF;
+
+    IF match_set IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    FOR test_result IN SELECT * FROM
+        vandelay.match_set_test_marcxml(match_set, NEW.marc) LOOP
+
+        INSERT INTO vandelay.bib_match ( queued_record, eg_record, match_score, quality )
+            SELECT  
+                NEW.id,
+                test_result.record,
+                test_result.quality,
+                vandelay.measure_record_quality( b.marc, match_set )
+               FROM  biblio.record_entry b
+               WHERE id = test_result.record;
+
+    END LOOP;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.measure_record_quality ( xml TEXT, match_set_id INT ) RETURNS INT AS $_$
+DECLARE
+    out_q   INT := 0;
+    rvalue  TEXT;
+    test    vandelay.match_set_quality%ROWTYPE;
+BEGIN
+
+    FOR test IN SELECT * FROM vandelay.match_set_quality WHERE match_set = match_set_id LOOP
+        IF test.tag IS NOT NULL THEN
+            FOR rvalue IN SELECT value FROM vandelay.flatten_marc( xml ) WHERE tag = test.tag AND subfield = test.subfield LOOP
+                IF test.value = rvalue THEN
+                    out_q := out_q + test.quality;
+                END IF;
+            END LOOP;
+        ELSE
+            IF test.value = vandelay.extract_rec_attrs(xml, ARRAY[test.svf]) -> test.svf THEN
+                out_q := out_q + test.quality;
+            END IF;
+        END IF;
+    END LOOP;
+
+    RETURN out_q;
+END;
+$_$ LANGUAGE PLPGSQL;
+
+
+CREATE OR REPLACE FUNCTION vandelay.overlay_bib_record ( import_id BIGINT, eg_id BIGINT, merge_profile_id INT ) RETURNS BOOL AS $$
+DECLARE
+    merge_profile   vandelay.merge_profile%ROWTYPE;
+    dyn_profile     vandelay.compile_profile%ROWTYPE;
+    editor_string   TEXT;
+    editor_id       INT;
+    source_marc     TEXT;
+    target_marc     TEXT;
+    eg_marc         TEXT;
+    v_marc          TEXT;
+    replace_rule    TEXT;
+BEGIN
+
+    SELECT  q.marc INTO v_marc
+      FROM  vandelay.queued_record q
+            JOIN vandelay.bib_match m ON (m.queued_record = q.id AND q.id = import_id)
+      LIMIT 1;
+
+    IF v_marc IS NULL THEN
+        -- RAISE NOTICE 'no marc for vandelay or bib record';
+        RETURN FALSE;
+    END IF;
+
+    IF vandelay.template_overlay_bib_record( v_marc, eg_id, merge_profile_id) THEN
+        UPDATE  vandelay.queued_bib_record
+          SET   imported_as = eg_id,
+                import_time = NOW()
+          WHERE id = import_id;
+
+        editor_string := (oils_xpath('//*[@tag="905"]/*[@code="u"]/text()',v_marc))[1];
+
+        IF editor_string IS NOT NULL AND editor_string <> '' THEN
+            SELECT usr INTO editor_id FROM actor.card WHERE barcode = editor_string;
+
+            IF editor_id IS NULL THEN
+                SELECT id INTO editor_id FROM actor.usr WHERE usrname = editor_string;
+            END IF;
+
+            IF editor_id IS NOT NULL THEN
+                UPDATE biblio.record_entry SET editor = editor_id WHERE id = eg_id;
+            END IF;
+        END IF;
+
+        RETURN TRUE;
+    END IF;
+
+    -- RAISE NOTICE 'update of biblio.record_entry failed';
+
+    RETURN FALSE;
+
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_bib_record_with_best ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$
+DECLARE
+    eg_id           BIGINT;
+    lwm_ratio_value NUMERIC;
+BEGIN
+
+    lwm_ratio_value := COALESCE(lwm_ratio_value_p, 0.0);
+
+    PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id;
+
+    IF FOUND THEN
+        -- RAISE NOTICE 'already imported, cannot auto-overlay'
+        RETURN FALSE;
+    END IF;
+
+    SELECT  m.eg_record INTO eg_id
+      FROM  vandelay.bib_match m
+            JOIN vandelay.queued_bib_record qr ON (m.queued_record = qr.id)
+            JOIN vandelay.bib_queue q ON (qr.queue = q.id)
+            JOIN biblio.record_entry r ON (r.id = m.eg_record)
+      WHERE m.queued_record = import_id
+            AND qr.quality::NUMERIC / COALESCE(NULLIF(m.quality,0),1)::NUMERIC >= lwm_ratio_value
+      ORDER BY  m.match_score DESC, -- required match score
+                qr.quality::NUMERIC / COALESCE(NULLIF(m.quality,0),1)::NUMERIC DESC, -- quality tie breaker
+                m.id -- when in doubt, use the first match
+      LIMIT 1;
+
+    IF eg_id IS NULL THEN
+        -- RAISE NOTICE 'incoming record is not of high enough quality';
+        RETURN FALSE;
+    END IF;
+
+    RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id );
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_bib_record_with_best ( import_id BIGINT, merge_profile_id INT, lwm_ratio_value_p NUMERIC ) RETURNS BOOL AS $$
+DECLARE
+    eg_id           BIGINT;
+    lwm_ratio_value NUMERIC;
+BEGIN
+
+    lwm_ratio_value := COALESCE(lwm_ratio_value_p, 0.0);
+
+    PERFORM * FROM vandelay.queued_bib_record WHERE import_time IS NOT NULL AND id = import_id;
+
+    IF FOUND THEN
+        -- RAISE NOTICE 'already imported, cannot auto-overlay'
+        RETURN FALSE;
+    END IF;
+
+    SELECT  m.eg_record INTO eg_id
+      FROM  vandelay.bib_match m
+            JOIN vandelay.queued_bib_record qr ON (m.queued_record = qr.id)
+            JOIN vandelay.bib_queue q ON (qr.queue = q.id)
+            JOIN biblio.record_entry r ON (r.id = m.eg_record)
+      WHERE m.queued_record = import_id
+            AND qr.quality::NUMERIC / COALESCE(NULLIF(m.quality,0),1)::NUMERIC >= lwm_ratio_value
+      ORDER BY  m.match_score DESC, -- required match score
+                qr.quality::NUMERIC / COALESCE(NULLIF(m.quality,0),1)::NUMERIC DESC, -- quality tie breaker
+                m.id -- when in doubt, use the first match
+      LIMIT 1;
+
+    IF eg_id IS NULL THEN
+        -- RAISE NOTICE 'incoming record is not of high enough quality';
+        RETURN FALSE;
+    END IF;
+
+    RETURN vandelay.overlay_bib_record( import_id, eg_id, merge_profile_id );
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_bib_queue_with_best ( queue_id BIGINT, merge_profile_id INT, lwm_ratio_value NUMERIC ) RETURNS SETOF BIGINT AS $$
+DECLARE
+    queued_record   vandelay.queued_bib_record%ROWTYPE;
+BEGIN
+
+    FOR queued_record IN SELECT * FROM vandelay.queued_bib_record WHERE queue = queue_id AND import_time IS NULL LOOP
+
+        IF vandelay.auto_overlay_bib_record_with_best( queued_record.id, merge_profile_id, lwm_ratio_value ) THEN
+            RETURN NEXT queued_record.id;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+    
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.auto_overlay_bib_queue_with_best ( import_id BIGINT, merge_profile_id INT ) RETURNS SETOF BIGINT AS $$
+    SELECT vandelay.auto_overlay_bib_queue_with_best( $1, $2, p.lwm_ratio ) FROM vandelay.merge_profile p WHERE id = $2;
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_bib_marc ( ) RETURNS TRIGGER AS $$
+DECLARE
+    value   TEXT;
+    atype   TEXT;
+    adef    RECORD;
+BEGIN
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    FOR adef IN SELECT * FROM vandelay.bib_attr_definition LOOP
+
+        SELECT extract_marc_field('vandelay.queued_bib_record', id, adef.xpath, adef.remove) INTO value FROM vandelay.queued_bib_record WHERE id = NEW.id;
+        IF (value IS NOT NULL AND value <> '') THEN
+            INSERT INTO vandelay.queued_bib_record_attr (record, field, attr_value) VALUES (NEW.id, adef.id, value);
+        END IF;
+
+    END LOOP;
+
+    RETURN NULL;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_bib_items ( ) RETURNS TRIGGER AS $func$
+DECLARE
+    attr_def    BIGINT;
+    item_data   vandelay.import_item%ROWTYPE;
+BEGIN
+
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    SELECT item_attr_def INTO attr_def FROM vandelay.bib_queue WHERE id = NEW.queue;
+
+    FOR item_data IN SELECT * FROM vandelay.ingest_items( NEW.id::BIGINT, attr_def ) LOOP
+        INSERT INTO vandelay.import_item (
+            record,
+            definition,
+            owning_lib,
+            circ_lib,
+            call_number,
+            copy_number,
+            status,
+            location,
+            circulate,
+            deposit,
+            deposit_amount,
+            ref,
+            holdable,
+            price,
+            barcode,
+            circ_modifier,
+            circ_as_type,
+            alert_message,
+            pub_note,
+            priv_note,
+            opac_visible
+        ) VALUES (
+            NEW.id,
+            item_data.definition,
+            item_data.owning_lib,
+            item_data.circ_lib,
+            item_data.call_number,
+            item_data.copy_number,
+            item_data.status,
+            item_data.location,
+            item_data.circulate,
+            item_data.deposit,
+            item_data.deposit_amount,
+            item_data.ref,
+            item_data.holdable,
+            item_data.price,
+            item_data.barcode,
+            item_data.circ_modifier,
+            item_data.circ_as_type,
+            item_data.alert_message,
+            item_data.pub_note,
+            item_data.priv_note,
+            item_data.opac_visible
+        );
+    END LOOP;
+
+    RETURN NULL;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.cleanup_bib_marc ( ) RETURNS TRIGGER AS $$
+BEGIN
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    DELETE FROM vandelay.queued_bib_record_attr WHERE record = OLD.id;
+    DELETE FROM vandelay.import_item WHERE record = OLD.id;
+
+    IF TG_OP = 'UPDATE' THEN
+        RETURN NEW;
+    END IF;
+    RETURN OLD;
+END;
+$$ LANGUAGE PLPGSQL;
+
+-- ALTER TABLEs...
+
+DROP TRIGGER zz_match_bibs_trigger ON vandelay.queued_bib_record;
+CREATE TRIGGER zz_match_bibs_trigger
+    BEFORE INSERT OR UPDATE ON vandelay.queued_bib_record
+    FOR EACH ROW EXECUTE PROCEDURE vandelay.match_bib_record();
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_authority_marc ( ) RETURNS TRIGGER AS $$
+DECLARE
+    value   TEXT;
+    atype   TEXT;
+    adef    RECORD;
+BEGIN
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    FOR adef IN SELECT * FROM vandelay.authority_attr_definition LOOP
+
+        SELECT extract_marc_field('vandelay.queued_authority_record', id, adef.xpath, adef.remove) INTO value FROM vandelay.queued_authority_record WHERE id = NEW.id;
+        IF (value IS NOT NULL AND value <> '') THEN
+            INSERT INTO vandelay.queued_authority_record_attr (record, field, attr_value) VALUES (NEW.id, adef.id, value);
+        END IF;
+
+    END LOOP;
+
+    RETURN NULL;
+END;
+$$ LANGUAGE PLPGSQL;
+
+ALTER TABLE vandelay.authority_attr_definition DROP COLUMN ident;
+ALTER TABLE vandelay.queued_authority_record
+    ADD COLUMN import_error TEXT REFERENCES vandelay.import_error (code) ON DELETE SET NULL ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    ADD COLUMN error_detail TEXT;
+
+ALTER TABLE vandelay.authority_match DROP COLUMN matched_attr;
+
+CREATE OR REPLACE FUNCTION vandelay.cleanup_authority_marc ( ) RETURNS TRIGGER AS $$
+BEGIN
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    DELETE FROM vandelay.queued_authority_record_attr WHERE record = OLD.id;
+    IF TG_OP = 'UPDATE' THEN
+        RETURN NEW;
+    END IF;
+    RETURN OLD;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION authority.flatten_marc ( rid BIGINT ) RETURNS SETOF authority.full_rec AS $func$
+DECLARE
+       auth    authority.record_entry%ROWTYPE;
+       output  authority.full_rec%ROWTYPE;
+       field   RECORD;
+BEGIN
+       SELECT INTO auth * FROM authority.record_entry WHERE id = rid;
+
+       FOR field IN SELECT * FROM vandelay.flatten_marc( auth.marc ) LOOP
+               output.record := rid;
+               output.ind1 := field.ind1;
+               output.ind2 := field.ind2;
+               output.tag := field.tag;
+               output.subfield := field.subfield;
+               output.value := field.value;
+
+               RETURN NEXT output;
+       END LOOP;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION biblio.flatten_marc ( rid BIGINT ) RETURNS SETOF metabib.full_rec AS $func$
+DECLARE
+       bib     biblio.record_entry%ROWTYPE;
+       output  metabib.full_rec%ROWTYPE;
+       field   RECORD;
+BEGIN
+       SELECT INTO bib * FROM biblio.record_entry WHERE id = rid;
+
+       FOR field IN SELECT * FROM vandelay.flatten_marc( bib.marc ) LOOP
+               output.record := rid;
+               output.ind1 := field.ind1;
+               output.ind2 := field.ind2;
+               output.tag := field.tag;
+               output.subfield := field.subfield;
+               output.value := field.value;
+
+               RETURN NEXT output;
+       END LOOP;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-----------------------------------------------
+-- Seed data for import errors
+-----------------------------------------------
+
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'general.unknown', oils_i18n_gettext('general.unknown', 'Import or Overlay failed', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.item.duplicate.barcode', oils_i18n_gettext('import.item.duplicate.barcode', 'Import failed due to barcode collision', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.item.invalid.circ_modifier', oils_i18n_gettext('import.item.invalid.circ_modifier', 'Import failed due to invalid circulation modifier', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.item.invalid.location', oils_i18n_gettext('import.item.invalid.location', 'Import failed due to invalid copy location', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.duplicate.sysid', oils_i18n_gettext('import.duplicate.sysid', 'Import failed due to system id collision', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.duplicate.tcn', oils_i18n_gettext('import.duplicate.sysid', 'Import failed due to system id collision', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'overlay.missing.sysid', oils_i18n_gettext('overlay.missing.sysid', 'Overlay failed due to missing system id', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.auth.duplicate.acn', oils_i18n_gettext('import.auth.duplicate.acn', 'Import failed due to Accession Number collision', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'import.xml.malformed', oils_i18n_gettext('import.xml.malformed', 'Malformed record cause Import failure', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'overlay.xml.malformed', oils_i18n_gettext('overlay.xml.malformed', 'Malformed record cause Overlay failure', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 'overlay.record.quality', oils_i18n_gettext('overlay.record.quality', 'New record had insufficient quality', 'vie', 'description') );
+
+
+----------------------------------------------------------------
+-- Seed data for queued record/item exports
+----------------------------------------------------------------
+
+INSERT INTO action_trigger.hook (key,core_type,description,passive) VALUES (
+        'vandelay.queued_bib_record.print',
+        'vqbr', 
+        oils_i18n_gettext(
+            'vandelay.queued_bib_record.print',
+            'Print output has been requested for records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.queued_bib_record.csv',
+        'vqbr', 
+        oils_i18n_gettext(
+            'vandelay.queued_bib_record.csv',
+            'CSV output has been requested for records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.queued_bib_record.email',
+        'vqbr', 
+        oils_i18n_gettext(
+            'vandelay.queued_bib_record.email',
+            'An email has been requested for records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.queued_auth_record.print',
+        'vqar', 
+        oils_i18n_gettext(
+            'vandelay.queued_auth_record.print',
+            'Print output has been requested for records in an Importer Authority Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.queued_auth_record.csv',
+        'vqar', 
+        oils_i18n_gettext(
+            'vandelay.queued_auth_record.csv',
+            'CSV output has been requested for records in an Importer Authority Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.queued_auth_record.email',
+        'vqar', 
+        oils_i18n_gettext(
+            'vandelay.queued_auth_record.email',
+            'An email has been requested for records in an Importer Authority Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.import_items.print',
+        'vii', 
+        oils_i18n_gettext(
+            'vandelay.import_items.print',
+            'Print output has been requested for Import Items from records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.import_items.csv',
+        'vii', 
+        oils_i18n_gettext(
+            'vandelay.import_items.csv',
+            'CSV output has been requested for Import Items from records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+    ,(
+        'vandelay.import_items.email',
+        'vii', 
+        oils_i18n_gettext(
+            'vandelay.import_items.email',
+            'An email has been requested for Import Items from records in an Importer Bib Queue.',
+            'ath',
+            'description'
+        ), 
+        FALSE
+    )
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        39,
+        TRUE,
+        1,
+        'Print Output for Queued Bib Records',
+        'vandelay.queued_bib_record.print',
+        'NOOP_True',
+        'ProcessTemplate',
+        'queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+<pre>
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+    [% FOR vqbr IN target %]
+=-=-=
+ Title of work    | [% helpers.get_queued_bib_attr('title',vqbr.attributes) %]
+ Author of work   | [% helpers.get_queued_bib_attr('author',vqbr.attributes) %]
+ Language of work | [% helpers.get_queued_bib_attr('language',vqbr.attributes) %]
+ Pagination       | [% helpers.get_queued_bib_attr('pagination',vqbr.attributes) %]
+ ISBN             | [% helpers.get_queued_bib_attr('isbn',vqbr.attributes) %]
+ ISSN             | [% helpers.get_queued_bib_attr('issn',vqbr.attributes) %]
+ Price            | [% helpers.get_queued_bib_attr('price',vqbr.attributes) %]
+ Accession Number | [% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) %]
+ TCN Value        | [% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) %]
+ TCN Source       | [% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) %]
+ Internal ID      | [% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) %]
+ Publisher        | [% helpers.get_queued_bib_attr('publisher',vqbr.attributes) %]
+ Publication Date | [% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) %]
+ Edition          | [% helpers.get_queued_bib_attr('edition',vqbr.attributes) %]
+ Item Barcode     | [% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) %]
+
+    [% END %]
+</pre>
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    39, 'attributes')
+    ,( 39, 'queue')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        40,
+        TRUE,
+        1,
+        'CSV Output for Queued Bib Records',
+        'vandelay.queued_bib_record.csv',
+        'NOOP_True',
+        'ProcessTemplate',
+        'queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+"Title of work","Author of work","Language of work","Pagination","ISBN","ISSN","Price","Accession Number","TCN Value","TCN Source","Internal ID","Publisher","Publication Date","Edition","Item Barcode"
+[% FOR vqbr IN target %]"[% helpers.get_queued_bib_attr('title',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('author',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('language',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pagination',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('issn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('price',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('publisher',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('edition',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) | replace('"', '""') %]"
+[% END %]
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    40, 'attributes')
+    ,( 40, 'queue')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        41,
+        TRUE,
+        1,
+        'Email Output for Queued Bib Records',
+        'vandelay.queued_bib_record.email',
+        'NOOP_True',
+        'SendEmail',
+        'queue.owner',
+        NULL,
+$$
+[%- USE date -%]
+[%- SET user = target.0.queue.owner -%]
+To: [%- params.recipient_email || user.email || 'root@localhost' %]
+From: [%- params.sender_email || default_sender %]
+Subject: Bibs from Import Queue
+
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+    [% FOR vqbr IN target %]
+=-=-=
+ Title of work    | [% helpers.get_queued_bib_attr('title',vqbr.attributes) %]
+ Author of work   | [% helpers.get_queued_bib_attr('author',vqbr.attributes) %]
+ Language of work | [% helpers.get_queued_bib_attr('language',vqbr.attributes) %]
+ Pagination       | [% helpers.get_queued_bib_attr('pagination',vqbr.attributes) %]
+ ISBN             | [% helpers.get_queued_bib_attr('isbn',vqbr.attributes) %]
+ ISSN             | [% helpers.get_queued_bib_attr('issn',vqbr.attributes) %]
+ Price            | [% helpers.get_queued_bib_attr('price',vqbr.attributes) %]
+ Accession Number | [% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) %]
+ TCN Value        | [% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) %]
+ TCN Source       | [% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) %]
+ Internal ID      | [% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) %]
+ Publisher        | [% helpers.get_queued_bib_attr('publisher',vqbr.attributes) %]
+ Publication Date | [% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) %]
+ Edition          | [% helpers.get_queued_bib_attr('edition',vqbr.attributes) %]
+ Item Barcode     | [% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) %]
+
+    [% END %]
+
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    41, 'attributes')
+    ,( 41, 'queue')
+    ,( 41, 'queue.owner')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        42,
+        TRUE,
+        1,
+        'Print Output for Queued Authority Records',
+        'vandelay.queued_auth_record.print',
+        'NOOP_True',
+        'ProcessTemplate',
+        'queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+<pre>
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+    [% FOR vqar IN target %]
+=-=-=
+ Record Identifier | [% helpers.get_queued_auth_attr('rec_identifier',vqar.attributes) %]
+
+    [% END %]
+</pre>
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    42, 'attributes')
+    ,( 42, 'queue')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        43,
+        TRUE,
+        1,
+        'CSV Output for Queued Authority Records',
+        'vandelay.queued_auth_record.csv',
+        'NOOP_True',
+        'ProcessTemplate',
+        'queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+"Record Identifier"
+[% FOR vqar IN target %]"[% helpers.get_queued_auth_attr('rec_identifier',vqar.attributes) | replace('"', '""') %]"
+[% END %]
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    43, 'attributes')
+    ,( 43, 'queue')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        44,
+        TRUE,
+        1,
+        'Email Output for Queued Authority Records',
+        'vandelay.queued_auth_record.email',
+        'NOOP_True',
+        'SendEmail',
+        'queue.owner',
+        NULL,
+$$
+[%- USE date -%]
+[%- SET user = target.0.queue.owner -%]
+To: [%- params.recipient_email || user.email || 'root@localhost' %]
+From: [%- params.sender_email || default_sender %]
+Subject: Authorities from Import Queue
+
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+    [% FOR vqar IN target %]
+=-=-=
+ Record Identifier | [% helpers.get_queued_auth_attr('rec_identifier',vqar.attributes) %]
+
+    [% END %]
+
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    44, 'attributes')
+    ,( 44, 'queue')
+    ,( 44, 'queue.owner')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        45,
+        TRUE,
+        1,
+        'Print Output for Import Items from Queued Bib Records',
+        'vandelay.import_items.print',
+        'NOOP_True',
+        'ProcessTemplate',
+        'record.queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+<pre>
+Queue ID: [% target.0.record.queue.id %]
+Queue Name: [% target.0.record.queue.name %]
+Queue Type: [% target.0.record.queue.queue_type %]
+Complete? [% target.0.record.queue.complete %]
+
+    [% FOR vii IN target %]
+=-=-=
+ Import Item ID         | [% vii.id %]
+ Title of work          | [% helpers.get_queued_bib_attr('title',vii.record.attributes) %]
+ ISBN                   | [% helpers.get_queued_bib_attr('isbn',vii.record.attributes) %]
+ Attribute Definition   | [% vii.definition %]
+ Import Error           | [% vii.import_error %]
+ Import Error Detail    | [% vii.error_detail %]
+ Owning Library         | [% vii.owning_lib %]
+ Circulating Library    | [% vii.circ_lib %]
+ Call Number            | [% vii.call_number %]
+ Copy Number            | [% vii.copy_number %]
+ Status                 | [% vii.status.name %]
+ Shelving Location      | [% vii.location.name %]
+ Circulate              | [% vii.circulate %]
+ Deposit                | [% vii.deposit %]
+ Deposit Amount         | [% vii.deposit_amount %]
+ Reference              | [% vii.ref %]
+ Holdable               | [% vii.holdable %]
+ Price                  | [% vii.price %]
+ Barcode                | [% vii.barcode %]
+ Circulation Modifier   | [% vii.circ_modifier %]
+ Circulate As MARC Type | [% vii.circ_as_type %]
+ Alert Message          | [% vii.alert_message %]
+ Public Note            | [% vii.pub_note %]
+ Private Note           | [% vii.priv_note %]
+ OPAC Visible           | [% vii.opac_visible %]
+
+    [% END %]
+</pre>
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    45, 'record')
+    ,( 45, 'record.attributes')
+    ,( 45, 'record.queue')
+    ,( 45, 'record.queue.owner')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        46,
+        TRUE,
+        1,
+        'CSV Output for Import Items from Queued Bib Records',
+        'vandelay.import_items.csv',
+        'NOOP_True',
+        'ProcessTemplate',
+        'record.queue.owner',
+        'print-on-demand',
+$$
+[%- USE date -%]
+"Import Item ID","Title of work","ISBN","Attribute Definition","Import Error","Import Error Detail","Owning Library","Circulating Library","Call Number","Copy Number","Status","Shelving Location","Circulate","Deposit","Deposit Amount","Reference","Holdable","Price","Barcode","Circulation Modifier","Circulate As MARC Type","Alert Message","Public Note","Private Note","OPAC Visible"
+[% FOR vii IN target %]"[% vii.id | replace('"', '""') %]","[% helpers.get_queued_bib_attr('title',vii.record.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vii.record.attributes) | replace('"', '""') %]","[% vii.definition | replace('"', '""') %]","[% vii.import_error | replace('"', '""') %]","[% vii.error_detail | replace('"', '""') %]","[% vii.owning_lib | replace('"', '""') %]","[% vii.circ_lib | replace('"', '""') %]","[% vii.call_number | replace('"', '""') %]","[% vii.copy_number | replace('"', '""') %]","[% vii.status.name | replace('"', '""') %]","[% vii.location.name | replace('"', '""') %]","[% vii.circulate | replace('"', '""') %]","[% vii.deposit | replace('"', '""') %]","[% vii.deposit_amount | replace('"', '""') %]","[% vii.ref | replace('"', '""') %]","[% vii.holdable | replace('"', '""') %]","[% vii.price | replace('"', '""') %]","[% vii.barcode | replace('"', '""') %]","[% vii.circ_modifier | replace('"', '""') %]","[% vii.circ_as_type | replace('"', '""') %]","[% vii.alert_message | replace('"', '""') %]","[% vii.pub_note | replace('"', '""') %]","[% vii.priv_note | replace('"', '""') %]","[% vii.opac_visible | replace('"', '""') %]"
+[% END %]
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    46, 'record')
+    ,( 46, 'record.attributes')
+    ,( 46, 'record.queue')
+    ,( 46, 'record.queue.owner')
+;
+
+INSERT INTO action_trigger.event_definition (
+        id,
+        active,
+        owner,
+        name,
+        hook,
+        validator,
+        reactor,
+        group_field,
+        granularity,
+        template
+    ) VALUES (
+        47,
+        TRUE,
+        1,
+        'Email Output for Import Items from Queued Bib Records',
+        'vandelay.import_items.email',
+        'NOOP_True',
+        'SendEmail',
+        'record.queue.owner',
+        NULL,
+$$
+[%- USE date -%]
+[%- SET user = target.0.record.queue.owner -%]
+To: [%- params.recipient_email || user.email || 'root@localhost' %]
+From: [%- params.sender_email || default_sender %]
+Subject: Import Items from Import Queue
+
+Queue ID: [% target.0.record.queue.id %]
+Queue Name: [% target.0.record.queue.name %]
+Queue Type: [% target.0.record.queue.queue_type %]
+Complete? [% target.0.record.queue.complete %]
+
+    [% FOR vii IN target %]
+=-=-=
+ Import Item ID         | [% vii.id %]
+ Title of work          | [% helpers.get_queued_bib_attr('title',vii.record.attributes) %]
+ ISBN                   | [% helpers.get_queued_bib_attr('isbn',vii.record.attributes) %]
+ Attribute Definition   | [% vii.definition %]
+ Import Error           | [% vii.import_error %]
+ Import Error Detail    | [% vii.error_detail %]
+ Owning Library         | [% vii.owning_lib %]
+ Circulating Library    | [% vii.circ_lib %]
+ Call Number            | [% vii.call_number %]
+ Copy Number            | [% vii.copy_number %]
+ Status                 | [% vii.status.name %]
+ Shelving Location      | [% vii.location.name %]
+ Circulate              | [% vii.circulate %]
+ Deposit                | [% vii.deposit %]
+ Deposit Amount         | [% vii.deposit_amount %]
+ Reference              | [% vii.ref %]
+ Holdable               | [% vii.holdable %]
+ Price                  | [% vii.price %]
+ Barcode                | [% vii.barcode %]
+ Circulation Modifier   | [% vii.circ_modifier %]
+ Circulate As MARC Type | [% vii.circ_as_type %]
+ Alert Message          | [% vii.alert_message %]
+ Public Note            | [% vii.pub_note %]
+ Private Note           | [% vii.priv_note %]
+ OPAC Visible           | [% vii.opac_visible %]
+
+    [% END %]
+$$
+    )
+;
+
+INSERT INTO action_trigger.environment ( event_def, path) VALUES (
+    47, 'record')
+    ,( 47, 'record.attributes')
+    ,( 47, 'record.queue')
+    ,( 47, 'record.queue.owner')
+;
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0574', :eg_version);
+
+UPDATE action_trigger.event_definition SET template =
+$$
+[%- USE date -%]
+<style>
+    table { border-collapse: collapse; }
+    td { padding: 5px; border-bottom: 1px solid #888; }
+    th { font-weight: bold; }
+</style>
+[%
+    # Sort the holds into copy-location buckets
+    # In the main print loop, sort each bucket by callnumber before printing
+    SET holds_list = [];
+    SET loc_data = [];
+    SET current_location = target.0.current_copy.location.id;
+    FOR hold IN target;
+        IF current_location != hold.current_copy.location.id;
+            SET current_location = hold.current_copy.location.id;
+            holds_list.push(loc_data);
+            SET loc_data = [];
+        END;
+        SET hold_data = {
+            'hold' => hold,
+            'callnumber' => hold.current_copy.call_number.label
+        };
+        loc_data.push(hold_data);
+    END;
+    holds_list.push(loc_data)
+%]
+<table>
+    <thead>
+        <tr>
+            <th>Title</th>
+            <th>Author</th>
+            <th>Shelving Location</th>
+            <th>Call Number</th>
+            <th>Barcode/Part</th>
+            <th>Patron</th>
+        </tr>
+    </thead>
+    <tbody>
+    [% FOR loc_data IN holds_list  %]
+        [% FOR hold_data IN loc_data.sort('callnumber') %]
+            [%
+                SET hold = hold_data.hold;
+                SET copy_data = helpers.get_copy_bib_basics(hold.current_copy.id);
+            %]
+            <tr>
+                <td>[% copy_data.title | truncate %]</td>
+                <td>[% copy_data.author | truncate %]</td>
+                <td>[% hold.current_copy.location.name %]</td>
+                <td>[% hold.current_copy.call_number.label %]</td>
+                <td>[% hold.current_copy.barcode %]
+                    [% FOR part IN hold.current_copy.parts %]
+                       [% part.part.label %]
+                    [% END %]
+                </td>
+                <td>[% hold.usr.card.barcode %]</td>
+            </tr>
+        [% END %]
+    [% END %]
+    <tbody>
+</table>
+$$
+    WHERE id = 35;
+
+INSERT INTO action_trigger.environment (
+        event_def,
+        path
+    ) VALUES
+        (35, 'current_copy.parts'),
+        (35, 'current_copy.parts.part')
+;
+
+
+-- Evergreen DB patch XXXX.schema.authority-control-sets.sql
+--
+-- Schema upgrade to add Authority Control Set functionality
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0575', :eg_version);
+
+CREATE TABLE authority.control_set (
+    id          SERIAL  PRIMARY KEY,
+    name        TEXT    NOT NULL UNIQUE, -- i18n
+    description TEXT                     -- i18n
+);
+
+CREATE TABLE authority.control_set_authority_field (
+    id          SERIAL  PRIMARY KEY,
+    main_entry  INT     REFERENCES authority.control_set_authority_field (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    control_set INT     NOT NULL REFERENCES authority.control_set (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    tag         CHAR(3) NOT NULL,
+    sf_list     TEXT    NOT NULL,
+    name        TEXT    NOT NULL, -- i18n
+    description TEXT              -- i18n
+);
+
+CREATE TABLE authority.control_set_bib_field (
+    id              SERIAL  PRIMARY KEY,
+    authority_field INT     NOT NULL REFERENCES authority.control_set_authority_field (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    tag             CHAR(3) NOT NULL
+);
+
+CREATE TABLE authority.thesaurus (
+    code        TEXT    PRIMARY KEY,     -- MARC21 thesaurus code
+    control_set INT     NOT NULL REFERENCES authority.control_set (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    name        TEXT    NOT NULL UNIQUE, -- i18n
+    description TEXT                     -- i18n
+);
+
+CREATE TABLE authority.browse_axis (
+    code        TEXT    PRIMARY KEY,
+    name        TEXT    UNIQUE NOT NULL, -- i18n
+    sorter      TEXT    REFERENCES config.record_attr_definition (name) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    description TEXT
+);
+
+CREATE TABLE authority.browse_axis_authority_field_map (
+    id          SERIAL  PRIMARY KEY,
+    axis        TEXT    NOT NULL REFERENCES authority.browse_axis (code) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    field       INT     NOT NULL REFERENCES authority.control_set_authority_field (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
+);
+
+ALTER TABLE authority.record_entry ADD COLUMN control_set INT REFERENCES authority.control_set (id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE authority.rec_descriptor DROP COLUMN char_encoding, ADD COLUMN encoding_level TEXT, ADD COLUMN thesaurus TEXT;
+
+CREATE INDEX authority_full_rec_value_index ON authority.full_rec (value);
+CREATE OR REPLACE RULE protect_authority_rec_delete AS ON DELETE TO authority.record_entry DO INSTEAD (UPDATE authority.record_entry SET deleted = TRUE WHERE OLD.id = authority.record_entry.id; DELETE FROM authority.full_rec WHERE record = OLD.id);
+CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT, no_thesaurus BOOL ) RETURNS TEXT AS $func$
+DECLARE
+    acsaf           authority.control_set_authority_field%ROWTYPE;
+    tag_used        TEXT;
+    sf              TEXT;
+    thes_code       TEXT;
+    cset            INT;
+    heading_text    TEXT;
+    tmp_text        TEXT;
+BEGIN
+    thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj');
+    IF thes_code IS NULL THEN
+        thes_code := '|';
+    END IF;
+
+    SELECT control_set INTO cset FROM authority.thesaurus WHERE code = thes_code;
+    IF NOT FOUND THEN
+        cset = 1;
+    END IF;
+
+    heading_text := '';
+    FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP
+        tag_used := acsaf.tag;
+        FOR sf IN SELECT * FROM regexp_split_to_table(acsaf.sf_list,'') LOOP
+            tmp_text := oils_xpath_string('//*[@tag="'||tag_used||'"]/*[@code="'||sf||'"]', marcxml);
+            IF tmp_text IS NOT NULL AND tmp_text <> '' THEN
+                heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text;
+            END IF;
+        END LOOP;
+        EXIT WHEN heading_text <> '';
+    END LOOP;
+    IF thes_code = 'z' THEN
+        thes_code := oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml);
+    END IF;
+
+    IF heading_text <> '' THEN
+        IF no_thesaurus IS TRUE THEN
+            heading_text := tag_used || ' ' || public.naco_normalize(heading_text);
+        ELSE
+            heading_text := tag_used || '_' || thes_code || ' ' || public.naco_normalize(heading_text);
+        END IF;
+    ELSE
+        heading_text := 'NOHEADING_' || thes_code || ' ' || MD5(marcxml);
+    END IF;
+
+    RETURN heading_text;
+END;
+$func$ LANGUAGE PLPGSQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION authority.simple_normalize_heading( marcxml TEXT ) RETURNS TEXT AS $func$
+    SELECT authority.normalize_heading($1, TRUE);
+$func$ LANGUAGE SQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT ) RETURNS TEXT AS $func$
+    SELECT authority.normalize_heading($1, FALSE);
+$func$ LANGUAGE SQL IMMUTABLE;
+
+CREATE OR REPLACE VIEW authority.tracing_links AS
+    SELECT  main.record AS record,
+            main.id AS main_id,
+            main.tag AS main_tag,
+            oils_xpath_string('//*[@tag="'||main.tag||'"]/*[local-name()="subfield"]', are.marc) AS main_value,
+            substr(link.value,1,1) AS relationship,
+            substr(link.value,2,1) AS use_restriction,
+            substr(link.value,3,1) AS deprecation,
+            substr(link.value,4,1) AS display_restriction,
+            link.id AS link_id,
+            link.tag AS link_tag,
+            oils_xpath_string('//*[@tag="'||link.tag||'"]/*[local-name()="subfield"]', are.marc) AS link_value,
+            authority.normalize_heading(are.marc) AS normalized_main_value
+      FROM  authority.full_rec main
+            JOIN authority.record_entry are ON (main.record = are.id)
+            JOIN authority.control_set_authority_field main_entry
+                ON (main_entry.tag = main.tag
+                    AND main_entry.main_entry IS NULL
+                    AND main.subfield = 'a' )
+            JOIN authority.control_set_authority_field sub_entry
+                ON (main_entry.id = sub_entry.main_entry)
+            JOIN authority.full_rec link
+                ON (link.record = main.record
+                    AND link.tag = sub_entry.tag
+                    AND link.subfield = 'w' );
+CREATE OR REPLACE FUNCTION authority.generate_overlay_template (source_xml TEXT) RETURNS TEXT AS $f$
+DECLARE
+    cset                INT;
+    main_entry          authority.control_set_authority_field%ROWTYPE;
+    bib_field           authority.control_set_bib_field%ROWTYPE;
+    auth_id             INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', source_xml)::INT;
+    replace_data        XML[] DEFAULT '{}'::XML[];
+    replace_rules       TEXT[] DEFAULT '{}'::TEXT[];
+    auth_field          XML[];
+BEGIN
+    IF auth_id IS NULL THEN
+        RETURN NULL;
+    END IF;
+
+    -- Default to the LoC controll set
+    SELECT COALESCE(control_set,1) INTO cset FROM authority.record_entry WHERE id = auth_id;
+
+    FOR main_entry IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset LOOP
+        auth_field := XPATH('//*[@tag="'||main_entry.tag||'"][1]',source_xml::XML);
+        IF ARRAY_LENGTH(auth_field,1) > 0 THEN
+            FOR bib_field IN SELECT * FROM authority.control_set_bib_field WHERE authority_field = main_entry.id LOOP
+                replace_data := replace_data || XMLELEMENT( name datafield, XMLATTRIBUTES(bib_field.tag AS tag), XPATH('//*[local-name()="subfield"]',auth_field[1])::XML[]);
+                replace_rules := replace_rules || ( bib_field.tag || main_entry.sf_list || E'[0~\\)' || auth_id || '$]' );
+            END LOOP;
+            EXIT;
+        END IF;
+    END LOOP;
+    RETURN XMLELEMENT(
+        name record,
+        XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns),
+        XMLELEMENT( name leader, '00881nam a2200193   4500'),
+        replace_data,
+        XMLELEMENT(
+            name datafield,
+            XMLATTRIBUTES( '905' AS tag, ' ' AS ind1, ' ' AS ind2),
+            XMLELEMENT(
+                name subfield,
+                XMLATTRIBUTES('r' AS code),
+                ARRAY_TO_STRING(replace_rules,',')
+            )
+        )
+    )::TEXT;
+END;
+$f$ STABLE LANGUAGE PLPGSQL;
+CREATE OR REPLACE FUNCTION authority.generate_overlay_template ( BIGINT ) RETURNS TEXT AS $func$
+    SELECT authority.generate_overlay_template( marc ) FROM authority.record_entry WHERE id = $1;
+$func$ LANGUAGE SQL;
+CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$
+
+    use MARC::Record;
+    use MARC::File::XML (BinaryEncoding => 'UTF-8');
+    use MARC::Charset;
+    use strict;
+
+    MARC::Charset->assume_unicode(1);
+
+    my $target_xml = shift;
+    my $source_xml = shift;
+    my $field_spec = shift;
+    my $force_add = shift || 0;
+
+    my $target_r = MARC::Record->new_from_xml( $target_xml );
+    my $source_r = MARC::Record->new_from_xml( $source_xml );
+
+    return $target_xml unless ($target_r && $source_r);
+
+    my @field_list = split(',', $field_spec);
+
+    my %fields;
+    for my $f (@field_list) {
+        $f =~ s/^\s*//; $f =~ s/\s*$//;
+        if ($f =~ /^(.{3})(\w*)(?:\[([^]]*)\])?$/) {
+            my $field = $1;
+            $field =~ s/\s+//;
+            my $sf = $2;
+            $sf =~ s/\s+//;
+            my $match = $3;
+            $match =~ s/^\s*//; $match =~ s/\s*$//;
+            $fields{$field} = { sf => [ split('', $sf) ] };
+            if ($match) {
+                my ($msf,$mre) = split('~', $match);
+                if (length($msf) > 0 and length($mre) > 0) {
+                    $msf =~ s/^\s*//; $msf =~ s/\s*$//;
+                    $mre =~ s/^\s*//; $mre =~ s/\s*$//;
+                    $fields{$field}{match} = { sf => $msf, re => qr/$mre/ };
+                }
+            }
+        }
+    }
+
+    for my $f ( keys %fields) {
+        if ( @{$fields{$f}{sf}} ) {
+            for my $from_field ($source_r->field( $f )) {
+                my @tos = $target_r->field( $f );
+                if (!@tos) {
+                    next if (exists($fields{$f}{match}) and !$force_add);
+                    my @new_fields = map { $_->clone } $source_r->field( $f );
+                    $target_r->insert_fields_ordered( @new_fields );
+                } else {
+                    for my $to_field (@tos) {
+                        if (exists($fields{$f}{match})) {
+                            next unless (grep { $_ =~ $fields{$f}{match}{re} } $to_field->subfield($fields{$f}{match}{sf}));
+                        }
+                        my @new_sf = map { ($_ => $from_field->subfield($_)) } grep { defined($from_field->subfield($_)) } @{$fields{$f}{sf}};
+                        $to_field->add_subfields( @new_sf );
+                    }
+                }
+            }
+        } else {
+            my @new_fields = map { $_->clone } $source_r->field( $f );
+            $target_r->insert_fields_ordered( @new_fields );
+        }
+    }
+
+    $target_xml = $target_r->as_xml_record;
+    $target_xml =~ s/^<\?.+?\?>$//mo;
+    $target_xml =~ s/\n//sgo;
+    $target_xml =~ s/>\s+</></sgo;
+
+    return $target_xml;
+
+$_$ LANGUAGE PLPERLU;
+
+
+CREATE INDEX by_heading ON authority.record_entry (authority.simple_normalize_heading(marc)) WHERE deleted IS FALSE or deleted = FALSE;
+
+INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath, search_field, facet_field) VALUES
+    (28, 'identifier', 'authority_id', oils_i18n_gettext(28, 'Authority Record ID', 'cmf', 'label'), 'marcxml', '//marc:datafield/marc:subfield[@code="0"]', FALSE, TRUE);
+INSERT INTO config.marc21_rec_type_map (code, type_val, blvl_val) VALUES ('AUT','z',' ');
+INSERT INTO config.marc21_rec_type_map (code, type_val, blvl_val) VALUES ('MFHD','uvxy',' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('ELvl', 'ldr', 'AUT', 17, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Subj', '008', 'AUT', 11, 1, '|');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('RecStat', 'ldr', 'AUT', 5, 1, 'n');
+INSERT INTO config.metabib_field_index_norm_map (field,norm,pos)
+    SELECT  m.id,
+            i.id,
+            -1
+      FROM  config.metabib_field m,
+            config.index_normalizer i
+      WHERE i.func = 'remove_paren_substring'
+            AND m.id IN (28);
+
+SELECT SETVAL('authority.control_set_id_seq'::TEXT, 100);
+SELECT SETVAL('authority.control_set_authority_field_id_seq'::TEXT, 1000);
+SELECT SETVAL('authority.control_set_bib_field_id_seq'::TEXT, 1000);
+
+INSERT INTO authority.control_set (id, name, description) VALUES (
+    1,
+    oils_i18n_gettext('1','LoC','acs','name'),
+    oils_i18n_gettext('1','Library of Congress standard authority record control semantics','acs','description')
+);
+
+INSERT INTO authority.control_set_authority_field (id, control_set, main_entry, tag, sf_list, name) VALUES
+
+-- Main entries
+    (1, 1, NULL, '100', 'abcdefklmnopqrstvxyz', oils_i18n_gettext('1','Heading -- Personal Name','acsaf','name')),
+    (2, 1, NULL, '110', 'abcdefgklmnoprstvxyz', oils_i18n_gettext('2','Heading -- Corporate Name','acsaf','name')),
+    (3, 1, NULL, '111', 'acdefgklnpqstvxyz', oils_i18n_gettext('3','Heading -- Meeting Name','acsaf','name')),
+    (4, 1, NULL, '130', 'adfgklmnoprstvxyz', oils_i18n_gettext('4','Heading -- Uniform Title','acsaf','name')),
+    (5, 1, NULL, '150', 'abvxyz', oils_i18n_gettext('5','Heading -- Topical Term','acsaf','name')),
+    (6, 1, NULL, '151', 'avxyz', oils_i18n_gettext('6','Heading -- Geographic Name','acsaf','name')),
+    (7, 1, NULL, '155', 'avxyz', oils_i18n_gettext('7','Heading -- Genre/Form Term','acsaf','name')),
+    (8, 1, NULL, '180', 'vxyz', oils_i18n_gettext('8','Heading -- General Subdivision','acsaf','name')),
+    (9, 1, NULL, '181', 'vxyz', oils_i18n_gettext('9','Heading -- Geographic Subdivision','acsaf','name')),
+    (10, 1, NULL, '182', 'vxyz', oils_i18n_gettext('10','Heading -- Chronological Subdivision','acsaf','name')),
+    (11, 1, NULL, '185', 'vxyz', oils_i18n_gettext('11','Heading -- Form Subdivision','acsaf','name')),
+    (12, 1, NULL, '148', 'avxyz', oils_i18n_gettext('12','Heading -- Chronological Term','acsaf','name')),
+
+-- See Also From tracings
+    (21, 1, 1, '500', 'abcdefiklmnopqrstvwxyz4', oils_i18n_gettext('21','See Also From Tracing -- Personal Name','acsaf','name')),
+    (22, 1, 2, '510', 'abcdefgiklmnoprstvwxyz4', oils_i18n_gettext('22','See Also From Tracing -- Corporate Name','acsaf','name')),
+    (23, 1, 3, '511', 'acdefgiklnpqstvwxyz4', oils_i18n_gettext('23','See Also From Tracing -- Meeting Name','acsaf','name')),
+    (24, 1, 4, '530', 'adfgiklmnoprstvwxyz4', oils_i18n_gettext('24','See Also From Tracing -- Uniform Title','acsaf','name')),
+    (25, 1, 5, '550', 'abivwxyz4', oils_i18n_gettext('25','See Also From Tracing -- Topical Term','acsaf','name')),
+    (26, 1, 6, '551', 'aivwxyz4', oils_i18n_gettext('26','See Also From Tracing -- Geographic Name','acsaf','name')),
+    (27, 1, 7, '555', 'aivwxyz4', oils_i18n_gettext('27','See Also From Tracing -- Genre/Form Term','acsaf','name')),
+    (28, 1, 8, '580', 'ivwxyz4', oils_i18n_gettext('28','See Also From Tracing -- General Subdivision','acsaf','name')),
+    (29, 1, 9, '581', 'ivwxyz4', oils_i18n_gettext('29','See Also From Tracing -- Geographic Subdivision','acsaf','name')),
+    (30, 1, 10, '582', 'ivwxyz4', oils_i18n_gettext('30','See Also From Tracing -- Chronological Subdivision','acsaf','name')),
+    (31, 1, 11, '585', 'ivwxyz4', oils_i18n_gettext('31','See Also From Tracing -- Form Subdivision','acsaf','name')),
+    (32, 1, 12, '548', 'aivwxyz4', oils_i18n_gettext('32','See Also From Tracing -- Chronological Term','acsaf','name')),
+
+-- Linking entries
+    (41, 1, 1, '700', 'abcdefghjklmnopqrstvwxyz25', oils_i18n_gettext('41','Established Heading Linking Entry -- Personal Name','acsaf','name')),
+    (42, 1, 2, '710', 'abcdefghklmnoprstvwxyz25', oils_i18n_gettext('42','Established Heading Linking Entry -- Corporate Name','acsaf','name')),
+    (43, 1, 3, '711', 'acdefghklnpqstvwxyz25', oils_i18n_gettext('43','Established Heading Linking Entry -- Meeting Name','acsaf','name')),
+    (44, 1, 4, '730', 'adfghklmnoprstvwxyz25', oils_i18n_gettext('44','Established Heading Linking Entry -- Uniform Title','acsaf','name')),
+    (45, 1, 5, '750', 'abvwxyz25', oils_i18n_gettext('45','Established Heading Linking Entry -- Topical Term','acsaf','name')),
+    (46, 1, 6, '751', 'avwxyz25', oils_i18n_gettext('46','Established Heading Linking Entry -- Geographic Name','acsaf','name')),
+    (47, 1, 7, '755', 'avwxyz25', oils_i18n_gettext('47','Established Heading Linking Entry -- Genre/Form Term','acsaf','name')),
+    (48, 1, 8, '780', 'vwxyz25', oils_i18n_gettext('48','Subdivision Linking Entry -- General Subdivision','acsaf','name')),
+    (49, 1, 9, '781', 'vwxyz25', oils_i18n_gettext('49','Subdivision Linking Entry -- Geographic Subdivision','acsaf','name')),
+    (50, 1, 10, '782', 'vwxyz25', oils_i18n_gettext('50','Subdivision Linking Entry -- Chronological Subdivision','acsaf','name')),
+    (51, 1, 11, '785', 'vwxyz25', oils_i18n_gettext('51','Subdivision Linking Entry -- Form Subdivision','acsaf','name')),
+    (52, 1, 12, '748', 'avwxyz25', oils_i18n_gettext('52','Established Heading Linking Entry -- Chronological Term','acsaf','name')),
+
+-- See From tracings
+    (61, 1, 1, '400', 'abcdefiklmnopqrstvwxyz4', oils_i18n_gettext('61','See Also Tracing -- Personal Name','acsaf','name')),
+    (62, 1, 2, '410', 'abcdefgiklmnoprstvwxyz4', oils_i18n_gettext('62','See Also Tracing -- Corporate Name','acsaf','name')),
+    (63, 1, 3, '411', 'acdefgiklnpqstvwxyz4', oils_i18n_gettext('63','See Also Tracing -- Meeting Name','acsaf','name')),
+    (64, 1, 4, '430', 'adfgiklmnoprstvwxyz4', oils_i18n_gettext('64','See Also Tracing -- Uniform Title','acsaf','name')),
+    (65, 1, 5, '450', 'abivwxyz4', oils_i18n_gettext('65','See Also Tracing -- Topical Term','acsaf','name')),
+    (66, 1, 6, '451', 'aivwxyz4', oils_i18n_gettext('66','See Also Tracing -- Geographic Name','acsaf','name')),
+    (67, 1, 7, '455', 'aivwxyz4', oils_i18n_gettext('67','See Also Tracing -- Genre/Form Term','acsaf','name')),
+    (68, 1, 8, '480', 'ivwxyz4', oils_i18n_gettext('68','See Also Tracing -- General Subdivision','acsaf','name')),
+    (69, 1, 9, '481', 'ivwxyz4', oils_i18n_gettext('69','See Also Tracing -- Geographic Subdivision','acsaf','name')),
+    (70, 1, 10, '482', 'ivwxyz4', oils_i18n_gettext('70','See Also Tracing -- Chronological Subdivision','acsaf','name')),
+    (71, 1, 11, '485', 'ivwxyz4', oils_i18n_gettext('71','See Also Tracing -- Form Subdivision','acsaf','name')),
+    (72, 1, 12, '448', 'aivwxyz4', oils_i18n_gettext('72','See Also Tracing -- Chronological Term','acsaf','name'));
+
+INSERT INTO authority.browse_axis (code,name,description,sorter) VALUES
+    ('title','Title','Title axis','titlesort'),
+    ('author','Author','Author axis','titlesort'),
+    ('subject','Subject','Subject axis','titlesort'),
+    ('topic','Topic','Topic Subject axis','titlesort');
+
+INSERT INTO authority.browse_axis_authority_field_map (axis,field) VALUES
+    ('author',  1 ),
+    ('author',  2 ),
+    ('author',  3 ),
+    ('title',   4 ),
+    ('topic',   5 ),
+    ('subject', 5 ),
+    ('subject', 6 ),
+    ('subject', 7 ),
+    ('subject', 12);
+
+INSERT INTO authority.control_set_bib_field (tag, authority_field) 
+    SELECT '100', id FROM authority.control_set_authority_field WHERE tag IN ('100')
+        UNION
+    SELECT '600', id FROM authority.control_set_authority_field WHERE tag IN ('100','180','181','182','185')
+        UNION
+    SELECT '700', id FROM authority.control_set_authority_field WHERE tag IN ('100')
+        UNION
+    SELECT '800', id FROM authority.control_set_authority_field WHERE tag IN ('100')
+        UNION
+
+    SELECT '110', id FROM authority.control_set_authority_field WHERE tag IN ('110')
+        UNION
+    SELECT '610', id FROM authority.control_set_authority_field WHERE tag IN ('110')
+        UNION
+    SELECT '710', id FROM authority.control_set_authority_field WHERE tag IN ('110')
+        UNION
+    SELECT '810', id FROM authority.control_set_authority_field WHERE tag IN ('110')
+        UNION
+
+    SELECT '111', id FROM authority.control_set_authority_field WHERE tag IN ('111')
+        UNION
+    SELECT '611', id FROM authority.control_set_authority_field WHERE tag IN ('111')
+        UNION
+    SELECT '711', id FROM authority.control_set_authority_field WHERE tag IN ('111')
+        UNION
+    SELECT '811', id FROM authority.control_set_authority_field WHERE tag IN ('111')
+        UNION
+
+    SELECT '130', id FROM authority.control_set_authority_field WHERE tag IN ('130')
+        UNION
+    SELECT '240', id FROM authority.control_set_authority_field WHERE tag IN ('130')
+        UNION
+    SELECT '630', id FROM authority.control_set_authority_field WHERE tag IN ('130')
+        UNION
+    SELECT '730', id FROM authority.control_set_authority_field WHERE tag IN ('130')
+        UNION
+    SELECT '830', id FROM authority.control_set_authority_field WHERE tag IN ('130')
+        UNION
+
+    SELECT '648', id FROM authority.control_set_authority_field WHERE tag IN ('148')
+        UNION
+
+    SELECT '650', id FROM authority.control_set_authority_field WHERE tag IN ('150','180','181','182','185')
+        UNION
+    SELECT '651', id FROM authority.control_set_authority_field WHERE tag IN ('151','180','181','182','185')
+        UNION
+    SELECT '655', id FROM authority.control_set_authority_field WHERE tag IN ('155','180','181','182','185')
+;
+
+INSERT INTO authority.thesaurus (code, name, control_set) VALUES
+    ('a', oils_i18n_gettext('a','Library of Congress Subject Headings','at','name'), 1),
+    ('b', oils_i18n_gettext('b',$$LC subject headings for children's literature$$,'at','name'), 1), -- silly vim '
+    ('c', oils_i18n_gettext('c','Medical Subject Headings','at','name'), 1),
+    ('d', oils_i18n_gettext('d','National Agricultural Library subject authority file','at','name'), 1),
+    ('k', oils_i18n_gettext('k','Canadian Subject Headings','at','name'), 1),
+    ('n', oils_i18n_gettext('n','Not applicable','at','name'), 1),
+    ('r', oils_i18n_gettext('r','Art and Architecture Thesaurus','at','name'), 1),
+    ('s', oils_i18n_gettext('s','Sears List of Subject Headings','at','name'), 1),
+    ('v', oils_i18n_gettext('v','Repertoire de vedettes-matiere','at','name'), 1),
+    ('z', oils_i18n_gettext('z','Other','at','name'), 1),
+    ('|', oils_i18n_gettext('|','No attempt to code','at','name'), 1);
+CREATE OR REPLACE FUNCTION authority.map_thesaurus_to_control_set () RETURNS TRIGGER AS $func$
+BEGIN
+    IF NEW.control_set IS NULL THEN
+        SELECT  control_set INTO NEW.control_set
+          FROM  authority.thesaurus
+          WHERE vandelay.marc21_extract_fixed_field(NEW.marc,'Subj') = code;
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER map_thesaurus_to_control_set BEFORE INSERT OR UPDATE ON authority.record_entry FOR EACH ROW EXECUTE PROCEDURE authority.map_thesaurus_to_control_set ();
+
+CREATE OR REPLACE FUNCTION authority.reingest_authority_rec_descriptor( auth_id BIGINT ) RETURNS VOID AS $func$
+BEGIN
+    DELETE FROM authority.rec_descriptor WHERE record = auth_id;
+    INSERT INTO authority.rec_descriptor (record, record_status, encoding_level, thesaurus)
+        SELECT  auth_id,
+                vandelay.marc21_extract_fixed_field(marc,'RecStat'),
+                vandelay.marc21_extract_fixed_field(marc,'ELvl'),
+                vandelay.marc21_extract_fixed_field(marc,'Subj')
+          FROM  authority.record_entry
+          WHERE id = auth_id;
+     RETURN;
+ END;
+ $func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION authority.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
+BEGIN
+
+    IF NEW.deleted IS TRUE THEN -- If this authority is deleted
+        DELETE FROM authority.bib_linking WHERE authority = NEW.id; -- Avoid updating fields in bibs that are no longer visible
+        DELETE FROM authority.full_rec WHERE record = NEW.id; -- Avoid validating fields against deleted authority records
+          -- Should remove matching $0 from controlled fields at the same time?
+        RETURN NEW; -- and we're done
+    END IF;
+
+    IF TG_OP = 'UPDATE' THEN -- re-ingest?
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
+
+        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+            RETURN NEW;
+        END IF;
+        -- Propagate these updates to any linked bib records
+        PERFORM authority.propagate_changes(NEW.id) FROM authority.record_entry WHERE id = NEW.id;
+    END IF;
+
+    -- Flatten and insert the afr data
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_full_rec' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM authority.reingest_authority_full_rec(NEW.id);
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_rec_descriptor' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM authority.reingest_authority_rec_descriptor(NEW.id);
+        END IF;
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+-- Evergreen DB patch 0577.schema.vandelay-item-import-copy-loc-ancestors.sql
+--
+-- Ingest items copy location inheritance
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0577', :eg_version); -- berick
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_items ( import_id BIGINT, attr_def_id BIGINT ) RETURNS SETOF vandelay.import_item AS $$
+DECLARE
+
+    owning_lib      TEXT;
+    circ_lib        TEXT;
+    call_number     TEXT;
+    copy_number     TEXT;
+    status          TEXT;
+    location        TEXT;
+    circulate       TEXT;
+    deposit         TEXT;
+    deposit_amount  TEXT;
+    ref             TEXT;
+    holdable        TEXT;
+    price           TEXT;
+    barcode         TEXT;
+    circ_modifier   TEXT;
+    circ_as_type    TEXT;
+    alert_message   TEXT;
+    opac_visible    TEXT;
+    pub_note        TEXT;
+    priv_note       TEXT;
+
+    attr_def        RECORD;
+    tmp_attr_set    RECORD;
+    attr_set        vandelay.import_item%ROWTYPE;
+
+    xpath           TEXT;
+
+BEGIN
+
+    SELECT * INTO attr_def FROM vandelay.import_item_attr_definition WHERE id = attr_def_id;
+
+    IF FOUND THEN
+
+        attr_set.definition := attr_def.id;
+
+        -- Build the combined XPath
+
+        owning_lib :=
+            CASE
+                WHEN attr_def.owning_lib IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.owning_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.owning_lib || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.owning_lib
+            END;
+
+        circ_lib :=
+            CASE
+                WHEN attr_def.circ_lib IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_lib || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_lib
+            END;
+
+        call_number :=
+            CASE
+                WHEN attr_def.call_number IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.call_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.call_number || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.call_number
+            END;
+
+        copy_number :=
+            CASE
+                WHEN attr_def.copy_number IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.copy_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.copy_number || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.copy_number
+            END;
+
+        status :=
+            CASE
+                WHEN attr_def.status IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.status ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.status || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.status
+            END;
+
+        location :=
+            CASE
+                WHEN attr_def.location IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.location ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.location || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.location
+            END;
+
+        circulate :=
+            CASE
+                WHEN attr_def.circulate IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circulate ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circulate || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circulate
+            END;
+
+        deposit :=
+            CASE
+                WHEN attr_def.deposit IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.deposit ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit
+            END;
+
+        deposit_amount :=
+            CASE
+                WHEN attr_def.deposit_amount IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.deposit_amount ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit_amount || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit_amount
+            END;
+
+        ref :=
+            CASE
+                WHEN attr_def.ref IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.ref ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.ref || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.ref
+            END;
+
+        holdable :=
+            CASE
+                WHEN attr_def.holdable IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.holdable ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.holdable || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.holdable
+            END;
+
+        price :=
+            CASE
+                WHEN attr_def.price IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.price ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.price || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.price
+            END;
+
+        barcode :=
+            CASE
+                WHEN attr_def.barcode IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.barcode ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.barcode || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.barcode
+            END;
+
+        circ_modifier :=
+            CASE
+                WHEN attr_def.circ_modifier IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_modifier ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_modifier || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_modifier
+            END;
+
+        circ_as_type :=
+            CASE
+                WHEN attr_def.circ_as_type IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_as_type ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_as_type || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_as_type
+            END;
+
+        alert_message :=
+            CASE
+                WHEN attr_def.alert_message IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.alert_message ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.alert_message || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.alert_message
+            END;
+
+        opac_visible :=
+            CASE
+                WHEN attr_def.opac_visible IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.opac_visible ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.opac_visible || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.opac_visible
+            END;
+
+        pub_note :=
+            CASE
+                WHEN attr_def.pub_note IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.pub_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.pub_note || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.pub_note
+            END;
+        priv_note :=
+            CASE
+                WHEN attr_def.priv_note IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.priv_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.priv_note || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.priv_note
+            END;
+
+
+        xpath :=
+            owning_lib      || '|' ||
+            circ_lib        || '|' ||
+            call_number     || '|' ||
+            copy_number     || '|' ||
+            status          || '|' ||
+            location        || '|' ||
+            circulate       || '|' ||
+            deposit         || '|' ||
+            deposit_amount  || '|' ||
+            ref             || '|' ||
+            holdable        || '|' ||
+            price           || '|' ||
+            barcode         || '|' ||
+            circ_modifier   || '|' ||
+            circ_as_type    || '|' ||
+            alert_message   || '|' ||
+            pub_note        || '|' ||
+            priv_note       || '|' ||
+            opac_visible;
+
+        -- RAISE NOTICE 'XPath: %', xpath;
+
+        FOR tmp_attr_set IN
+                SELECT  *
+                  FROM  oils_xpath_table( 'id', 'marc', 'vandelay.queued_bib_record', xpath, 'id = ' || import_id )
+                            AS t( id INT, ol TEXT, clib TEXT, cn TEXT, cnum TEXT, cs TEXT, cl TEXT, circ TEXT,
+                                  dep TEXT, dep_amount TEXT, r TEXT, hold TEXT, pr TEXT, bc TEXT, circ_mod TEXT,
+                                  circ_as TEXT, amessage TEXT, note TEXT, pnote TEXT, opac_vis TEXT )
+        LOOP
+
+            tmp_attr_set.pr = REGEXP_REPLACE(tmp_attr_set.pr, E'[^0-9\\.]', '', 'g');
+            tmp_attr_set.dep_amount = REGEXP_REPLACE(tmp_attr_set.dep_amount, E'[^0-9\\.]', '', 'g');
+
+            tmp_attr_set.pr := NULLIF( tmp_attr_set.pr, '' );
+            tmp_attr_set.dep_amount := NULLIF( tmp_attr_set.dep_amount, '' );
+
+            SELECT id INTO attr_set.owning_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.ol); -- INT
+            SELECT id INTO attr_set.circ_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.clib); -- INT
+            SELECT id INTO attr_set.status FROM config.copy_status WHERE LOWER(name) = LOWER(tmp_attr_set.cs); -- INT
+
+
+            -- search up the org unit tree for a matching copy location
+
+            WITH RECURSIVE anscestor_depth AS (
+                SELECT  ou.id,
+                    out.depth AS depth,
+                    ou.parent_ou
+                FROM  actor.org_unit ou
+                    JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                WHERE ou.id = COALESCE(attr_set.owning_lib, attr_set.circ_lib)
+                    UNION ALL
+                SELECT  ou.id,
+                    out.depth,
+                    ou.parent_ou
+                FROM  actor.org_unit ou
+                    JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                    JOIN anscestor_depth ot ON (ot.parent_ou = ou.id)
+            ) SELECT  cpl.id INTO attr_set.location
+                FROM  anscestor_depth a
+                    JOIN asset.copy_location cpl ON (cpl.owning_lib = a.id)
+                WHERE LOWER(cpl.name) = LOWER(tmp_attr_set.cl)
+                ORDER BY a.depth DESC
+                LIMIT 1; 
+
+            attr_set.circulate      :=
+                LOWER( SUBSTRING( tmp_attr_set.circ, 1, 1)) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.circ) = 'circulating'; -- BOOL
+
+            attr_set.deposit        :=
+                LOWER( SUBSTRING( tmp_attr_set.dep, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.dep) = 'deposit'; -- BOOL
+
+            attr_set.holdable       :=
+                LOWER( SUBSTRING( tmp_attr_set.hold, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.hold) = 'holdable'; -- BOOL
+
+            attr_set.opac_visible   :=
+                LOWER( SUBSTRING( tmp_attr_set.opac_vis, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.opac_vis) = 'visible'; -- BOOL
+
+            attr_set.ref            :=
+                LOWER( SUBSTRING( tmp_attr_set.r, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.r) = 'reference'; -- BOOL
+
+            attr_set.copy_number    := tmp_attr_set.cnum::INT; -- INT,
+            attr_set.deposit_amount := tmp_attr_set.dep_amount::NUMERIC(6,2); -- NUMERIC(6,2),
+            attr_set.price          := tmp_attr_set.pr::NUMERIC(8,2); -- NUMERIC(8,2),
+
+            attr_set.call_number    := tmp_attr_set.cn; -- TEXT
+            attr_set.barcode        := tmp_attr_set.bc; -- TEXT,
+            attr_set.circ_modifier  := tmp_attr_set.circ_mod; -- TEXT,
+            attr_set.circ_as_type   := tmp_attr_set.circ_as; -- TEXT,
+            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
+            attr_set.pub_note       := tmp_attr_set.note; -- TEXT,
+            attr_set.priv_note      := tmp_attr_set.pnote; -- TEXT,
+            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
+
+            RETURN NEXT attr_set;
+
+        END LOOP;
+
+    END IF;
+
+    RETURN;
+
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+-- Evergreen DB patch XXXX.data.org-setting-ui.circ.billing.uncheck_bills_and_unfocus_payment_box.sql
+--
+-- New org setting ui.circ.billing.uncheck_bills_and_unfocus_payment_box
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0584', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) 
+    VALUES ( 
+        'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+        oils_i18n_gettext(
+            'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+            'GUI: Uncheck bills by default in the patron billing interface',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'ui.circ.billing.uncheck_bills_and_unfocus_payment_box',
+            'Uncheck bills by default in the patron billing interface,'
+            || ' and focus on the Uncheck All button instead of the'
+            || ' Payment Received field.',
+            'coust',
+            'description'
+        ),
+        'bool'
+    );
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0585', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype ) VALUES
+( 'circ.checkout_fills_related_hold_exact_match_only',
+    'Checkout Fills Related Hold On Valid Copy Only',
+    'When filling related holds on checkout only match on items that are valid for opportunistic capture for the hold. Without this set a Title or Volume hold could match when the item is not holdable. With this set only holdable items will match.',
+    'bool');
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0586', :eg_version);
+
+INSERT INTO permission.perm_list (id, code, description) VALUES (
+    511,
+    'PERSISTENT_LOGIN',
+    oils_i18n_gettext(
+        511,
+        'Allows a user to authenticate and get a long-lived session (length configured in opensrf.xml)',
+        'ppl',
+        'description'
+    )
+);
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+    SELECT
+        pgt.id, perm.id, aout.depth, FALSE
+    FROM
+        permission.grp_tree pgt,
+        permission.perm_list perm,
+        actor.org_unit_type aout
+    WHERE
+        pgt.name = 'Users' AND
+        aout.name = 'Consortium' AND
+        perm.code = 'PERSISTENT_LOGIN';
+
+\qecho 
+\qecho If this transaction succeeded, your users (staff and patrons) now have
+\qecho the PERSISTENT_LOGIN permission by default.
+\qecho 
+
+
+-- Evergreen DB patch XXXX.data.org-setting-circ.offline.skip_foo_if_newer_status_changed_time.sql
+--
+-- New org setting circ.offline.skip_checkout_if_newer_status_changed_time
+-- New org setting circ.offline.skip_renew_if_newer_status_changed_time
+-- New org setting circ.offline.skip_checkin_if_newer_status_changed_time
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0593', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) 
+    VALUES ( 
+        'circ.offline.skip_checkout_if_newer_status_changed_time',
+        oils_i18n_gettext(
+            'circ.offline.skip_checkout_if_newer_status_changed_time',
+            'Offline: Skip offline checkout if newer item Status Changed Time.',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.offline.skip_checkout_if_newer_status_changed_time',
+            'Skip offline checkout transaction (raise exception when'
+            || ' processing) if item Status Changed Time is newer than the'
+            || ' recorded transaction time.  WARNING: The Reshelving to'
+            || ' Available status rollover will trigger this.',
+            'coust',
+            'description'
+        ),
+        'bool'
+    ),( 
+        'circ.offline.skip_renew_if_newer_status_changed_time',
+        oils_i18n_gettext(
+            'circ.offline.skip_renew_if_newer_status_changed_time',
+            'Offline: Skip offline renewal if newer item Status Changed Time.',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.offline.skip_renew_if_newer_status_changed_time',
+            'Skip offline renewal transaction (raise exception when'
+            || ' processing) if item Status Changed Time is newer than the'
+            || ' recorded transaction time.  WARNING: The Reshelving to'
+            || ' Available status rollover will trigger this.',
+            'coust',
+            'description'
+        ),
+        'bool'
+    ),( 
+        'circ.offline.skip_checkin_if_newer_status_changed_time',
+        oils_i18n_gettext(
+            'circ.offline.skip_checkin_if_newer_status_changed_time',
+            'Offline: Skip offline checkin if newer item Status Changed Time.',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.offline.skip_checkin_if_newer_status_changed_time',
+            'Skip offline checkin transaction (raise exception when'
+            || ' processing) if item Status Changed Time is newer than the'
+            || ' recorded transaction time.  WARNING: The Reshelving to'
+            || ' Available status rollover will trigger this.',
+            'coust',
+            'description'
+        ),
+        'bool'
+    );
+
+-- Evergreen DB patch YYYY.schema.acp_status_date_changed.sql
+--
+-- Change trigger which updates copy status_changed_time to ignore the
+-- Reshelving->Available status rollover
+
+-- FIXME: 0039.schema.acp_status_date_changed.sql defines this the first time
+-- around, but along with the column itself, etc.  And it gets modified with
+-- 0562.schema.copy_active_date.sql.  Not sure how to use the supercedes /
+-- deprecate stuff for upgrade scripts, if it's even applicable when a given
+-- upgrade script is doing so much.
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0594', :eg_version);
+
+CREATE OR REPLACE FUNCTION asset.acp_status_changed()
+RETURNS TRIGGER AS $$
+BEGIN
+       IF NEW.status <> OLD.status AND NOT (NEW.status = 0 AND OLD.status = 7) THEN
+        NEW.status_changed_time := now();
+        IF NEW.active_date IS NULL AND NEW.status IN (SELECT id FROM config.copy_status WHERE copy_active = true) THEN
+            NEW.active_date := now();
+        END IF;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Evergreen DB patch 0595.data.org-setting-ui.patron_search.result_cap.sql
+--
+-- New org setting ui.patron_search.result_cap
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0595', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype )
+    VALUES (
+        'ui.patron_search.result_cap',
+        oils_i18n_gettext(
+            'ui.patron_search.result_cap',
+            'GUI: Cap results in Patron Search at this number.',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'ui.patron_search.result_cap',
+            'So for example, if you search for John Doe, normally you would get'
+            || ' at most 50 results.  This setting allows you to raise or lower'
+            || ' that limit.',
+            'coust',
+            'description'
+        ),
+        'integer'
+    );
+
+-- Evergreen DB patch 0596.schema.vandelay-item-import-error-detail.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0596', :eg_version);
+
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.status', oils_i18n_gettext('import.item.invalid.status', 'Invalid value for "status"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.price', oils_i18n_gettext('import.item.invalid.price', 'Invalid value for "price"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.deposit_amount', oils_i18n_gettext('import.item.invalid.deposit_amount', 'Invalid value for "deposit_amount"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.owning_lib', oils_i18n_gettext('import.item.invalid.owning_lib', 'Invalid value for "owning_lib"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.circ_lib', oils_i18n_gettext('import.item.invalid.circ_lib', 'Invalid value for "circ_lib"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.copy_number', oils_i18n_gettext('import.item.invalid.copy_number', 'Invalid value for "copy_number"', 'vie', 'description') );
+INSERT INTO vandelay.import_error ( code, description ) VALUES ( 
+    'import.item.invalid.circ_as_type', oils_i18n_gettext('import.item.invalid.circ_as_type', 'Invalid value for "circ_as_type"', 'vie', 'description') );
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_items ( import_id BIGINT, attr_def_id BIGINT ) RETURNS SETOF vandelay.import_item AS $$
+DECLARE
+
+    owning_lib      TEXT;
+    circ_lib        TEXT;
+    call_number     TEXT;
+    copy_number     TEXT;
+    status          TEXT;
+    location        TEXT;
+    circulate       TEXT;
+    deposit         TEXT;
+    deposit_amount  TEXT;
+    ref             TEXT;
+    holdable        TEXT;
+    price           TEXT;
+    barcode         TEXT;
+    circ_modifier   TEXT;
+    circ_as_type    TEXT;
+    alert_message   TEXT;
+    opac_visible    TEXT;
+    pub_note        TEXT;
+    priv_note       TEXT;
+
+    attr_def        RECORD;
+    tmp_attr_set    RECORD;
+    attr_set        vandelay.import_item%ROWTYPE;
+
+    xpath           TEXT;
+    tmp_str         TEXT;
+
+BEGIN
+
+    SELECT * INTO attr_def FROM vandelay.import_item_attr_definition WHERE id = attr_def_id;
+
+    IF FOUND THEN
+
+        attr_set.definition := attr_def.id;
+
+        -- Build the combined XPath
+
+        owning_lib :=
+            CASE
+                WHEN attr_def.owning_lib IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.owning_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.owning_lib || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.owning_lib
+            END;
+
+        circ_lib :=
+            CASE
+                WHEN attr_def.circ_lib IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_lib ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_lib || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_lib
+            END;
+
+        call_number :=
+            CASE
+                WHEN attr_def.call_number IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.call_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.call_number || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.call_number
+            END;
+
+        copy_number :=
+            CASE
+                WHEN attr_def.copy_number IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.copy_number ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.copy_number || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.copy_number
+            END;
+
+        status :=
+            CASE
+                WHEN attr_def.status IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.status ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.status || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.status
+            END;
+
+        location :=
+            CASE
+                WHEN attr_def.location IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.location ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.location || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.location
+            END;
+
+        circulate :=
+            CASE
+                WHEN attr_def.circulate IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circulate ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circulate || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circulate
+            END;
+
+        deposit :=
+            CASE
+                WHEN attr_def.deposit IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.deposit ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit
+            END;
+
+        deposit_amount :=
+            CASE
+                WHEN attr_def.deposit_amount IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.deposit_amount ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.deposit_amount || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.deposit_amount
+            END;
+
+        ref :=
+            CASE
+                WHEN attr_def.ref IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.ref ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.ref || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.ref
+            END;
+
+        holdable :=
+            CASE
+                WHEN attr_def.holdable IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.holdable ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.holdable || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.holdable
+            END;
+
+        price :=
+            CASE
+                WHEN attr_def.price IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.price ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.price || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.price
+            END;
+
+        barcode :=
+            CASE
+                WHEN attr_def.barcode IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.barcode ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.barcode || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.barcode
+            END;
+
+        circ_modifier :=
+            CASE
+                WHEN attr_def.circ_modifier IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_modifier ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_modifier || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_modifier
+            END;
+
+        circ_as_type :=
+            CASE
+                WHEN attr_def.circ_as_type IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.circ_as_type ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.circ_as_type || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.circ_as_type
+            END;
+
+        alert_message :=
+            CASE
+                WHEN attr_def.alert_message IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.alert_message ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.alert_message || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.alert_message
+            END;
+
+        opac_visible :=
+            CASE
+                WHEN attr_def.opac_visible IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.opac_visible ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.opac_visible || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.opac_visible
+            END;
+
+        pub_note :=
+            CASE
+                WHEN attr_def.pub_note IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.pub_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.pub_note || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.pub_note
+            END;
+        priv_note :=
+            CASE
+                WHEN attr_def.priv_note IS NULL THEN 'null()'
+                WHEN LENGTH( attr_def.priv_note ) = 1 THEN '//*[@tag="' || attr_def.tag || '"]/*[@code="' || attr_def.priv_note || '"]'
+                ELSE '//*[@tag="' || attr_def.tag || '"]/*' || attr_def.priv_note
+            END;
+
+
+        xpath :=
+            owning_lib      || '|' ||
+            circ_lib        || '|' ||
+            call_number     || '|' ||
+            copy_number     || '|' ||
+            status          || '|' ||
+            location        || '|' ||
+            circulate       || '|' ||
+            deposit         || '|' ||
+            deposit_amount  || '|' ||
+            ref             || '|' ||
+            holdable        || '|' ||
+            price           || '|' ||
+            barcode         || '|' ||
+            circ_modifier   || '|' ||
+            circ_as_type    || '|' ||
+            alert_message   || '|' ||
+            pub_note        || '|' ||
+            priv_note       || '|' ||
+            opac_visible;
+
+        FOR tmp_attr_set IN
+                SELECT  *
+                  FROM  oils_xpath_table( 'id', 'marc', 'vandelay.queued_bib_record', xpath, 'id = ' || import_id )
+                            AS t( id INT, ol TEXT, clib TEXT, cn TEXT, cnum TEXT, cs TEXT, cl TEXT, circ TEXT,
+                                  dep TEXT, dep_amount TEXT, r TEXT, hold TEXT, pr TEXT, bc TEXT, circ_mod TEXT,
+                                  circ_as TEXT, amessage TEXT, note TEXT, pnote TEXT, opac_vis TEXT )
+        LOOP
+
+            attr_set.import_error := NULL;
+            attr_set.error_detail := NULL;
+            attr_set.deposit_amount := NULL;
+            attr_set.copy_number := NULL;
+            attr_set.price := NULL;
+
+            IF tmp_attr_set.pr != '' THEN
+                tmp_str = REGEXP_REPLACE(tmp_attr_set.pr, E'[^0-9\\.]', '', 'g');
+                IF tmp_str = '' THEN 
+                    attr_set.import_error := 'import.item.invalid.price';
+                    attr_set.error_detail := tmp_attr_set.pr; -- original value
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+                attr_set.price := tmp_str::NUMERIC(8,2); 
+            END IF;
+
+            IF tmp_attr_set.dep_amount != '' THEN
+                tmp_str = REGEXP_REPLACE(tmp_attr_set.dep_amount, E'[^0-9\\.]', '', 'g');
+                IF tmp_str = '' THEN 
+                    attr_set.import_error := 'import.item.invalid.deposit_amount';
+                    attr_set.error_detail := tmp_attr_set.dep_amount; 
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+                attr_set.deposit_amount := tmp_str::NUMERIC(8,2); 
+            END IF;
+
+            IF tmp_attr_set.cnum != '' THEN
+                tmp_str = REGEXP_REPLACE(tmp_attr_set.cnum, E'[^0-9]', '', 'g');
+                IF tmp_str = '' THEN 
+                    attr_set.import_error := 'import.item.invalid.copy_number';
+                    attr_set.error_detail := tmp_attr_set.cnum; 
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+                attr_set.copy_number := tmp_str::INT; 
+            END IF;
+
+            IF tmp_attr_set.ol != '' THEN
+                SELECT id INTO attr_set.owning_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.ol); -- INT
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.owning_lib';
+                    attr_set.error_detail := tmp_attr_set.ol;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            IF tmp_attr_set.clib != '' THEN
+                SELECT id INTO attr_set.circ_lib FROM actor.org_unit WHERE shortname = UPPER(tmp_attr_set.clib); -- INT
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.circ_lib';
+                    attr_set.error_detail := tmp_attr_set.clib;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            IF tmp_attr_set.cs != '' THEN
+                SELECT id INTO attr_set.status FROM config.copy_status WHERE LOWER(name) = LOWER(tmp_attr_set.cs); -- INT
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.status';
+                    attr_set.error_detail := tmp_attr_set.cs;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            IF tmp_attr_set.circ_mod != '' THEN
+                SELECT code INTO attr_set.circ_modifier FROM config.circ_modifier WHERE code = tmp_attr_set.circ_mod;
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.circ_modifier';
+                    attr_set.error_detail := tmp_attr_set.circ_mod;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            IF tmp_attr_set.circ_as != '' THEN
+                SELECT code INTO attr_set.circ_as_type FROM config.coded_value_map WHERE ctype = 'item_type' AND code = tmp_attr_set.circ_as;
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.circ_as_type';
+                    attr_set.error_detail := tmp_attr_set.circ_as;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            IF tmp_attr_set.cl != '' THEN
+
+                -- search up the org unit tree for a matching copy location
+                WITH RECURSIVE anscestor_depth AS (
+                    SELECT  ou.id,
+                        out.depth AS depth,
+                        ou.parent_ou
+                    FROM  actor.org_unit ou
+                        JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                    WHERE ou.id = COALESCE(attr_set.owning_lib, attr_set.circ_lib)
+                        UNION ALL
+                    SELECT  ou.id,
+                        out.depth,
+                        ou.parent_ou
+                    FROM  actor.org_unit ou
+                        JOIN actor.org_unit_type out ON (out.id = ou.ou_type)
+                        JOIN anscestor_depth ot ON (ot.parent_ou = ou.id)
+                ) SELECT  cpl.id INTO attr_set.location
+                    FROM  anscestor_depth a
+                        JOIN asset.copy_location cpl ON (cpl.owning_lib = a.id)
+                    WHERE LOWER(cpl.name) = LOWER(tmp_attr_set.cl)
+                    ORDER BY a.depth DESC
+                    LIMIT 1; 
+
+                IF NOT FOUND THEN
+                    attr_set.import_error := 'import.item.invalid.location';
+                    attr_set.error_detail := tmp_attr_set.cs;
+                    RETURN NEXT attr_set; CONTINUE; 
+                END IF;
+            END IF;
+
+            attr_set.circulate      :=
+                LOWER( SUBSTRING( tmp_attr_set.circ, 1, 1)) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.circ) = 'circulating'; -- BOOL
+
+            attr_set.deposit        :=
+                LOWER( SUBSTRING( tmp_attr_set.dep, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.dep) = 'deposit'; -- BOOL
+
+            attr_set.holdable       :=
+                LOWER( SUBSTRING( tmp_attr_set.hold, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.hold) = 'holdable'; -- BOOL
+
+            attr_set.opac_visible   :=
+                LOWER( SUBSTRING( tmp_attr_set.opac_vis, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.opac_vis) = 'visible'; -- BOOL
+
+            attr_set.ref            :=
+                LOWER( SUBSTRING( tmp_attr_set.r, 1, 1 ) ) IN ('t','y','1')
+                OR LOWER(tmp_attr_set.r) = 'reference'; -- BOOL
+
+            attr_set.call_number    := tmp_attr_set.cn; -- TEXT
+            attr_set.barcode        := tmp_attr_set.bc; -- TEXT,
+            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
+            attr_set.pub_note       := tmp_attr_set.note; -- TEXT,
+            attr_set.priv_note      := tmp_attr_set.pnote; -- TEXT,
+            attr_set.alert_message  := tmp_attr_set.amessage; -- TEXT,
+
+            RETURN NEXT attr_set;
+
+        END LOOP;
+
+    END IF;
+
+    RETURN;
+
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay.ingest_bib_items ( ) RETURNS TRIGGER AS $func$
+DECLARE
+    attr_def    BIGINT;
+    item_data   vandelay.import_item%ROWTYPE;
+BEGIN
+
+    IF TG_OP IN ('INSERT','UPDATE') AND NEW.imported_as IS NOT NULL THEN
+        RETURN NEW;
+    END IF;
+
+    SELECT item_attr_def INTO attr_def FROM vandelay.bib_queue WHERE id = NEW.queue;
+
+    FOR item_data IN SELECT * FROM vandelay.ingest_items( NEW.id::BIGINT, attr_def ) LOOP
+        INSERT INTO vandelay.import_item (
+            record,
+            definition,
+            owning_lib,
+            circ_lib,
+            call_number,
+            copy_number,
+            status,
+            location,
+            circulate,
+            deposit,
+            deposit_amount,
+            ref,
+            holdable,
+            price,
+            barcode,
+            circ_modifier,
+            circ_as_type,
+            alert_message,
+            pub_note,
+            priv_note,
+            opac_visible,
+            import_error,
+            error_detail
+        ) VALUES (
+            NEW.id,
+            item_data.definition,
+            item_data.owning_lib,
+            item_data.circ_lib,
+            item_data.call_number,
+            item_data.copy_number,
+            item_data.status,
+            item_data.location,
+            item_data.circulate,
+            item_data.deposit,
+            item_data.deposit_amount,
+            item_data.ref,
+            item_data.holdable,
+            item_data.price,
+            item_data.barcode,
+            item_data.circ_modifier,
+            item_data.circ_as_type,
+            item_data.alert_message,
+            item_data.pub_note,
+            item_data.priv_note,
+            item_data.opac_visible,
+            item_data.import_error,
+            item_data.error_detail
+        );
+    END LOOP;
+
+    RETURN NULL;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch XXXX.schema.vandelay.bib_match_isxn_caseless.sql
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0597', :eg_version);
+
+CREATE INDEX metabib_full_rec_isxn_caseless_idx
+    ON metabib.real_full_rec (LOWER(value))
+    WHERE tag IN ('020', '022', '024');
+
+
+CREATE OR REPLACE FUNCTION vandelay.flatten_marc_hstore(
+    record_xml TEXT
+) RETURNS HSTORE AS $$
+BEGIN
+    RETURN (SELECT
+        HSTORE(
+            ARRAY_ACCUM(tag || (COALESCE(subfield, ''))),
+            ARRAY_ACCUM(value)
+        )
+        FROM (
+            SELECT
+                tag, subfield,
+                CASE WHEN tag IN ('020', '022', '024') THEN  -- caseless
+                    ARRAY_ACCUM(LOWER(value))::TEXT
+                ELSE
+                    ARRAY_ACCUM(value)::TEXT
+                END AS value
+                FROM vandelay.flatten_marc(record_xml)
+                GROUP BY tag, subfield ORDER BY tag, subfield
+        ) subquery
+    );
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay._get_expr_push_jrow(
+    node vandelay.match_set_point
+) RETURNS VOID AS $$
+DECLARE
+    jrow        TEXT;
+    my_alias    TEXT;
+    op          TEXT;
+    tagkey      TEXT;
+    caseless    BOOL;
+BEGIN
+    -- remember $1 is tags_rstore, and $2 is svf_rstore
+
+    IF node.negate THEN
+        op := '<>';
+    ELSE
+        op := '=';
+    END IF;
+
+    caseless := FALSE;
+
+    IF node.tag IS NOT NULL THEN
+        caseless := (node.tag IN ('020', '022', '024'));
+        tagkey := node.tag;
+        IF node.subfield IS NOT NULL THEN
+            tagkey := tagkey || node.subfield;
+        END IF;
+    END IF;
+
+    my_alias := 'n' || node.id::TEXT;
+
+    jrow := 'LEFT JOIN (SELECT *, ' || node.quality ||
+        ' AS quality FROM metabib.';
+    IF node.tag IS NOT NULL THEN
+        jrow := jrow || 'full_rec) ' || my_alias || ' ON (' ||
+            my_alias || '.record = bre.id AND ' || my_alias || '.tag = ''' ||
+            node.tag || '''';
+        IF node.subfield IS NOT NULL THEN
+            jrow := jrow || ' AND ' || my_alias || '.subfield = ''' ||
+                node.subfield || '''';
+        END IF;
+        jrow := jrow || ' AND (';
+
+        IF caseless THEN
+            jrow := jrow || 'LOWER(' || my_alias || '.value) ' || op;
+        ELSE
+            jrow := jrow || my_alias || '.value ' || op;
+        END IF;
+
+        jrow := jrow || ' ANY(($1->''' || tagkey || ''')::TEXT[])))';
+    ELSE    -- svf
+        jrow := jrow || 'record_attr) ' || my_alias || ' ON (' ||
+            my_alias || '.id = bre.id AND (' ||
+            my_alias || '.attrs->''' || node.svf ||
+            ''' ' || op || ' $2->''' || node.svf || '''))';
+    END IF;
+    INSERT INTO _vandelay_tmp_jrows (j) VALUES (jrow);
+END;
+$$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0598.schema.vandelay_one_match_per.sql
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0598', :eg_version);
+
+CREATE OR REPLACE FUNCTION vandelay.match_set_test_marcxml(
+    match_set_id INTEGER, record_xml TEXT
+) RETURNS SETOF vandelay.match_set_test_result AS $$
+DECLARE
+    tags_rstore HSTORE;
+    svf_rstore  HSTORE;
+    coal        TEXT;
+    joins       TEXT;
+    query_      TEXT;
+    wq          TEXT;
+    qvalue      INTEGER;
+    rec         RECORD;
+BEGIN
+    tags_rstore := vandelay.flatten_marc_hstore(record_xml);
+    svf_rstore := vandelay.extract_rec_attrs(record_xml);
+
+    CREATE TEMPORARY TABLE _vandelay_tmp_qrows (q INTEGER);
+    CREATE TEMPORARY TABLE _vandelay_tmp_jrows (j TEXT);
+
+    -- generate the where clause and return that directly (into wq), and as
+    -- a side-effect, populate the _vandelay_tmp_[qj]rows tables.
+    wq := vandelay.get_expr_from_match_set(match_set_id);
+
+    query_ := 'SELECT DISTINCT(bre.id) AS record, ';
+
+    -- qrows table is for the quality bits we add to the SELECT clause
+    SELECT ARRAY_TO_STRING(
+        ARRAY_ACCUM('COALESCE(n' || q::TEXT || '.quality, 0)'), ' + '
+    ) INTO coal FROM _vandelay_tmp_qrows;
+
+    -- our query string so far is the SELECT clause and the inital FROM.
+    -- no JOINs yet nor the WHERE clause
+    query_ := query_ || coal || ' AS quality ' || E'\n' ||
+        'FROM biblio.record_entry bre ';
+
+    -- jrows table is for the joins we must make (and the real text conditions)
+    SELECT ARRAY_TO_STRING(ARRAY_ACCUM(j), E'\n') INTO joins
+        FROM _vandelay_tmp_jrows;
+
+    -- add those joins and the where clause to our query.
+    query_ := query_ || joins || E'\n' || 'WHERE ' || wq || ' AND not bre.deleted';
+
+    -- this will return rows of record,quality
+    FOR rec IN EXECUTE query_ USING tags_rstore, svf_rstore LOOP
+        RETURN NEXT rec;
+    END LOOP;
+
+    DROP TABLE _vandelay_tmp_qrows;
+    DROP TABLE _vandelay_tmp_jrows;
+    RETURN;
+END;
+
+$$ LANGUAGE PLPGSQL;
+
+-- Evergreen DB patch 0606.schema.czs_use_perm_column.sql
+--
+-- This adds a column to config.z3950_source called use_perm.
+-- The idea is that if a permission is set for a given source,
+-- then staff will need the referenced permission to use that
+-- source.
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0606', :eg_version);
+
+ALTER TABLE config.z3950_source 
+    ADD COLUMN use_perm INT REFERENCES permission.perm_list (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
+
+COMMENT ON COLUMN config.z3950_source.use_perm IS $$
+If set, this permission is required for the source to be listed in the staff
+client Z39.50 interface.  Similar to permission.grp_tree.application_perm.
+$$;
+
+-- Evergreen DB patch 0608.data.vandelay-export-error-match-info.sql
+--
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0608', :eg_version);
+
+-- Add vqbr.import_error, vqbr.error_detail, and vqbr.matches.size to queue print output
+
+UPDATE action_trigger.event_definition SET template = $$
+[%- USE date -%]
+<pre>
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+    [% FOR vqbr IN target %]
+=-=-=
+ Title of work    | [% helpers.get_queued_bib_attr('title',vqbr.attributes) %]
+ Author of work   | [% helpers.get_queued_bib_attr('author',vqbr.attributes) %]
+ Language of work | [% helpers.get_queued_bib_attr('language',vqbr.attributes) %]
+ Pagination       | [% helpers.get_queued_bib_attr('pagination',vqbr.attributes) %]
+ ISBN             | [% helpers.get_queued_bib_attr('isbn',vqbr.attributes) %]
+ ISSN             | [% helpers.get_queued_bib_attr('issn',vqbr.attributes) %]
+ Price            | [% helpers.get_queued_bib_attr('price',vqbr.attributes) %]
+ Accession Number | [% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) %]
+ TCN Value        | [% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) %]
+ TCN Source       | [% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) %]
+ Internal ID      | [% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) %]
+ Publisher        | [% helpers.get_queued_bib_attr('publisher',vqbr.attributes) %]
+ Publication Date | [% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) %]
+ Edition          | [% helpers.get_queued_bib_attr('edition',vqbr.attributes) %]
+ Item Barcode     | [% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) %]
+ Import Error     | [% vqbr.import_error %]
+ Error Detail     | [% vqbr.error_detail %]
+ Match Count      | [% vqbr.matches.size %]
+
+    [% END %]
+</pre>
+$$
+WHERE id = 39;
+
+
+-- Do the same for the CVS version
+
+UPDATE action_trigger.event_definition SET template = $$
+[%- USE date -%]
+"Title of work","Author of work","Language of work","Pagination","ISBN","ISSN","Price","Accession Number","TCN Value","TCN Source","Internal ID","Publisher","Publication Date","Edition","Item Barcode","Import Error","Error Detail","Match Count"
+[% FOR vqbr IN target %]"[% helpers.get_queued_bib_attr('title',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('author',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('language',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pagination',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('issn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('price',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('publisher',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('edition',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) | replace('"', '""') %]","[% vqbr.import_error | replace('"', '""') %]","[% vqbr.error_detail | replace('"', '""') %]","[% vqbr.matches.size %]"
+[% END %]
+$$
+WHERE id = 40;
+
+-- Add matches to the env for both
+INSERT INTO action_trigger.environment (event_def, path) VALUES (39, 'matches');
+INSERT INTO action_trigger.environment (event_def, path) VALUES (40, 'matches');
+
+
+-- Evergreen DB patch XXXX.data.acq-copy-creator-from-receiver.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0609', :eg_version);
+
+ALTER TABLE acq.lineitem_detail 
+    ADD COLUMN receiver        INT REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED;
+
+
+-- Evergreen DB patch XXXX.data.acq-copy-creator-from-receiver.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0610', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+    'acq.copy_creator_uses_receiver',
+    oils_i18n_gettext( 
+        'acq.copy_creator_uses_receiver',
+        'Acq: Set copy creator as receiver',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext( 
+        'acq.copy_creator_uses_receiver',
+        'When receiving a copy in acquisitions, set the copy "creator" to be the staff that received the copy',
+        'coust',
+        'label'
+    ),
+    'bool'
+);
+
+-- Evergreen DB patch 0611.data.magic_macros.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0611', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype ) VALUES
+(
+        'circ.staff_client.receipt.header_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.header_text',
+            'Receipt Template: Content of header_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.header_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(header_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.footer_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.footer_text',
+            'Receipt Template: Content of footer_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.footer_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(footer_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.notice_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.notice_text',
+            'Receipt Template: Content of notice_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.notice_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(notice_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.alert_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.alert_text',
+            'Receipt Template: Content of alert_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.alert_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(alert_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.event_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.event_text',
+            'Receipt Template: Content of event_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.event_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(event_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    );
+
+-- Evergreen DB patch 0612.schema.authority_overlay_protection.sql
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0612', :eg_version);
+
+-- FIXME: add/check SQL statements to perform the upgrade
+
+-- Function to generate an ephemeral overlay template from an authority record
+CREATE OR REPLACE FUNCTION authority.generate_overlay_template (source_xml TEXT) RETURNS TEXT AS $f$
+DECLARE
+    cset                INT;
+    main_entry          authority.control_set_authority_field%ROWTYPE;
+    bib_field           authority.control_set_bib_field%ROWTYPE;
+    auth_id             INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', source_xml)::INT;
+    replace_data        XML[] DEFAULT '{}'::XML[];
+    replace_rules       TEXT[] DEFAULT '{}'::TEXT[];
+    auth_field          XML[];
+BEGIN
+    IF auth_id IS NULL THEN
+        RETURN NULL;
+    END IF;
+
+    -- Default to the LoC controll set
+    SELECT control_set INTO cset FROM authority.record_entry WHERE id = auth_id;
+
+    -- if none, make a best guess
+    IF cset IS NULL THEN
+        SELECT  control_set INTO cset
+          FROM  authority.control_set_authority_field
+          WHERE tag IN (
+                    SELECT  UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marc::XML)::TEXT[])
+                      FROM  authority.record_entry
+                      WHERE id = auth_id
+                )
+          LIMIT 1;
+    END IF;
+
+    -- if STILL none, no-op change
+    IF cset IS NULL THEN
+        RETURN XMLELEMENT(
+            name record,
+            XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns),
+            XMLELEMENT( name leader, '00881nam a2200193   4500'),
+            XMLELEMENT(
+                name datafield,
+                XMLATTRIBUTES( '905' AS tag, ' ' AS ind1, ' ' AS ind2),
+                XMLELEMENT(
+                    name subfield,
+                    XMLATTRIBUTES('d' AS code),
+                    '901c'
+                )
+            )
+        )::TEXT;
+    END IF;
+
+    FOR main_entry IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset LOOP
+        auth_field := XPATH('//*[@tag="'||main_entry.tag||'"][1]',source_xml::XML);
+        IF ARRAY_LENGTH(auth_field,1) > 0 THEN
+            FOR bib_field IN SELECT * FROM authority.control_set_bib_field WHERE authority_field = main_entry.id LOOP
+                replace_data := replace_data || XMLELEMENT( name datafield, XMLATTRIBUTES(bib_field.tag AS tag), XPATH('//*[local-name()="subfield"]',auth_field[1])::XML[]);
+                replace_rules := replace_rules || ( bib_field.tag || main_entry.sf_list || E'[0~\\)' || auth_id || '$]' );
+            END LOOP;
+            EXIT;
+        END IF;
+    END LOOP;
+
+    RETURN XMLELEMENT(
+        name record,
+        XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns),
+        XMLELEMENT( name leader, '00881nam a2200193   4500'),
+        replace_data,
+        XMLELEMENT(
+            name datafield,
+            XMLATTRIBUTES( '905' AS tag, ' ' AS ind1, ' ' AS ind2),
+            XMLELEMENT(
+                name subfield,
+                XMLATTRIBUTES('r' AS code),
+                ARRAY_TO_STRING(replace_rules,',')
+            )
+        )
+    )::TEXT;
+END;
+$f$ STABLE LANGUAGE PLPGSQL;
+
+
+
+-- Evergreen DB patch 0613.schema.vandelay_isxn_normalization.sql
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0613', :eg_version);
+
+CREATE OR REPLACE FUNCTION vandelay.flatten_marc_hstore(
+    record_xml TEXT
+) RETURNS HSTORE AS $func$
+BEGIN
+    RETURN (SELECT
+        HSTORE(
+            ARRAY_ACCUM(tag || (COALESCE(subfield, ''))),
+            ARRAY_ACCUM(value)
+        )
+        FROM (
+            SELECT  tag, subfield, ARRAY_ACCUM(value)::TEXT AS value
+              FROM  (SELECT tag,
+                            subfield,
+                            CASE WHEN tag = '020' THEN -- caseless -- isbn
+                                LOWER((REGEXP_MATCHES(value,$$^(\S{10,17})$$))[1] || '%')
+                            WHEN tag = '022' THEN -- caseless -- issn
+                                LOWER((REGEXP_MATCHES(value,$$^(\S{4}[- ]?\S{4})$$))[1] || '%')
+                            WHEN tag = '024' THEN -- caseless -- upc (other)
+                                LOWER(value || '%')
+                            ELSE
+                                value
+                            END AS value
+                      FROM  vandelay.flatten_marc(record_xml)) x
+                GROUP BY tag, subfield ORDER BY tag, subfield
+        ) subquery
+    );
+END;
+$func$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION vandelay._get_expr_push_jrow(
+    node vandelay.match_set_point
+) RETURNS VOID AS $$
+DECLARE
+    jrow        TEXT;
+    my_alias    TEXT;
+    op          TEXT;
+    tagkey      TEXT;
+    caseless    BOOL;
+BEGIN
+    -- remember $1 is tags_rstore, and $2 is svf_rstore
+
+    caseless := FALSE;
+
+    IF node.tag IS NOT NULL THEN
+        caseless := (node.tag IN ('020', '022', '024'));
+        tagkey := node.tag;
+        IF node.subfield IS NOT NULL THEN
+            tagkey := tagkey || node.subfield;
+        END IF;
+    END IF;
+
+    IF node.negate THEN
+        IF caseless THEN
+            op := 'NOT LIKE';
+        ELSE
+            op := '<>';
+        END IF;
+    ELSE
+        IF caseless THEN
+            op := 'LIKE';
+        ELSE
+            op := '=';
+        END IF;
+    END IF;
+
+    my_alias := 'n' || node.id::TEXT;
+
+    jrow := 'LEFT JOIN (SELECT *, ' || node.quality ||
+        ' AS quality FROM metabib.';
+    IF node.tag IS NOT NULL THEN
+        jrow := jrow || 'full_rec) ' || my_alias || ' ON (' ||
+            my_alias || '.record = bre.id AND ' || my_alias || '.tag = ''' ||
+            node.tag || '''';
+        IF node.subfield IS NOT NULL THEN
+            jrow := jrow || ' AND ' || my_alias || '.subfield = ''' ||
+                node.subfield || '''';
+        END IF;
+        jrow := jrow || ' AND (';
+
+        IF caseless THEN
+            jrow := jrow || 'LOWER(' || my_alias || '.value) ' || op;
+        ELSE
+            jrow := jrow || my_alias || '.value ' || op;
+        END IF;
+
+        jrow := jrow || ' ANY(($1->''' || tagkey || ''')::TEXT[])))';
+    ELSE    -- svf
+        jrow := jrow || 'record_attr) ' || my_alias || ' ON (' ||
+            my_alias || '.id = bre.id AND (' ||
+            my_alias || '.attrs->''' || node.svf ||
+            ''' ' || op || ' $2->''' || node.svf || '''))';
+    END IF;
+    INSERT INTO _vandelay_tmp_jrows (j) VALUES (jrow);
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+
+-- Evergreen DB patch XXXX.schema.generic-mapping-index-normalizer.sql
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0615', :eg_version);
+
+-- evergreen.generic_map_normalizer 
+
+CREATE OR REPLACE FUNCTION evergreen.generic_map_normalizer ( TEXT, TEXT ) RETURNS TEXT AS $f$
+my $string = shift;
+my %map;
+
+my $default = $string;
+
+$_ = shift;
+while (/^\s*?(.*?)\s*?=>\s*?(\S+)\s*/) {
+    if ($1 eq '') {
+        $default = $2;
+    } else {
+        $map{$2} = [split(/\s*,\s*/, $1)];
+    }
+    $_ = $';
+}
+
+for my $key ( keys %map ) {
+    return $key if (grep { $_ eq $string } @{ $map{$key} });
+}
+
+return $default;
+
+$f$ LANGUAGE PLPERLU;
+
+-- evergreen.generic_map_normalizer 
+
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+    'Generic Mapping Normalizer', 
+    'Map values or sets of values to new values',
+    'generic_map_normalizer', 
+    1
+);
+
+
+SELECT evergreen.upgrade_deps_block_check('0616', :eg_version);
+
+CREATE OR REPLACE FUNCTION actor.org_unit_prox_update () RETURNS TRIGGER as $$
+BEGIN
+
+
+IF TG_OP = 'DELETE' THEN
+
+    DELETE FROM actor.org_unit_proximity WHERE (from_org = OLD.id or to_org= OLD.id);
+
+END IF;
+
+IF TG_OP = 'UPDATE' THEN
+
+    IF NEW.parent_ou <> OLD.parent_ou THEN
+
+        DELETE FROM actor.org_unit_proximity WHERE (from_org = OLD.id or to_org= OLD.id);
+            INSERT INTO actor.org_unit_proximity (from_org, to_org, prox)
+            SELECT  l.id, r.id, actor.org_unit_proximity(l.id,r.id)
+                FROM  actor.org_unit l, actor.org_unit r
+                WHERE (l.id = NEW.id or r.id = NEW.id);
+
+    END IF;
+
+END IF;
+
+IF TG_OP = 'INSERT' THEN
+
+     INSERT INTO actor.org_unit_proximity (from_org, to_org, prox)
+     SELECT  l.id, r.id, actor.org_unit_proximity(l.id,r.id)
+         FROM  actor.org_unit l, actor.org_unit r
+         WHERE (l.id = NEW.id or r.id = NEW.id);
+
+END IF;
+
+RETURN null;
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE TRIGGER proximity_update_tgr AFTER INSERT OR UPDATE OR DELETE ON actor.org_unit FOR EACH ROW EXECUTE PROCEDURE actor.org_unit_prox_update ();
+
+
+SELECT evergreen.upgrade_deps_block_check('0617', :eg_version);
+
+-- add notify columns to booking.reservation
+ALTER TABLE booking.reservation
+  ADD COLUMN email_notify BOOLEAN NOT NULL DEFAULT FALSE;
+
+-- create the hook and validator
+INSERT INTO action_trigger.hook (key, core_type, description, passive)
+  VALUES ('reservation.available', 'bresv', 'A reservation is available for pickup', false);
+INSERT INTO action_trigger.validator (module, description)
+  VALUES ('ReservationIsAvailable','Checked that a reserved resource is available for checkout');
+
+-- create org unit setting to toggle checkbox display
+INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
+  VALUES ('booking.allow_email_notify', 'booking.allow_email_notify', 'Permit email notification when a reservation is ready for pickup.', 'bool');
+
+
+SELECT evergreen.upgrade_deps_block_check('0618', :eg_version);
+
+UPDATE config.org_unit_setting_type SET description = E'The Regular Expression for validation on the day_phone field in patron registration. Note: The first capture group will be used for the "last 4 digits of phone number" feature, if enabled. Ex: "[2-9]\\d{2}-\\d{3}-(\\d{4})( x\\d+)?" will ignore the extension on a NANP number.' WHERE name = 'ui.patron.edit.au.day_phone.regex';
+
+UPDATE config.org_unit_setting_type SET description = 'The Regular Expression for validation on phone fields in patron registration. Applies to all phone fields without their own setting. NOTE: See description of the day_phone regex for important information about capture groups with it.' WHERE name = 'ui.patron.edit.phone.regex';
+
+UPDATE config.org_unit_setting_type SET description = oils_i18n_gettext('patron.password.use_phone', 'By default, use the last 4 alphanumeric characters of the patrons phone number as the default password when creating new users.  The exact characters used may be configured via the "GUI: Regex for day_phone field on patron registration" setting.', 'coust', 'description') WHERE name = 'patron.password.use_phone';
+
+-- Evergreen DB patch 0619.schema.au_last_update_time.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0619', :eg_version);
+
+-- Add new column last_update_time to actor.usr, with trigger to maintain it
+-- Add corresponding new column to auditor.actor_usr_history
+
+ALTER TABLE actor.usr
+       ADD COLUMN last_update_time TIMESTAMPTZ;
+
+ALTER TABLE auditor.actor_usr_history
+       ADD COLUMN last_update_time TIMESTAMPTZ;
+
+CREATE OR REPLACE FUNCTION actor.au_updated()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.last_update_time := now();
+       RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER au_update_trig
+       BEFORE INSERT OR UPDATE ON actor.usr
+       FOR EACH ROW EXECUTE PROCEDURE actor.au_updated();
+
+-- Evergreen DB patch XXXX.data.opac_payment_history_age_limit.sql
+
+
+SELECT evergreen.upgrade_deps_block_check('0621', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, label, description, datatype)
+VALUES (
+    'opac.payment_history_age_limit',
+    oils_i18n_gettext('opac.payment_history_age_limit',
+        'OPAC: Payment History Age Limit', 'coust', 'label'),
+    oils_i18n_gettext('opac.payment_history_age_limit',
+        'The OPAC should not display payments by patrons that are older than any interval defined here.', 'coust', 'label'),
+    'interval'
+);
+
+-- Updates config.org_unit_setting_type to remove the old tag prefixes for once 
+-- groups have been added.
+--
+
+SELECT evergreen.upgrade_deps_block_check('0622', :eg_version);
+
+INSERT INTO config.settings_group (name, label) VALUES
+('sys', oils_i18n_gettext('config.settings_group.system', 'System', 'coust', 'label')),
+('gui', oils_i18n_gettext('config.settings_group.gui', 'GUI', 'coust', 'label')),
+('lib', oils_i18n_gettext('config.settings_group.lib', 'Library', 'coust', 'label')),
+('sec', oils_i18n_gettext('config.settings_group.sec', 'Security', 'coust', 'label')),
+('cat', oils_i18n_gettext('config.settings_group.cat', 'Cataloging', 'coust', 'label')),
+('holds', oils_i18n_gettext('config.settings_group.holds', 'Holds', 'coust', 'label')),
+('circ', oils_i18n_gettext('config.settings_group.circulation', 'Circulation', 'coust', 'label')),
+('self', oils_i18n_gettext('config.settings_group.self', 'Self Check', 'coust', 'label')),
+('opac', oils_i18n_gettext('config.settings_group.opac', 'OPAC', 'coust', 'label')),
+('prog', oils_i18n_gettext('config.settings_group.program', 'Program', 'coust', 'label')),
+('glob', oils_i18n_gettext('config.settings_group.global', 'Global', 'coust', 'label')),
+('finance', oils_i18n_gettext('config.settings_group.finances', 'Finanaces', 'coust', 'label')),
+('credit', oils_i18n_gettext('config.settings_group.ccp', 'Credit Card Processing', 'coust', 'label')),
+('serial', oils_i18n_gettext('config.settings_group.serial', 'Serials', 'coust', 'label')),
+('recall', oils_i18n_gettext('config.settings_group.recall', 'Recalls', 'coust', 'label')),
+('booking', oils_i18n_gettext('config.settings_group.booking', 'Booking', 'coust', 'label')),
+('offline', oils_i18n_gettext('config.settings_group.offline', 'Offline', 'coust', 'label')),
+('receipt_template', oils_i18n_gettext('config.settings_group.receipt_template', 'Receipt Template', 'coust', 'label'));
+
+UPDATE config.org_unit_setting_type SET grp = 'lib', label='Set copy creator as receiver' WHERE name = 'acq.copy_creator_uses_receiver';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'acq.default_circ_modifier';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'acq.default_copy_location';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'acq.fund.balance_limit.block';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'acq.fund.balance_limit.warn';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'acq.holds.allow_holds_from_purchase_request';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'acq.tmp_barcode_prefix';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'acq.tmp_callnumber_prefix';
+UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'auth.opac_timeout';
+UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'auth.persistent_login_interval';
+UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'auth.staff_timeout';
+UPDATE config.org_unit_setting_type SET grp = 'booking' WHERE name = 'booking.allow_email_notify';
+UPDATE config.org_unit_setting_type SET grp = 'gui' WHERE name = 'cat.bib.alert_on_empty';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete bib if all copies are deleted via Acquisitions lineitem cancellation.' WHERE name = 'cat.bib.delete_on_no_copy_via_acq_lineitem_cancel';
+UPDATE config.org_unit_setting_type SET grp = 'prog' WHERE name = 'cat.bib.keep_on_empty';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Default Classification Scheme' WHERE name = 'cat.default_classification_scheme';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Default copy status (fast add)' WHERE name = 'cat.default_copy_status_fast';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Default copy status (normal)' WHERE name = 'cat.default_copy_status_normal';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'cat.default_item_price';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine and pocket label font family' WHERE name = 'cat.label.font.family';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine and pocket label font size' WHERE name = 'cat.label.font.size';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine and pocket label font weight' WHERE name = 'cat.label.font.weight';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Defines the control number identifier used in 003 and 035 fields.' WHERE name = 'cat.marc_control_number_identifier';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label maximum lines' WHERE name = 'cat.spine.line.height';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label left margin' WHERE name = 'cat.spine.line.margin';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Spine label line width' WHERE name = 'cat.spine.line.width';
+UPDATE config.org_unit_setting_type SET grp = 'cat', label='Delete volume with last copy' WHERE name = 'cat.volume.delete_on_empty';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Toggle off the patron summary sidebar after first view.' WHERE name = 'circ.auto_hide_patron_summary';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Block Renewal of Items Needed for Holds' WHERE name = 'circ.block_renews_for_holds';
+UPDATE config.org_unit_setting_type SET grp = 'booking', label='Elbow room' WHERE name = 'circ.booking_reservation.default_elbow_room';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'circ.charge_lost_on_zero';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'circ.charge_on_damaged';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.checkout_auto_renew_age';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.checkout_fills_related_hold';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.checkout_fills_related_hold_exact_match_only';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'circ.claim_never_checked_out.mark_missing';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'circ.claim_return.copy_status';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'circ.damaged.void_ovedue';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'circ.damaged_item_processing_fee';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Do not include outstanding Claims Returned circulations in lump sum tallies in Patron Display.' WHERE name = 'circ.do_not_tally_claims_returned';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Hard boundary' WHERE name = 'circ.hold_boundary.hard';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Soft boundary' WHERE name = 'circ.hold_boundary.soft';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Expire Alert Interval' WHERE name = 'circ.hold_expire_alert_interval';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Expire Interval' WHERE name = 'circ.hold_expire_interval';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.hold_shelf_status_delay';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Soft stalling interval' WHERE name = 'circ.hold_stalling.soft';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Hard stalling interval' WHERE name = 'circ.hold_stalling_hard';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Use Active Date for Age Protection' WHERE name = 'circ.holds.age_protect.active_date';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Behind Desk Pickup Supported' WHERE name = 'circ.holds.behind_desk_pickup_supported';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Canceled holds display age' WHERE name = 'circ.holds.canceled.display_age';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Canceled holds display count' WHERE name = 'circ.holds.canceled.display_count';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Clear shelf copy status' WHERE name = 'circ.holds.clear_shelf.copy_status';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Bypass hold capture during clear shelf process' WHERE name = 'circ.holds.clear_shelf.no_capture_holds';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Default Estimated Wait' WHERE name = 'circ.holds.default_estimated_wait_interval';
+UPDATE config.org_unit_setting_type SET grp = 'holds' WHERE name = 'circ.holds.default_shelf_expire_interval';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Block hold request if hold recipient privileges have expired' WHERE name = 'circ.holds.expired_patron_block';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Has Local Copy Alert' WHERE name = 'circ.holds.hold_has_copy_at.alert';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Has Local Copy Block' WHERE name = 'circ.holds.hold_has_copy_at.block';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Maximum library target attempts' WHERE name = 'circ.holds.max_org_unit_target_loops';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Minimum Estimated Wait' WHERE name = 'circ.holds.min_estimated_wait_interval';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Org Unit Target Weight' WHERE name = 'circ.holds.org_unit_target_weight';
+UPDATE config.org_unit_setting_type SET grp = 'recall', label='An array of fine amount, fine interval, and maximum fine.' WHERE name = 'circ.holds.recall_fine_rules';
+UPDATE config.org_unit_setting_type SET grp = 'recall', label='Truncated loan period.' WHERE name = 'circ.holds.recall_return_interval';
+UPDATE config.org_unit_setting_type SET grp = 'recall', label='Circulation duration that triggers a recall.' WHERE name = 'circ.holds.recall_threshold';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Use weight-based hold targeting' WHERE name = 'circ.holds.target_holds_by_org_unit_weight';
+UPDATE config.org_unit_setting_type SET grp = 'holds' WHERE name = 'circ.holds.target_skip_me';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='Reset request time on un-cancel' WHERE name = 'circ.holds.uncancel.reset_request_time';
+UPDATE config.org_unit_setting_type SET grp = 'holds', label='FIFO' WHERE name = 'circ.holds_fifo';
+UPDATE config.org_unit_setting_type SET grp = 'gui' WHERE name = 'circ.item_checkout_history.max';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Lost Checkin Generates New Overdues' WHERE name = 'circ.lost.generate_overdue_on_checkin';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Lost items usable on checkin' WHERE name = 'circ.lost_immediately_available';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'circ.lost_materials_processing_fee';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Void lost max interval' WHERE name = 'circ.max_accept_return_of_lost';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Cap Max Fine at Item Price' WHERE name = 'circ.max_fine.cap_at_price';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.max_patron_claim_return_count';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Item Status for Missing Pieces' WHERE name = 'circ.missing_pieces.copy_status';
+UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'circ.obscure_dob';
+UPDATE config.org_unit_setting_type SET grp = 'offline', label='Skip offline checkin if newer item Status Changed Time.' WHERE name = 'circ.offline.skip_checkin_if_newer_status_changed_time';
+UPDATE config.org_unit_setting_type SET grp = 'offline', label='Skip offline checkout if newer item Status Changed Time.' WHERE name = 'circ.offline.skip_checkout_if_newer_status_changed_time';
+UPDATE config.org_unit_setting_type SET grp = 'offline', label='Skip offline renewal if newer item Status Changed Time.' WHERE name = 'circ.offline.skip_renew_if_newer_status_changed_time';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Offline: Patron Usernames Allowed' WHERE name = 'circ.offline.username_allowed';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Maximum concurrently active self-serve password reset requests per user' WHERE name = 'circ.password_reset_request_per_user_limit';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Require matching email address for password reset requests' WHERE name = 'circ.password_reset_request_requires_matching_email';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Maximum concurrently active self-serve password reset requests' WHERE name = 'circ.password_reset_request_throttle';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Self-serve password reset request time-to-live' WHERE name = 'circ.password_reset_request_time_to_live';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Patron Registration: Cloned patrons get address copy' WHERE name = 'circ.patron_edit.clone.copy_address';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.patron_invalid_address_apply_penalty';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'circ.pre_cat_copy_circ_lib';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'circ.reshelving_complete.interval';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Restore overdues on lost item return' WHERE name = 'circ.restore_overdue_on_lost_return';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Pop-up alert for errors' WHERE name = 'circ.selfcheck.alert.popup';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Audio Alerts' WHERE name = 'circ.selfcheck.alert.sound';
+UPDATE config.org_unit_setting_type SET grp = 'self' WHERE name = 'circ.selfcheck.auto_override_checkout_events';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Block copy checkout status' WHERE name = 'circ.selfcheck.block_checkout_on_copy_status';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Patron Login Timeout (in seconds)' WHERE name = 'circ.selfcheck.patron_login_timeout';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Require Patron Password' WHERE name = 'circ.selfcheck.patron_password_required';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Require patron password' WHERE name = 'circ.selfcheck.require_patron_password';
+UPDATE config.org_unit_setting_type SET grp = 'self', label='Workstation Required' WHERE name = 'circ.selfcheck.workstation_required';
+UPDATE config.org_unit_setting_type SET grp = 'circ' WHERE name = 'circ.staff_client.actor_on_checkout';
+UPDATE config.org_unit_setting_type SET grp = 'prog' WHERE name = 'circ.staff_client.do_not_auto_attempt_print';
+UPDATE config.org_unit_setting_type SET grp = 'receipt_template', label='Content of alert_text include' WHERE name = 'circ.staff_client.receipt.alert_text';
+UPDATE config.org_unit_setting_type SET grp = 'receipt_template', label='Content of event_text include' WHERE name = 'circ.staff_client.receipt.event_text';
+UPDATE config.org_unit_setting_type SET grp = 'receipt_template', label='Content of footer_text include' WHERE name = 'circ.staff_client.receipt.footer_text';
+UPDATE config.org_unit_setting_type SET grp = 'receipt_template', label='Content of header_text include' WHERE name = 'circ.staff_client.receipt.header_text';
+UPDATE config.org_unit_setting_type SET grp = 'receipt_template', label='Content of notice_text include' WHERE name = 'circ.staff_client.receipt.notice_text';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Minimum Transit Checkin Interval' WHERE name = 'circ.transit.min_checkin_interval';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Patron Merge Deactivate Card' WHERE name = 'circ.user_merge.deactivate_cards';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Patron Merge Address Delete' WHERE name = 'circ.user_merge.delete_addresses';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Patron Merge Barcode Delete' WHERE name = 'circ.user_merge.delete_cards';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Void lost item billing when returned' WHERE name = 'circ.void_lost_on_checkin';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Void processing fee on lost item return' WHERE name = 'circ.void_lost_proc_fee_on_checkin';
+UPDATE config.org_unit_setting_type SET grp = 'finance', label='Void overdue fines when items are marked lost' WHERE name = 'circ.void_overdue_on_lost';
+UPDATE config.org_unit_setting_type SET grp = 'finance' WHERE name = 'credit.payments.allow';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='Enable AuthorizeNet payments' WHERE name = 'credit.processor.authorizenet.enabled';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='AuthorizeNet login' WHERE name = 'credit.processor.authorizenet.login';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='AuthorizeNet password' WHERE name = 'credit.processor.authorizenet.password';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='AuthorizeNet server' WHERE name = 'credit.processor.authorizenet.server';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='AuthorizeNet test mode' WHERE name = 'credit.processor.authorizenet.testmode';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='Name default credit processor' WHERE name = 'credit.processor.default';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='Enable PayflowPro payments' WHERE name = 'credit.processor.payflowpro.enabled';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayflowPro login/merchant ID' WHERE name = 'credit.processor.payflowpro.login';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayflowPro partner' WHERE name = 'credit.processor.payflowpro.partner';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayflowPro password' WHERE name = 'credit.processor.payflowpro.password';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayflowPro test mode' WHERE name = 'credit.processor.payflowpro.testmode';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayflowPro vendor' WHERE name = 'credit.processor.payflowpro.vendor';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='Enable PayPal payments' WHERE name = 'credit.processor.paypal.enabled';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayPal login' WHERE name = 'credit.processor.paypal.login';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayPal password' WHERE name = 'credit.processor.paypal.password';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayPal signature' WHERE name = 'credit.processor.paypal.signature';
+UPDATE config.org_unit_setting_type SET grp = 'credit', label='PayPal test mode' WHERE name = 'credit.processor.paypal.testmode';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Format Dates with this pattern.' WHERE name = 'format.date';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Format Times with this pattern.' WHERE name = 'format.time';
+UPDATE config.org_unit_setting_type SET grp = 'glob' WHERE name = 'global.default_locale';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'global.juvenile_age_threshold';
+UPDATE config.org_unit_setting_type SET grp = 'glob' WHERE name = 'global.password_regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Disable the ability to save list column configurations locally.' WHERE name = 'gui.disable_local_save_columns';
+UPDATE config.org_unit_setting_type SET grp = 'lib', label='Courier Code' WHERE name = 'lib.courier_code';
+UPDATE config.org_unit_setting_type SET grp = 'lib' WHERE name = 'notice.telephony.callfile_lines';
+UPDATE config.org_unit_setting_type SET grp = 'opac', label='Allow pending addresses' WHERE name = 'opac.allow_pending_address';
+UPDATE config.org_unit_setting_type SET grp = 'glob' WHERE name = 'opac.barcode_regex';
+UPDATE config.org_unit_setting_type SET grp = 'opac', label='Use fully compressed serial holdings' WHERE name = 'opac.fully_compressed_serial_holdings';
+UPDATE config.org_unit_setting_type SET grp = 'opac', label='Org Unit Hiding Depth' WHERE name = 'opac.org_unit_hiding.depth';
+UPDATE config.org_unit_setting_type SET grp = 'opac', label='Payment History Age Limit' WHERE name = 'opac.payment_history_age_limit';
+UPDATE config.org_unit_setting_type SET grp = 'prog' WHERE name = 'org.bounced_emails';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Patron Opt-In Boundary' WHERE name = 'org.patron_opt_boundary';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Patron Opt-In Default' WHERE name = 'org.patron_opt_default';
+UPDATE config.org_unit_setting_type SET grp = 'sec' WHERE name = 'patron.password.use_phone';
+UPDATE config.org_unit_setting_type SET grp = 'serial', label='Previous Issuance Copy Location' WHERE name = 'serial.prev_issuance_copy_location';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Patrons Logged' WHERE name = 'ui.admin.patron_log.max_entries';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Work Log: Maximum Actions Logged' WHERE name = 'ui.admin.work_log.max_entries';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Horizontal layout for Volume/Copy Creator/Editor.' WHERE name = 'ui.cat.volume_copy_editor.horizontal';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Uncheck bills by default in the patron billing interface' WHERE name = 'ui.circ.billing.uncheck_bills_and_unfocus_payment_box';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: Maximum # of uses allowed per entry.' WHERE name = 'ui.circ.in_house_use.entry_cap';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Record In-House Use: # of uses threshold for Are You Sure? dialog.' WHERE name = 'ui.circ.in_house_use.entry_warn';
+UPDATE config.org_unit_setting_type SET grp = 'gui' WHERE name = 'ui.circ.patron_summary.horizontal';
+UPDATE config.org_unit_setting_type SET grp = 'gui' WHERE name = 'ui.circ.show_billing_tab_on_bills';
+UPDATE config.org_unit_setting_type SET grp = 'circ', label='Suppress popup-dialogs during check-in.' WHERE name = 'ui.circ.suppress_checkin_popups';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Button bar' WHERE name = 'ui.general.button_bar';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Default Hotkeyset' WHERE name = 'ui.general.hotkeyset';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Idle timeout' WHERE name = 'ui.general.idle_timeout';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Default Country for New Addresses in Patron Editor' WHERE name = 'ui.patron.default_country';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Default Ident Type for Patron Registration' WHERE name = 'ui.patron.default_ident_type';
+UPDATE config.org_unit_setting_type SET grp = 'sec', label='Default level of patrons'' internet access' WHERE name = 'ui.patron.default_inet_access_level';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show active field on patron registration' WHERE name = 'ui.patron.edit.au.active.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest active field on patron registration' WHERE name = 'ui.patron.edit.au.active.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show alert_message field on patron registration' WHERE name = 'ui.patron.edit.au.alert_message.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest alert_message field on patron registration' WHERE name = 'ui.patron.edit.au.alert_message.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show alias field on patron registration' WHERE name = 'ui.patron.edit.au.alias.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest alias field on patron registration' WHERE name = 'ui.patron.edit.au.alias.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show barred field on patron registration' WHERE name = 'ui.patron.edit.au.barred.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest barred field on patron registration' WHERE name = 'ui.patron.edit.au.barred.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show claims_never_checked_out_count field on patron registration' WHERE name = 'ui.patron.edit.au.claims_never_checked_out_count.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest claims_never_checked_out_count field on patron registration' WHERE name = 'ui.patron.edit.au.claims_never_checked_out_count.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show claims_returned_count field on patron registration' WHERE name = 'ui.patron.edit.au.claims_returned_count.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest claims_returned_count field on patron registration' WHERE name = 'ui.patron.edit.au.claims_returned_count.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for day_phone field on patron registration' WHERE name = 'ui.patron.edit.au.day_phone.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for day_phone field on patron registration' WHERE name = 'ui.patron.edit.au.day_phone.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require day_phone field on patron registration' WHERE name = 'ui.patron.edit.au.day_phone.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show day_phone field on patron registration' WHERE name = 'ui.patron.edit.au.day_phone.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest day_phone field on patron registration' WHERE name = 'ui.patron.edit.au.day_phone.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show calendar widget for dob field on patron registration' WHERE name = 'ui.patron.edit.au.dob.calendar';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require dob field on patron registration' WHERE name = 'ui.patron.edit.au.dob.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show dob field on patron registration' WHERE name = 'ui.patron.edit.au.dob.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest dob field on patron registration' WHERE name = 'ui.patron.edit.au.dob.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for email field on patron registration' WHERE name = 'ui.patron.edit.au.email.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for email field on patron registration' WHERE name = 'ui.patron.edit.au.email.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require email field on patron registration' WHERE name = 'ui.patron.edit.au.email.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show email field on patron registration' WHERE name = 'ui.patron.edit.au.email.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest email field on patron registration' WHERE name = 'ui.patron.edit.au.email.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for evening_phone field on patron registration' WHERE name = 'ui.patron.edit.au.evening_phone.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for evening_phone field on patron registration' WHERE name = 'ui.patron.edit.au.evening_phone.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require evening_phone field on patron registration' WHERE name = 'ui.patron.edit.au.evening_phone.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show evening_phone field on patron registration' WHERE name = 'ui.patron.edit.au.evening_phone.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest evening_phone field on patron registration' WHERE name = 'ui.patron.edit.au.evening_phone.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show ident_value field on patron registration' WHERE name = 'ui.patron.edit.au.ident_value.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest ident_value field on patron registration' WHERE name = 'ui.patron.edit.au.ident_value.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show ident_value2 field on patron registration' WHERE name = 'ui.patron.edit.au.ident_value2.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest ident_value2 field on patron registration' WHERE name = 'ui.patron.edit.au.ident_value2.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show juvenile field on patron registration' WHERE name = 'ui.patron.edit.au.juvenile.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest juvenile field on patron registration' WHERE name = 'ui.patron.edit.au.juvenile.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show master_account field on patron registration' WHERE name = 'ui.patron.edit.au.master_account.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest master_account field on patron registration' WHERE name = 'ui.patron.edit.au.master_account.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for other_phone field on patron registration' WHERE name = 'ui.patron.edit.au.other_phone.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for other_phone field on patron registration' WHERE name = 'ui.patron.edit.au.other_phone.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require other_phone field on patron registration' WHERE name = 'ui.patron.edit.au.other_phone.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show other_phone field on patron registration' WHERE name = 'ui.patron.edit.au.other_phone.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest other_phone field on patron registration' WHERE name = 'ui.patron.edit.au.other_phone.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show second_given_name field on patron registration' WHERE name = 'ui.patron.edit.au.second_given_name.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest second_given_name field on patron registration' WHERE name = 'ui.patron.edit.au.second_given_name.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Show suffix field on patron registration' WHERE name = 'ui.patron.edit.au.suffix.show';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Suggest suffix field on patron registration' WHERE name = 'ui.patron.edit.au.suffix.suggest';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require county field on patron registration' WHERE name = 'ui.patron.edit.aua.county.require';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for post_code field on patron registration' WHERE name = 'ui.patron.edit.aua.post_code.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for post_code field on patron registration' WHERE name = 'ui.patron.edit.aua.post_code.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Default showing suggested patron registration fields' WHERE name = 'ui.patron.edit.default_suggested';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Example for phone fields on patron registration' WHERE name = 'ui.patron.edit.phone.example';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Regex for phone fields on patron registration' WHERE name = 'ui.patron.edit.phone.regex';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require at least one address for Patron Registration' WHERE name = 'ui.patron.registration.require_address';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Cap results in Patron Search at this number.' WHERE name = 'ui.patron_search.result_cap';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Require staff initials for entry/edit of item/patron/penalty notes/messages.' WHERE name = 'ui.staff.require_initials';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='Unified Volume/Item Creator/Editor' WHERE name = 'ui.unified_volume_copy_editor';
+UPDATE config.org_unit_setting_type SET grp = 'gui', label='URL for remote directory containing list column settings.' WHERE name = 'url.remote_column_settings';
+
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0623', :eg_version);
+
+
+CREATE TABLE config.org_unit_setting_type_log (
+    id              BIGSERIAL   PRIMARY KEY,
+    date_applied    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+    org             INT         REFERENCES actor.org_unit (id),
+    original_value  TEXT,
+    new_value       TEXT,
+    field_name      TEXT      REFERENCES config.org_unit_setting_type (name)
+);
+
+-- Log each change in oust to oustl, so admins can see what they messed up if someting stops working.
+CREATE OR REPLACE FUNCTION ous_change_log() RETURNS TRIGGER AS $ous_change_log$
+    DECLARE
+    original TEXT;
+    BEGIN
+        -- Check for which setting is being updated, and log it.
+        SELECT INTO original value FROM actor.org_unit_setting WHERE name = NEW.name AND org_unit = NEW.org_unit;
+                
+        INSERT INTO config.org_unit_setting_type_log (org,original_value,new_value,field_name) VALUES (NEW.org_unit, original, NEW.value, NEW.name);
+        
+        RETURN NEW;
+    END;
+$ous_change_log$ LANGUAGE plpgsql;    
+
+CREATE TRIGGER log_ous_change
+    BEFORE INSERT OR UPDATE ON actor.org_unit_setting
+    FOR EACH ROW EXECUTE PROCEDURE ous_change_log();
+
+CREATE OR REPLACE FUNCTION ous_delete_log() RETURNS TRIGGER AS $ous_delete_log$
+    DECLARE
+    original TEXT;
+    BEGIN
+        -- Check for which setting is being updated, and log it.
+        SELECT INTO original value FROM actor.org_unit_setting WHERE name = OLD.name AND org_unit = OLD.org_unit;
+                
+        INSERT INTO config.org_unit_setting_type_log (org,original_value,new_value,field_name) VALUES (OLD.org_unit, original, 'null', OLD.name);
+        
+        RETURN OLD;
+    END;
+$ous_delete_log$ LANGUAGE plpgsql;    
+
+CREATE TRIGGER log_ous_del
+    BEFORE DELETE ON actor.org_unit_setting
+    FOR EACH ROW EXECUTE PROCEDURE ous_delete_log();
+
+-- Evergreen DB patch 0625.data.opac_staff_saved_search_size.sql
+
+
+SELECT evergreen.upgrade_deps_block_check('0625', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, grp, label, description, datatype)
+VALUES (
+    'opac.staff_saved_search.size', 'opac',
+    oils_i18n_gettext('opac.staff_saved_search.size',
+        'OPAC: Number of staff client saved searches to display on left side of results and record details pages', 'coust', 'label'),
+    oils_i18n_gettext('opac.staff_saved_search.size',
+        'If unset, the OPAC (only when wrapped in the staff client!) will default to showing you your ten most recent searches on the left side of the results and record details pages.  If you actually don''t want to see this feature at all, set this value to zero at the top of your organizational tree.', 'coust', 'description'),
+    'integer'
+);
+
+-- Evergreen DB patch 0626.schema.bookbag-goodies.sql
+
+
+SELECT evergreen.upgrade_deps_block_check('0626', :eg_version);
+
+ALTER TABLE container.biblio_record_entry_bucket
+    ADD COLUMN description TEXT;
+
+ALTER TABLE container.call_number_bucket
+    ADD COLUMN description TEXT;
+
+ALTER TABLE container.copy_bucket
+    ADD COLUMN description TEXT;
+
+ALTER TABLE container.user_bucket
+    ADD COLUMN description TEXT;
+
+INSERT INTO action_trigger.hook (key, core_type, description, passive)
+VALUES (
+    'container.biblio_record_entry_bucket.csv',
+    'cbreb',
+    oils_i18n_gettext(
+        'container.biblio_record_entry_bucket.csv',
+        'Produce a CSV file representing a bookbag',
+        'ath',
+        'description'
+    ),
+    FALSE
+);
+
+INSERT INTO action_trigger.reactor (module, description)
+VALUES (
+    'ContainerCSV',
+    oils_i18n_gettext(
+        'ContainerCSV',
+        'Facilitates produce a CSV file representing a bookbag by introducing an "items" variable into the TT environment, sorted as dictated according to user params',
+        'atr',
+        'description'
+    )
+);
+
+INSERT INTO action_trigger.event_definition (
+    id, active, owner,
+    name, hook, reactor,
+    validator, template
+) VALUES (
+    48, TRUE, 1,
+    'Bookbag CSV', 'container.biblio_record_entry_bucket.csv', 'ContainerCSV',
+    'NOOP_True',
+$$
+[%-
+# target is the bookbag itself. The 'items' variable does not need to be in
+# the environment because a special reactor will take care of filling it in.
+
+FOR item IN items;
+    bibxml = helpers.xml_doc(item.target_biblio_record_entry.marc);
+    title = "";
+    FOR part IN bibxml.findnodes('//*[@tag="245"]/*[@code="a" or @code="b"]');
+        title = title _ part.textContent;
+    END;
+    author = bibxml.findnodes('//*[@tag="100"]/*[@code="a"]').textContent;
+
+    helpers.csv_datum(title) %],[% helpers.csv_datum(author) %],[% FOR note IN item.notes; helpers.csv_datum(note.note); ","; END; "\n";
+END -%]
+$$
+);
+
+-- Evergreen DB patch 0627.data.patron-password-reset-msg.sql
+--
+-- Updates password reset template to match TPAC reset form
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0627', :eg_version);
+
+UPDATE action_trigger.event_definition SET template = 
+$$
+[%- USE date -%]
+[%- user = target.usr -%]
+To: [%- params.recipient_email || user.email %]
+From: [%- params.sender_email || user.home_ou.email || default_sender %]
+Subject: [% user.home_ou.name %]: library account password reset request
+
+You have received this message because you, or somebody else, requested a reset
+of your library system password. If you did not request a reset of your library
+system password, just ignore this message and your current password will
+continue to work.
+
+If you did request a reset of your library system password, please perform
+the following steps to continue the process of resetting your password:
+
+1. Open the following link in a web browser: https://[% params.hostname %]/eg/opac/password_reset/[% target.uuid %]
+The browser displays a password reset form.
+
+2. Enter your new password in the password reset form in the browser. You must
+enter the password twice to ensure that you do not make a mistake. If the
+passwords match, you will then be able to log in to your library system account
+with the new password.
+
+$$
+WHERE id = 20; -- Password reset request notification
+
+
+SELECT evergreen.upgrade_deps_block_check('0630', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) VALUES
+( 'circ.transit.suppress_hold', 'circ',
+    oils_i18n_gettext('circ.transit.suppress_hold',
+        'Suppress Hold Transits Group',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.transit.suppress_hold',
+        'If set to a non-empty value, Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
+        'coust', 'description'),
+    'string')
+,( 'circ.transit.suppress_non_hold', 'circ',
+    oils_i18n_gettext('circ.transit.suppress_non_hold',
+        'Suppress Non-Hold Transits Group',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.transit.suppress_non_hold',
+        'If set to a non-empty value, Non-Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
+        'coust', 'description'),
+    'string');
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0632', :eg_version);
+
+INSERT INTO config.org_unit_setting_type (name, grp, label, description, datatype) VALUES
+( 'opac.username_regex', 'glob',
+    oils_i18n_gettext('opac.username_regex',
+        'Patron username format',
+        'coust', 'label'),
+    oils_i18n_gettext('opac.username_regex',
+        'Regular expression defining the patron username format, used for patron registration and self-service username changing only',
+        'coust', 'description'),
+    'string')
+,( 'opac.lock_usernames', 'glob',
+    oils_i18n_gettext('opac.lock_usernames',
+        'Lock Usernames',
+        'coust', 'label'),
+    oils_i18n_gettext('opac.lock_usernames',
+        'If enabled username changing via the OPAC will be disabled',
+        'coust', 'description'),
+    'bool')
+,( 'opac.unlimit_usernames', 'glob',
+    oils_i18n_gettext('opac.unlimit_usernames',
+        'Allow multiple username changes',
+        'coust', 'label'),
+    oils_i18n_gettext('opac.unlimit_usernames',
+        'If enabled (and Lock Usernames is not set) patrons will be allowed to change their username when it does not look like a barcode. Otherwise username changing in the OPAC will only be allowed when the patron''s username looks like a barcode.',
+        'coust', 'description'),
+    'bool')
+;
+
+-- Evergreen DB patch 0635.data.opac.jump-to-details-setting.sql
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0635', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, grp, label, description, datatype )
+    VALUES (
+        'opac.staff.jump_to_details_on_single_hit', 
+        'opac',
+        oils_i18n_gettext(
+            'opac.staff.jump_to_details_on_single_hit',
+            'Jump to details on 1 hit (staff client)',
+            'coust', 
+            'label'
+        ),
+        oils_i18n_gettext(
+            'opac.staff.jump_to_details_on_single_hit',
+            'When a search yields only 1 result, jump directly to the record details page.  This setting only affects the OPAC within the staff client',
+            'coust', 
+            'description'
+        ),
+        'bool'
+    ), (
+        'opac.patron.jump_to_details_on_single_hit', 
+        'opac',
+        oils_i18n_gettext(
+            'opac.patron.jump_to_details_on_single_hit',
+            'Jump to details on 1 hit (public)',
+            'coust', 
+            'label'
+        ),
+        oils_i18n_gettext(
+            'opac.patron.jump_to_details_on_single_hit',
+            'When a search yields only 1 result, jump directly to the record details page.  This setting only affects the public OPAC',
+            'coust', 
+            'description'
+        ),
+        'bool'
+    );
+
+-- Evergreen DB patch 0636.data.grace_period_extend.sql
+--
+-- OU setting turns on grace period auto extension. By default they only do so
+-- when the grace period ends on a closed date, but there are two modifiers to
+-- change that.
+-- 
+-- The first modifier causes grace periods to extend for all closed dates that
+-- they intersect. This is "grace periods are only consumed by open days."
+-- 
+-- The second modifier causes a grace period that ends just before a closed
+-- day, with or without extension having happened, to include the closed day
+-- (and any following it) as well. This is mainly so that a backdate into the
+-- closed period following the grace period will assume the "best case" of the
+-- item having been returned after hours on the last day of the closed date.
+--
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0636', :eg_version);
+
+INSERT INTO config.org_unit_setting_type(name, grp, label, description, datatype) VALUES
+
+( 'circ.grace.extend', 'circ',
+    oils_i18n_gettext('circ.grace.extend',
+        'Auto-Extend Grace Periods',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.grace.extend',
+        'When enabled grace periods will auto-extend. By default this will be only when they are a full day or more and end on a closed date, though other options can alter this.',
+        'coust', 'description'),
+    'bool')
+
+,( 'circ.grace.extend.all', 'circ',
+    oils_i18n_gettext('circ.grace.extend.all',
+        'Auto-Extending Grace Periods extend for all closed dates',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.grace.extend.all',
+        'If enabled and Grace Periods auto-extending is turned on grace periods will extend past all closed dates they intersect, within hard-coded limits. This basically becomes "grace periods can only be consumed by closed dates".',
+        'coust', 'description'),
+    'bool')
+
+,( 'circ.grace.extend.into_closed', 'circ',
+    oils_i18n_gettext('circ.grace.extend.into_closed',
+        'Auto-Extending Grace Periods include trailing closed dates',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.grace.extend.into_closed',
+         'If enabled and Grace Periods auto-extending is turned on grace periods will include closed dates that directly follow the last day of the grace period, to allow a backdate into the closed dates to assume "returned after hours on the last day of the grace period, and thus still within it" automatically.',
+        'coust', 'description'),
+    'bool');
+
+
+-- XXXX.schema-acs-nfi.sql
+
+SELECT evergreen.upgrade_deps_block_check('0640', :eg_version);
+
+-- AFTER UPDATE OR INSERT trigger for authority.record_entry
+CREATE OR REPLACE FUNCTION authority.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
+BEGIN
+
+    IF NEW.deleted IS TRUE THEN -- If this authority is deleted
+        DELETE FROM authority.bib_linking WHERE authority = NEW.id; -- Avoid updating fields in bibs that are no longer visible
+        DELETE FROM authority.full_rec WHERE record = NEW.id; -- Avoid validating fields against deleted authority records
+        DELETE FROM authority.simple_heading WHERE record = NEW.id;
+          -- Should remove matching $0 from controlled fields at the same time?
+        RETURN NEW; -- and we're done
+    END IF;
+
+    IF TG_OP = 'UPDATE' THEN -- re-ingest?
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
+
+        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+            RETURN NEW;
+        END IF;
+
+        -- Propagate these updates to any linked bib records
+        PERFORM authority.propagate_changes(NEW.id) FROM authority.record_entry WHERE id = NEW.id;
+
+        DELETE FROM authority.simple_heading WHERE record = NEW.id;
+    END IF;
+
+    INSERT INTO authority.simple_heading (record,atag,value,sort_value)
+        SELECT record, atag, value, sort_value FROM authority.simple_heading_set(NEW.marc);
+
+    -- Flatten and insert the afr data
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_full_rec' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM authority.reingest_authority_full_rec(NEW.id);
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_rec_descriptor' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM authority.reingest_authority_rec_descriptor(NEW.id);
+        END IF;
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+ALTER TABLE authority.control_set_authority_field ADD COLUMN nfi CHAR(1);
+
+-- Entries that need to respect an NFI
+UPDATE authority.control_set_authority_field SET nfi = '2'
+    WHERE id IN (4,24,44,64);
+
+DROP TRIGGER authority_full_rec_fti_trigger ON authority.full_rec;
+CREATE TRIGGER authority_full_rec_fti_trigger
+    BEFORE UPDATE OR INSERT ON authority.full_rec
+    FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('keyword');
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT, no_thesaurus BOOL ) RETURNS TEXT AS $func$
+DECLARE
+    acsaf           authority.control_set_authority_field%ROWTYPE;
+    tag_used        TEXT;
+    nfi_used        TEXT;
+    sf              TEXT;
+    thes_code       TEXT;
+    cset            INT;
+    heading_text    TEXT;
+    tmp_text        TEXT;
+    first_sf        BOOL;
+    auth_id         INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml)::INT;
+BEGIN
+    SELECT control_set INTO cset FROM authority.record_entry WHERE id = auth_id;
+
+    IF cset IS NULL THEN
+        SELECT  control_set INTO cset
+          FROM  authority.control_set_authority_field
+          WHERE tag IN ( SELECT  UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[]))
+          LIMIT 1;
+    END IF;
+
+    thes_code := vandelay.marc21_extract_fixed_field(marcxml,'Subj');
+    IF thes_code IS NULL THEN
+        thes_code := '|';
+    ELSIF thes_code = 'z' THEN
+        thes_code := COALESCE( oils_xpath_string('//*[@tag="040"]/*[@code="f"][1]', marcxml), '' );
+    END IF;
+
+    heading_text := '';
+    FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP
+        tag_used := acsaf.tag;
+        nfi_used := acsaf.nfi;
+        first_sf := TRUE;
+        FOR sf IN SELECT * FROM regexp_split_to_table(acsaf.sf_list,'') LOOP
+            tmp_text := oils_xpath_string('//*[@tag="'||tag_used||'"]/*[@code="'||sf||'"]', marcxml);
+
+            IF first_sf AND tmp_text IS NOT NULL AND nfi_used IS NOT NULL THEN
+
+                tmp_text := SUBSTRING(
+                    tmp_text FROM
+                    COALESCE(
+                        NULLIF(
+                            REGEXP_REPLACE(
+                                oils_xpath_string('//*[@tag="'||tag_used||'"]/@ind'||nfi_used, marcxml),
+                                $$\D+$$,
+                                '',
+                                'g'
+                            ),
+                            ''
+                        )::INT,
+                        0
+                    ) + 1
+                );
+
+            END IF;
+
+            first_sf := FALSE;
+
+            IF tmp_text IS NOT NULL AND tmp_text <> '' THEN
+                heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text;
+            END IF;
+        END LOOP;
+        EXIT WHEN heading_text <> '';
+    END LOOP;
+
+    IF heading_text <> '' THEN
+        IF no_thesaurus IS TRUE THEN
+            heading_text := tag_used || ' ' || public.naco_normalize(heading_text);
+        ELSE
+            heading_text := tag_used || '_' || COALESCE(nfi_used,'-') || '_' || thes_code || ' ' || public.naco_normalize(heading_text);
+        END IF;
+    ELSE
+        heading_text := 'NOHEADING_' || thes_code || ' ' || MD5(marcxml);
+    END IF;
+
+    RETURN heading_text;
+END;
+$func$ LANGUAGE PLPGSQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION authority.simple_normalize_heading( marcxml TEXT ) RETURNS TEXT AS $func$
+    SELECT authority.normalize_heading($1, TRUE);
+$func$ LANGUAGE SQL IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION authority.normalize_heading( marcxml TEXT ) RETURNS TEXT AS $func$
+    SELECT authority.normalize_heading($1, FALSE);
+$func$ LANGUAGE SQL IMMUTABLE;
+
+
+CREATE TABLE authority.simple_heading (
+    id              BIGSERIAL   PRIMARY KEY,
+    record          BIGINT      NOT NULL REFERENCES authority.record_entry (id),
+    atag            INT         NOT NULL REFERENCES authority.control_set_authority_field (id),
+    value           TEXT        NOT NULL,
+    sort_value      TEXT        NOT NULL,
+    index_vector    tsvector    NOT NULL
+);
+CREATE TRIGGER authority_simple_heading_fti_trigger
+    BEFORE UPDATE OR INSERT ON authority.simple_heading
+    FOR EACH ROW EXECUTE PROCEDURE oils_tsearch2('keyword');
+
+CREATE INDEX authority_simple_heading_index_vector_idx ON authority.simple_heading USING GIST (index_vector);
+CREATE INDEX authority_simple_heading_value_idx ON authority.simple_heading (value);
+CREATE INDEX authority_simple_heading_sort_value_idx ON authority.simple_heading (sort_value);
+
+CREATE OR REPLACE FUNCTION authority.simple_heading_set( marcxml TEXT ) RETURNS SETOF authority.simple_heading AS $func$
+DECLARE
+    res             authority.simple_heading%ROWTYPE;
+    acsaf           authority.control_set_authority_field%ROWTYPE;
+    tag_used        TEXT;
+    nfi_used        TEXT;
+    sf              TEXT;
+    cset            INT;
+    heading_text    TEXT;
+    sort_text       TEXT;
+    tmp_text        TEXT;
+    tmp_xml         TEXT;
+    first_sf        BOOL;
+    auth_id         INT DEFAULT oils_xpath_string('//*[@tag="901"]/*[local-name()="subfield" and @code="c"]', marcxml)::INT;
+BEGIN
+
+    res.record := auth_id;
+
+    SELECT  control_set INTO cset
+      FROM  authority.control_set_authority_field
+      WHERE tag IN ( SELECT UNNEST(XPATH('//*[starts-with(@tag,"1")]/@tag',marcxml::XML)::TEXT[]) )
+      LIMIT 1;
+
+    FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset LOOP
+
+        res.atag := acsaf.id;
+        tag_used := acsaf.tag;
+        nfi_used := acsaf.nfi;
+
+        FOR tmp_xml IN SELECT UNNEST(XPATH('//*[@tag="'||tag_used||'"]', marcxml::XML)) LOOP
+            heading_text := '';
+
+            FOR sf IN SELECT * FROM regexp_split_to_table(acsaf.sf_list,'') LOOP
+                heading_text := heading_text || COALESCE( ' ' || oils_xpath_string('//*[@code="'||sf||'"]',tmp_xml::TEXT), '');
+            END LOOP;
+
+            heading_text := public.naco_normalize(heading_text);
+            
+            IF nfi_used IS NOT NULL THEN
+
+                sort_text := SUBSTRING(
+                    heading_text FROM
+                    COALESCE(
+                        NULLIF(
+                            REGEXP_REPLACE(
+                                oils_xpath_string('//*[@tag="'||tag_used||'"]/@ind'||nfi_used, marcxml),
+                                $$\D+$$,
+                                '',
+                                'g'
+                            ),
+                            ''
+                        )::INT,
+                        0
+                    ) + 1
+                );
+
+            ELSE
+                sort_text := heading_text;
+            END IF;
+
+            IF heading_text IS NOT NULL AND heading_text <> '' THEN
+                res.value := heading_text;
+                res.sort_value := sort_text;
+                RETURN NEXT res;
+            END IF;
+
+        END LOOP;
+
+    END LOOP;
+
+    RETURN;
+END;
+$func$ LANGUAGE PLPGSQL IMMUTABLE;
+
+-- Support function used to find the pivot for alpha-heading-browse style searching
+CREATE OR REPLACE FUNCTION authority.simple_heading_find_pivot( a INT[], q TEXT ) RETURNS TEXT AS $$
+DECLARE
+    sort_value_row  RECORD;
+    value_row       RECORD;
+    t_term          TEXT;
+BEGIN
+
+    t_term := public.naco_normalize(q);
+
+    SELECT  CASE WHEN ash.sort_value LIKE t_term || '%' THEN 1 ELSE 0 END
+                + CASE WHEN ash.value LIKE t_term || '%' THEN 1 ELSE 0 END AS rank,
+            ash.sort_value
+      INTO  sort_value_row
+      FROM  authority.simple_heading ash
+      WHERE ash.atag = ANY (a)
+            AND ash.sort_value >= t_term
+      ORDER BY rank DESC, ash.sort_value
+      LIMIT 1;
+
+    SELECT  CASE WHEN ash.sort_value LIKE t_term || '%' THEN 1 ELSE 0 END
+                + CASE WHEN ash.value LIKE t_term || '%' THEN 1 ELSE 0 END AS rank,
+            ash.sort_value
+      INTO  value_row
+      FROM  authority.simple_heading ash
+      WHERE ash.atag = ANY (a)
+            AND ash.value >= t_term
+      ORDER BY rank DESC, ash.sort_value
+      LIMIT 1;
+
+    IF value_row.rank > sort_value_row.rank THEN
+        RETURN value_row.sort_value;
+    ELSE
+        RETURN sort_value_row.sort_value;
+    END IF;
+END;
+$$ LANGUAGE PLPGSQL;
+
+
+CREATE OR REPLACE FUNCTION authority.simple_heading_browse_center( atag_list INT[], q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+DECLARE
+    pivot_sort_value    TEXT;
+    boffset             INT DEFAULT 0;
+    aoffset             INT DEFAULT 0;
+    blimit              INT DEFAULT 0;
+    alimit              INT DEFAULT 0;
+BEGIN
+
+    pivot_sort_value := authority.simple_heading_find_pivot(atag_list,q);
+
+    IF page = 0 THEN
+        blimit := pagesize / 2;
+        alimit := blimit;
+
+        IF pagesize % 2 <> 0 THEN
+            alimit := alimit + 1;
+        END IF;
+    ELSE
+        blimit := pagesize;
+        alimit := blimit;
+
+        boffset := pagesize / 2;
+        aoffset := boffset;
+
+        IF pagesize % 2 <> 0 THEN
+            boffset := boffset + 1;
+        END IF;
+    END IF;
+
+    IF page <= 0 THEN
+        RETURN QUERY
+            -- "bottom" half of the browse results
+            SELECT id FROM (
+                SELECT  ash.id,
+                        row_number() over ()
+                  FROM  authority.simple_heading ash
+                  WHERE ash.atag = ANY (atag_list)
+                        AND ash.sort_value < pivot_sort_value
+                  ORDER BY ash.sort_value DESC
+                  LIMIT blimit
+                  OFFSET ABS(page) * pagesize - boffset
+            ) x ORDER BY row_number DESC;
+    END IF;
+
+    IF page >= 0 THEN
+        RETURN QUERY
+            -- "bottom" half of the browse results
+            SELECT  ash.id
+              FROM  authority.simple_heading ash
+              WHERE ash.atag = ANY (atag_list)
+                    AND ash.sort_value >= pivot_sort_value
+              ORDER BY ash.sort_value
+              LIMIT alimit
+              OFFSET ABS(page) * pagesize - aoffset;
+    END IF;
+END;
+$$ LANGUAGE PLPGSQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.simple_heading_browse_top( atag_list INT[], q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+DECLARE
+    pivot_sort_value    TEXT;
+BEGIN
+
+    pivot_sort_value := authority.simple_heading_find_pivot(atag_list,q);
+
+    IF page < 0 THEN
+        RETURN QUERY
+            -- "bottom" half of the browse results
+            SELECT id FROM (
+                SELECT  ash.id,
+                        row_number() over ()
+                  FROM  authority.simple_heading ash
+                  WHERE ash.atag = ANY (atag_list)
+                        AND ash.sort_value < pivot_sort_value
+                  ORDER BY ash.sort_value DESC
+                  LIMIT pagesize
+                  OFFSET (ABS(page) - 1) * pagesize
+            ) x ORDER BY row_number DESC;
+    END IF;
+
+    IF page >= 0 THEN
+        RETURN QUERY
+            -- "bottom" half of the browse results
+            SELECT  ash.id
+              FROM  authority.simple_heading ash
+              WHERE ash.atag = ANY (atag_list)
+                    AND ash.sort_value >= pivot_sort_value
+              ORDER BY ash.sort_value
+              LIMIT pagesize
+              OFFSET ABS(page) * pagesize ;
+    END IF;
+END;
+$$ LANGUAGE PLPGSQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.simple_heading_search_rank( atag_list INT[], q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT  ash.id
+      FROM  authority.simple_heading ash,
+            public.naco_normalize($2) t(term),
+            plainto_tsquery('keyword'::regconfig,$2) ptsq(term)
+      WHERE ash.atag = ANY ($1)
+            AND ash.index_vector @@ ptsq.term
+      ORDER BY ts_rank_cd(ash.index_vector,ptsq.term,14)::numeric
+                    + CASE WHEN ash.sort_value LIKE t.term || '%' THEN 2 ELSE 0 END
+                    + CASE WHEN ash.value LIKE t.term || '%' THEN 1 ELSE 0 END DESC
+      LIMIT $4
+      OFFSET $4 * $3;
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.simple_heading_search_heading( atag_list INT[], q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT  ash.id
+      FROM  authority.simple_heading ash,
+            public.naco_normalize($2) t(term),
+            plainto_tsquery('keyword'::regconfig,$2) ptsq(term)
+      WHERE ash.atag = ANY ($1)
+            AND ash.index_vector @@ ptsq.term
+      ORDER BY ash.sort_value
+      LIMIT $4
+      OFFSET $4 * $3;
+$$ LANGUAGE SQL ROWS 10;
+
+
+CREATE OR REPLACE FUNCTION authority.axis_authority_tags(a TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_ACCUM(field) FROM authority.browse_axis_authority_field_map WHERE axis = $1;
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION authority.axis_authority_tags_refs(a TEXT) RETURNS INT[] AS $$
+    SELECT  ARRAY_CAT(
+                ARRAY[a.field],
+                (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.field)
+            )
+      FROM  authority.browse_axis_authority_field_map a
+      WHERE axis = $1
+$$ LANGUAGE SQL;
+
+
+
+CREATE OR REPLACE FUNCTION authority.btag_authority_tags(btag TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_ACCUM(authority_field) FROM authority.control_set_bib_field WHERE tag = $1
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION authority.btag_authority_tags_refs(btag TEXT) RETURNS INT[] AS $$
+    SELECT  ARRAY_CAT(
+                ARRAY[a.authority_field],
+                (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.authority_field)
+            )
+      FROM  authority.control_set_bib_field a
+      WHERE a.tag = $1
+$$ LANGUAGE SQL;
+
+
+
+CREATE OR REPLACE FUNCTION authority.atag_authority_tags(atag TEXT) RETURNS INT[] AS $$
+    SELECT ARRAY_ACCUM(id) FROM authority.control_set_authority_field WHERE tag = $1
+$$ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION authority.atag_authority_tags_refs(atag TEXT) RETURNS INT[] AS $$
+    SELECT  ARRAY_CAT(
+                ARRAY[a.id],
+                (SELECT ARRAY_ACCUM(x.id) FROM authority.control_set_authority_field x WHERE x.main_entry = a.id)
+            )
+      FROM  authority.control_set_authority_field a
+      WHERE a.tag = $1
+$$ LANGUAGE SQL;
+
+
+CREATE OR REPLACE FUNCTION authority.axis_browse_center( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.axis_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_browse_center( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.btag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_browse_center( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.atag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.axis_browse_center_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.axis_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_browse_center_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.btag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_browse_center_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 9 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_center(authority.atag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+
+CREATE OR REPLACE FUNCTION authority.axis_browse_top( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.axis_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_browse_top( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.btag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_browse_top( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.atag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.axis_browse_top_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.axis_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_browse_top_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.btag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_browse_top_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_browse_top(authority.atag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+
+CREATE OR REPLACE FUNCTION authority.axis_search_rank( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.axis_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_search_rank( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.btag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_search_rank( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.atag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.axis_search_rank_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.axis_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_search_rank_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.btag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_search_rank_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_rank(authority.atag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+
+CREATE OR REPLACE FUNCTION authority.axis_search_heading( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.axis_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_search_heading( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.btag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_search_heading( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.atag_authority_tags($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.axis_search_heading_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.axis_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.btag_search_heading_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.btag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+CREATE OR REPLACE FUNCTION authority.atag_search_heading_refs( a TEXT, q TEXT, page INT DEFAULT 0, pagesize INT DEFAULT 10 ) RETURNS SETOF BIGINT AS $$
+    SELECT * FROM authority.simple_heading_search_heading(authority.atag_authority_tags_refs($1), $2, $3, $4)
+$$ LANGUAGE SQL ROWS 10;
+
+
+
+-- Evergreen DB patch 0641.schema.org_unit_setting_json_check.sql
+--
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0641', :eg_version);
+
+ALTER TABLE actor.org_unit_setting ADD CONSTRAINT aous_must_be_json CHECK ( is_json(value) );
+
+-- Evergreen DB patch 0642.data.acq-worksheet-hold-count.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0642', :eg_version);
+
+UPDATE action_trigger.event_definition SET template = 
+$$
+[%- USE date -%]
+[%- SET li = target; -%]
+<div class="wrapper">
+    <div class="summary" style='font-size:110%; font-weight:bold;'>
+
+        <div>Title: [% helpers.get_li_attr("title", "", li.attributes) %]</div>
+        <div>Author: [% helpers.get_li_attr("author", "", li.attributes) %]</div>
+        <div class="count">Item Count: [% li.lineitem_details.size %]</div>
+        <div class="lineid">Lineitem ID: [% li.id %]</div>
+        <div>Open Holds: [% helpers.bre_open_hold_count(li.eg_bib_id) %]</div>
+
+        [% IF li.distribution_formulas.size > 0 %]
+            [% SET forms = [] %]
+            [% FOREACH form IN li.distribution_formulas; forms.push(form.formula.name); END %]
+            <div>Distribution Formulas: [% forms.join(',') %]</div>
+        [% END %]
+
+        [% IF li.lineitem_notes.size > 0 %]
+            Lineitem Notes:
+            <ul>
+                [%- FOR note IN li.lineitem_notes -%]
+                    <li>
+                    [% IF note.alert_text %]
+                        [% note.alert_text.code -%] 
+                        [% IF note.value -%]
+                            : [% note.value %]
+                        [% END %]
+                    [% ELSE %]
+                        [% note.value -%] 
+                    [% END %]
+                    </li>
+                [% END %]
+            </ul>
+        [% END %]
+    </div>
+    <br/>
+    <table>
+        <thead>
+            <tr>
+                <th>Branch</th>
+                <th>Barcode</th>
+                <th>Call Number</th>
+                <th>Fund</th>
+                <th>Shelving Location</th>
+                <th>Recd.</th>
+                <th>Notes</th>
+            </tr>
+        </thead>
+        <tbody>
+        [% FOREACH detail IN li.lineitem_details.sort('owning_lib') %]
+            [% 
+                IF detail.eg_copy_id;
+                    SET copy = detail.eg_copy_id;
+                    SET cn_label = copy.call_number.label;
+                ELSE; 
+                    SET copy = detail; 
+                    SET cn_label = detail.cn_label;
+                END 
+            %]
+            <tr>
+                <!-- acq.lineitem_detail.id = [%- detail.id -%] -->
+                <td style='padding:5px;'>[% detail.owning_lib.shortname %]</td>
+                <td style='padding:5px;'>[% IF copy.barcode   %]<span class="barcode"  >[% detail.barcode   %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF cn_label %]<span class="cn_label" >[% cn_label  %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% IF detail.fund %]<span class="fund">[% detail.fund.code %] ([% detail.fund.year %])</span>[% END %]</td>
+                <td style='padding:5px;'>[% copy.location.name %]</td>
+                <td style='padding:5px;'>[% IF detail.recv_time %]<span class="recv_time">[% detail.recv_time %]</span>[% END %]</td>
+                <td style='padding:5px;'>[% detail.note %]</td>
+            </tr>
+        [% END %]
+        </tbody>
+    </table>
+</div>
+$$
+WHERE id = 14;
+
+
+SELECT evergreen.upgrade_deps_block_check('0643', :eg_version);
+
+DO $$
+DECLARE x TEXT;
+BEGIN
+
+    FOR x IN
+        SELECT  marc
+          FROM  authority.record_entry
+          WHERE id > 0
+                AND NOT deleted
+                AND id NOT IN (SELECT DISTINCT record FROM authority.simple_heading)
+    LOOP
+        INSERT INTO authority.simple_heading (record,atag,value,sort_value)
+            SELECT record, atag, value, sort_value FROM authority.simple_heading_set(x);
+    END LOOP;
+END;
+$$;
+
+
+
+SELECT evergreen.upgrade_deps_block_check('0644', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) VALUES
+( 'circ.holds.target_when_closed', 'circ',
+    oils_i18n_gettext('circ.holds.target_when_closed',
+        'Target copies for a hold even if copy''s circ lib is closed',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.holds.target_when_closed',
+        'If this setting is true at a given org unit or one of its ancestors, the hold targeter will target copies from this org unit even if the org unit is closed (according to the actor.org_unit.closed_date table).',
+        'coust', 'description'),
+    'bool'),
+( 'circ.holds.target_when_closed_if_at_pickup_lib', 'circ',
+    oils_i18n_gettext('circ.holds.target_when_closed_if_at_pickup_lib',
+        'Target copies for a hold even if copy''s circ lib is closed IF the circ lib is the hold''s pickup lib',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.holds.target_when_closed_if_at_pickup_lib',
+        'If this setting is true at a given org unit or one of its ancestors, the hold targeter will target copies from this org unit even if the org unit is closed (according to the actor.org_unit.closed_date table) IF AND ONLY IF the copy''s circ lib is the same as the hold''s pickup lib.',
+        'coust', 'description'),
+    'bool')
+;
+
+-- Evergreen DB patch XXXX.data.hold-notification-cleanup-mod.sql
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0647', :eg_version);
+
+INSERT INTO action_trigger.cleanup ( module, description ) VALUES (
+    'CreateHoldNotification',
+    oils_i18n_gettext(
+        'CreateHoldNotification',
+        'Creates a hold_notification record for each notified hold',
+        'atclean',
+        'description'
+    )
+);
+
+UPDATE action_trigger.event_definition 
+    SET 
+        cleanup_success = 'CreateHoldNotification' 
+    WHERE 
+        id = 5 -- stock hold-ready email event_def
+        AND cleanup_success IS NULL; -- don't clobber any existing cleanup mod
+
+-- Evergreen DB patch XXXX.schema.unnest-hold-permit-upgrade-script-repair.sql
+--
+-- This patch makes no changes to the baseline schema and is 
+-- only meant to repair a previous upgrade script.
+--
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0651', :eg_version);
+
+CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$
+DECLARE
+    matchpoint_id        INT;
+    user_object        actor.usr%ROWTYPE;
+    age_protect_object    config.rule_age_hold_protect%ROWTYPE;
+    standing_penalty    config.standing_penalty%ROWTYPE;
+    transit_range_ou_type    actor.org_unit_type%ROWTYPE;
+    transit_source        actor.org_unit%ROWTYPE;
+    item_object        asset.copy%ROWTYPE;
+    item_cn_object     asset.call_number%ROWTYPE;
+    ou_skip              actor.org_unit_setting%ROWTYPE;
+    result            action.matrix_test_result;
+    hold_test        config.hold_matrix_matchpoint%ROWTYPE;
+    use_active_date   TEXT;
+    age_protect_date  TIMESTAMP WITH TIME ZONE;
+    hold_count        INT;
+    hold_transit_prox    INT;
+    frozen_hold_count    INT;
+    context_org_list    INT[];
+    done            BOOL := FALSE;
+BEGIN
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user;
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( pickup_ou );
+
+    result.success := TRUE;
+
+    -- Fail if we couldn't find a user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item;
+
+    -- Fail if we couldn't find a copy
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO matchpoint_id action.find_hold_matrix_matchpoint(pickup_ou, request_ou, match_item, match_user, match_requestor);
+    result.matchpoint := matchpoint_id;
+
+    SELECT INTO ou_skip * FROM actor.org_unit_setting WHERE name = 'circ.holds.target_skip_me' AND org_unit = item_object.circ_lib;
+
+    -- Fail if the circ_lib for the item has circ.holds.target_skip_me set to true
+    IF ou_skip.id IS NOT NULL AND ou_skip.value = 'true' THEN
+        result.fail_part := 'circ.holds.target_skip_me';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Fail if we couldn't find any matchpoint (requires a default)
+    IF matchpoint_id IS NULL THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO hold_test * FROM config.hold_matrix_matchpoint WHERE id = matchpoint_id;
+
+    IF hold_test.holdable IS FALSE THEN
+        result.fail_part := 'config.hold_matrix_test.holdable';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    IF hold_test.transit_range IS NOT NULL THEN
+        SELECT INTO transit_range_ou_type * FROM actor.org_unit_type WHERE id = hold_test.transit_range;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO transit_source ou.* FROM actor.org_unit ou JOIN asset.call_number cn ON (cn.owning_lib = ou.id) WHERE cn.id = item_object.call_number;
+        ELSE
+            SELECT INTO transit_source * FROM actor.org_unit WHERE id = item_object.circ_lib;
+        END IF;
+
+        PERFORM * FROM actor.org_unit_descendants( transit_source.id, transit_range_ou_type.depth ) WHERE id = pickup_ou;
+
+        IF NOT FOUND THEN
+            result.fail_part := 'transit_range';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE '%HOLD%' LOOP
+
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
+
+    IF hold_test.stop_blocked_user IS TRUE THEN
+        FOR standing_penalty IN
+            SELECT  DISTINCT csp.*
+              FROM  actor.usr_standing_penalty usp
+                    JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+              WHERE usr = match_user
+                    AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                    AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                    AND csp.block_list LIKE '%CIRC%' LOOP
+    
+            result.fail_part := standing_penalty.name;
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END LOOP;
+    END IF;
+
+    IF hold_test.max_holds IS NOT NULL AND NOT retargetting THEN
+        SELECT    INTO hold_count COUNT(*)
+          FROM    action.hold_request
+          WHERE    usr = match_user
+            AND fulfillment_time IS NULL
+            AND cancel_time IS NULL
+            AND CASE WHEN hold_test.include_frozen_holds THEN TRUE ELSE frozen IS FALSE END;
+
+        IF hold_count >= hold_test.max_holds THEN
+            result.fail_part := 'config.hold_matrix_test.max_holds';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    IF item_object.age_protect IS NOT NULL THEN
+        SELECT INTO age_protect_object * FROM config.rule_age_hold_protect WHERE id = item_object.age_protect;
+        IF hold_test.distance_is_from_owner THEN
+            SELECT INTO use_active_date value FROM actor.org_unit_ancestor_setting('circ.holds.age_protect.active_date', item_cn_object.owning_lib);
+        ELSE
+            SELECT INTO use_active_date value FROM actor.org_unit_ancestor_setting('circ.holds.age_protect.active_date', item_object.circ_lib);
+        END IF;
+        IF use_active_date = 'true' THEN
+            age_protect_date := COALESCE(item_object.active_date, NOW());
+        ELSE
+            age_protect_date := item_object.create_date;
+        END IF;
+        IF age_protect_date + age_protect_object.age > NOW() THEN
+            IF hold_test.distance_is_from_owner THEN
+                SELECT INTO item_cn_object * FROM asset.call_number WHERE id = item_object.call_number;
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_cn_object.owning_lib AND to_org = pickup_ou;
+            ELSE
+                SELECT INTO hold_transit_prox prox FROM actor.org_unit_proximity WHERE from_org = item_object.circ_lib AND to_org = pickup_ou;
+            END IF;
+
+            IF hold_transit_prox > age_protect_object.prox THEN
+                result.fail_part := 'config.rule_age_hold_protect.prox';
+                result.success := FALSE;
+                done := TRUE;
+                RETURN NEXT result;
+            END IF;
+        END IF;
+    END IF;
+
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1.0-2.1.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1.0-2.1.1-upgrade-db.sql
new file mode 100644 (file)
index 0000000..87ef6b5
--- /dev/null
@@ -0,0 +1,951 @@
+--Upgrade Script for 2.1.0 to 2.1.1
+BEGIN;
+INSERT INTO config.upgrade_log (version) VALUES ('2.1.1');
+-- Patch from Doug Kyle re: https://bugs.launchpad.net/evergreen/+bug/822918
+
+INSERT INTO config.upgrade_log (version) VALUES ('0637');
+
+CREATE OR REPLACE FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS SETOF action.circ_matrix_test_result AS $func$
+DECLARE
+    user_object             actor.usr%ROWTYPE;
+    standing_penalty        config.standing_penalty%ROWTYPE;
+    item_object             asset.copy%ROWTYPE;
+    item_status_object      config.copy_status%ROWTYPE;
+    item_location_object    asset.copy_location%ROWTYPE;
+    result                  action.circ_matrix_test_result;
+    circ_test               action.found_circ_matrix_matchpoint;
+    circ_matchpoint         config.circ_matrix_matchpoint%ROWTYPE;
+    out_by_circ_mod         config.circ_matrix_circ_mod_test%ROWTYPE;
+    circ_mod_map            config.circ_matrix_circ_mod_test_map%ROWTYPE;
+    hold_ratio              action.hold_stats%ROWTYPE;
+    penalty_type            TEXT;
+    items_out               INT;
+    context_org_list        INT[];
+    done                    BOOL := FALSE;
+BEGIN
+    -- Assume success unless we hit a failure condition
+    result.success := TRUE;
+
+    -- Need user info to look up matchpoints
+    SELECT INTO user_object * FROM actor.usr WHERE id = match_user AND NOT deleted;
+
+    -- (Insta)Fail if we couldn't find the user
+    IF user_object.id IS NULL THEN
+        result.fail_part := 'no_user';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- Need item info to look up matchpoints
+    SELECT INTO item_object * FROM asset.copy WHERE id = match_item AND NOT deleted;
+
+    -- (Insta)Fail if we couldn't find the item 
+    IF item_object.id IS NULL THEN
+        result.fail_part := 'no_item';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    SELECT INTO circ_test * FROM action.find_circ_matrix_matchpoint(circ_ou, item_object, user_object, renewal);
+
+    circ_matchpoint             := circ_test.matchpoint;
+    result.matchpoint           := circ_matchpoint.id;
+    result.circulate            := circ_matchpoint.circulate;
+    result.duration_rule        := circ_matchpoint.duration_rule;
+    result.recurring_fine_rule  := circ_matchpoint.recurring_fine_rule;
+    result.max_fine_rule        := circ_matchpoint.max_fine_rule;
+    result.hard_due_date        := circ_matchpoint.hard_due_date;
+    result.renewals             := circ_matchpoint.renewals;
+    result.grace_period         := circ_matchpoint.grace_period;
+    result.buildrows            := circ_test.buildrows;
+
+    -- (Insta)Fail if we couldn't find a matchpoint
+    IF circ_test.success = false THEN
+        result.fail_part := 'no_matchpoint';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+        RETURN;
+    END IF;
+
+    -- All failures before this point are non-recoverable
+    -- Below this point are possibly overridable failures
+
+    -- Fail if the user is barred
+    IF user_object.barred IS TRUE THEN
+        result.fail_part := 'actor.usr.barred';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Fail if the item can't circulate
+    IF item_object.circulate IS FALSE THEN
+        result.fail_part := 'asset.copy.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Fail if the item isn't in a circulateable status on a non-renewal
+    IF NOT renewal AND item_object.status NOT IN ( 0, 7, 8 ) THEN 
+        result.fail_part := 'asset.copy.status';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    -- Alternately, fail if the item isn't checked out on a renewal
+    ELSIF renewal AND item_object.status <> 1 THEN
+        result.fail_part := 'asset.copy.status';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Fail if the item can't circulate because of the shelving location
+    SELECT INTO item_location_object * FROM asset.copy_location WHERE id = item_object.location;
+    IF item_location_object.circulate IS FALSE THEN
+        result.fail_part := 'asset.copy_location.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Use Circ OU for penalties and such
+    SELECT INTO context_org_list ARRAY_ACCUM(id) FROM actor.org_unit_full_path( circ_ou );
+
+    IF renewal THEN
+        penalty_type = '%RENEW%';
+    ELSE
+        penalty_type = '%CIRC%';
+    END IF;
+
+    FOR standing_penalty IN
+        SELECT  DISTINCT csp.*
+          FROM  actor.usr_standing_penalty usp
+                JOIN config.standing_penalty csp ON (csp.id = usp.standing_penalty)
+          WHERE usr = match_user
+                AND usp.org_unit IN ( SELECT * FROM unnest(context_org_list) )
+                AND (usp.stop_date IS NULL or usp.stop_date > NOW())
+                AND csp.block_list LIKE penalty_type LOOP
+
+        result.fail_part := standing_penalty.name;
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END LOOP;
+
+    -- Fail if the test is set to hard non-circulating
+    IF circ_matchpoint.circulate IS FALSE THEN
+        result.fail_part := 'config.circ_matrix_test.circulate';
+        result.success := FALSE;
+        done := TRUE;
+        RETURN NEXT result;
+    END IF;
+
+    -- Fail if the total copy-hold ratio is too low
+    IF circ_matchpoint.total_copy_hold_ratio IS NOT NULL THEN
+        SELECT INTO hold_ratio * FROM action.copy_related_hold_stats(match_item);
+        IF hold_ratio.total_copy_ratio IS NOT NULL AND hold_ratio.total_copy_ratio < circ_matchpoint.total_copy_hold_ratio THEN
+            result.fail_part := 'config.circ_matrix_test.total_copy_hold_ratio';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    -- Fail if the available copy-hold ratio is too low
+    IF circ_matchpoint.available_copy_hold_ratio IS NOT NULL THEN
+        IF hold_ratio.hold_count IS NULL THEN
+            SELECT INTO hold_ratio * FROM action.copy_related_hold_stats(match_item);
+        END IF;
+        IF hold_ratio.available_copy_ratio IS NOT NULL AND hold_ratio.available_copy_ratio < circ_matchpoint.available_copy_hold_ratio THEN
+            result.fail_part := 'config.circ_matrix_test.available_copy_hold_ratio';
+            result.success := FALSE;
+            done := TRUE;
+            RETURN NEXT result;
+        END IF;
+    END IF;
+
+    -- Fail if the user has too many items with specific circ_modifiers checked out
+    IF NOT renewal THEN
+        FOR out_by_circ_mod IN SELECT * FROM config.circ_matrix_circ_mod_test WHERE matchpoint = circ_matchpoint.id LOOP
+            SELECT  INTO items_out COUNT(*)
+              FROM  action.circulation circ
+                JOIN asset.copy cp ON (cp.id = circ.target_copy)
+              WHERE circ.usr = match_user
+                   AND circ.circ_lib IN ( SELECT * FROM unnest(context_org_list) )
+                AND circ.checkin_time IS NULL
+                AND (circ.stop_fines IN ('MAXFINES','LONGOVERDUE') OR circ.stop_fines IS NULL)
+                AND cp.circ_modifier IN (SELECT circ_mod FROM config.circ_matrix_circ_mod_test_map WHERE circ_mod_test = out_by_circ_mod.id);
+            IF items_out >= out_by_circ_mod.items_out THEN
+                result.fail_part := 'config.circ_matrix_circ_mod_test';
+                result.success := FALSE;
+                done := TRUE;
+                RETURN NEXT result;
+            END IF;
+        END LOOP;
+    END IF;
+
+    -- If we passed everything, return the successful matchpoint
+    IF NOT done THEN
+        RETURN NEXT result;
+    END IF;
+
+    RETURN;
+END;
+$func$ LANGUAGE plpgsql;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0638'); -- miker
+
+CREATE OR REPLACE FUNCTION unapi.sitem ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+        SELECT  XMLELEMENT(
+                    name serial_item,
+                    XMLATTRIBUTES(
+                        CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                        'tag:open-ils.org:U2@sitem/' || id AS id,
+                        'tag:open-ils.org:U2@siss/' || issuance AS issuance,
+                        date_expected, date_received
+                    ),
+                    CASE WHEN issuance IS NOT NULL AND ('siss' = ANY ($4)) THEN unapi.siss( issuance, $2, 'issuance', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN stream IS NOT NULL AND ('sstr' = ANY ($4)) THEN unapi.sstr( stream, $2, 'stream', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN unit IS NOT NULL AND ('sunit' = ANY ($4)) THEN unapi.sunit( unit, $2, 'serial_unit', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END,
+                    CASE WHEN uri IS NOT NULL AND ('auri' = ANY ($4)) THEN unapi.auri( uri, $2, 'uri', evergreen.array_remove_item_by_value($4,'sitem'), $5, $6, $7, $8, FALSE) ELSE NULL END
+--                    XMLELEMENT( name notes,
+--                        CASE 
+--                            WHEN ('acpn' = ANY ($4)) THEN
+--                                (SELECT XMLAGG(acpn) FROM (
+--                                    SELECT  unapi.acpn( id, 'xml', 'copy_note', evergreen.array_remove_item_by_value($4,'acp'), $5, $6, $7, $8)
+--                                      FROM  asset.copy_note
+--                                      WHERE owning_copy = cp.id AND pub
+--                                )x)
+--                            ELSE NULL
+--                        END
+--                    )
+                )
+          FROM  serial.item sitem
+          WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+
+-- Evergreen DB patch XXXX.schema.asset_merge_record_assets.sql
+--
+--
+
+INSERT INTO config.upgrade_log (version) VALUES ('0639');
+
+-- Dupe function replace removed
+
+INSERT INTO config.upgrade_log (version) VALUES ('0645');
+
+CREATE OR REPLACE FUNCTION biblio.indexing_ingest_or_delete () RETURNS TRIGGER AS $func$
+DECLARE
+    transformed_xml TEXT;
+    prev_xfrm       TEXT;
+    normalizer      RECORD;
+    xfrm            config.xml_transform%ROWTYPE;
+    attr_value      TEXT;
+    new_attrs       HSTORE := ''::HSTORE;
+    attr_def        config.record_attr_definition%ROWTYPE;
+BEGIN
+
+    IF NEW.deleted IS TRUE THEN -- If this bib is deleted
+        DELETE FROM metabib.metarecord_source_map WHERE source = NEW.id; -- Rid ourselves of the search-estimate-killing linkage
+        DELETE FROM metabib.record_attr WHERE id = NEW.id; -- Kill the attrs hash, useless on deleted records
+        DELETE FROM authority.bib_linking WHERE bib = NEW.id; -- Avoid updating fields in bibs that are no longer visible
+        DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = NEW.id; -- Separate any multi-homed items
+        RETURN NEW; -- and we're done
+    END IF;
+
+    IF TG_OP = 'UPDATE' THEN -- re-ingest?
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc' AND enabled;
+
+        IF NOT FOUND AND OLD.marc = NEW.marc THEN -- don't do anything if the MARC didn't change
+            RETURN NEW;
+        END IF;
+    END IF;
+
+    -- Record authority linking
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_authority_linking' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM biblio.map_authority_linking( NEW.id, NEW.marc );
+    END IF;
+
+    -- Flatten and insert the mfr data
+    PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_full_rec' AND enabled;
+    IF NOT FOUND THEN
+        PERFORM metabib.reingest_metabib_full_rec(NEW.id);
+
+        -- Now we pull out attribute data, which is dependent on the mfr for all but XPath-based fields
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_metabib_rec_descriptor' AND enabled;
+        IF NOT FOUND THEN
+            FOR attr_def IN SELECT * FROM config.record_attr_definition ORDER BY format LOOP
+
+                IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
+                    SELECT  ARRAY_TO_STRING(ARRAY_ACCUM(value), COALESCE(attr_def.joiner,' ')) INTO attr_value
+                      FROM  (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
+                      WHERE record = NEW.id
+                            AND tag LIKE attr_def.tag
+                            AND CASE
+                                WHEN attr_def.sf_list IS NOT NULL 
+                                    THEN POSITION(subfield IN attr_def.sf_list) > 0
+                                ELSE TRUE
+                                END
+                      GROUP BY tag
+                      ORDER BY tag
+                      LIMIT 1;
+
+                ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
+                    attr_value := biblio.marc21_extract_fixed_field(NEW.id, attr_def.fixed_field);
+
+                ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+
+                    SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
+            
+                    -- See if we can skip the XSLT ... it's expensive
+                    IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+                        -- Can't skip the transform
+                        IF xfrm.xslt <> '---' THEN
+                            transformed_xml := oils_xslt_process(NEW.marc,xfrm.xslt);
+                        ELSE
+                            transformed_xml := NEW.marc;
+                        END IF;
+            
+                        prev_xfrm := xfrm.name;
+                    END IF;
+
+                    IF xfrm.name IS NULL THEN
+                        -- just grab the marcxml (empty) transform
+                        SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
+                        prev_xfrm := xfrm.name;
+                    END IF;
+
+                    attr_value := oils_xpath_string(attr_def.xpath, transformed_xml, COALESCE(attr_def.joiner,' '), ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]);
+
+                ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
+                    SELECT  m.value INTO attr_value
+                      FROM  biblio.marc21_physical_characteristics(NEW.id) v
+                            JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value)
+                      WHERE v.subfield = attr_def.phys_char_sf
+                      LIMIT 1; -- Just in case ...
+
+                END IF;
+
+                -- apply index normalizers to attr_value
+                FOR normalizer IN
+                    SELECT  n.func AS func,
+                            n.param_count AS param_count,
+                            m.params AS params
+                      FROM  config.index_normalizer n
+                            JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
+                      WHERE attr = attr_def.name
+                      ORDER BY m.pos LOOP
+                        EXECUTE 'SELECT ' || normalizer.func || '(' ||
+                            COALESCE( quote_literal( attr_value ), 'NULL' ) ||
+                            CASE
+                                WHEN normalizer.param_count > 0
+                                    THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+                                    ELSE ''
+                                END ||
+                            ')' INTO attr_value;
+        
+                END LOOP;
+
+                -- Add the new value to the hstore
+                new_attrs := new_attrs || hstore( attr_def.name, attr_value );
+
+            END LOOP;
+
+            IF TG_OP = 'INSERT' OR OLD.deleted THEN -- initial insert OR revivication
+                INSERT INTO metabib.record_attr (id, attrs) VALUES (NEW.id, new_attrs);
+            ELSE
+                UPDATE metabib.record_attr SET attrs = attrs || new_attrs WHERE id = NEW.id;
+            END IF;
+
+        END IF;
+    END IF;
+
+    -- Gather and insert the field entry data
+    PERFORM metabib.reingest_metabib_field_entries(NEW.id);
+
+    -- Located URI magic
+    IF TG_OP = 'INSERT' THEN
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        END IF;
+    ELSE
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.disable_located_uri' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM biblio.extract_located_uris( NEW.id, NEW.marc, NEW.editor );
+        END IF;
+    END IF;
+
+    -- (re)map metarecord-bib linking
+    IF TG_OP = 'INSERT' THEN -- if not deleted and performing an insert, check for the flag
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_insert' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    ELSE -- we're doing an update, and we're not deleted, remap
+        PERFORM * FROM config.internal_flag WHERE name = 'ingest.metarecord_mapping.skip_on_update' AND enabled;
+        IF NOT FOUND THEN
+            PERFORM metabib.remap_metarecord_for_bib( NEW.id, NEW.fingerprint );
+        END IF;
+    END IF;
+
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0646');
+
+CREATE OR REPLACE FUNCTION asset.staff_ou_record_copy_count (org INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE         
+    ans RECORD; 
+    trans INT;
+BEGIN           
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                SUM( CASE WHEN cl.opac_visible AND cp.opac_visible THEN 1 ELSE 0 END),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+    FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP
+        RETURN QUERY
+        SELECT  -1,
+                ans.id,
+                COUNT( cp.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                SUM( CASE WHEN cl.opac_visible AND cp.opac_visible THEN 1 ELSE 0 END),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0648');
+
+CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$
+DECLARE
+    moved_objects INT := 0;
+    source_cn     asset.call_number%ROWTYPE;
+    target_cn     asset.call_number%ROWTYPE;
+    metarec       metabib.metarecord%ROWTYPE;
+    hold          action.hold_request%ROWTYPE;
+    ser_rec       serial.record_entry%ROWTYPE;
+    ser_sub       serial.subscription%ROWTYPE;
+    acq_lineitem  acq.lineitem%ROWTYPE;
+    acq_request   acq.user_request%ROWTYPE;
+    booking       booking.resource_type%ROWTYPE;
+    source_part   biblio.monograph_part%ROWTYPE;
+    target_part   biblio.monograph_part%ROWTYPE;
+    multi_home    biblio.peer_bib_copy_map%ROWTYPE;
+    uri_count     INT := 0;
+    counter       INT := 0;
+    uri_datafield TEXT;
+    uri_text      TEXT := '';
+BEGIN
+
+    -- move any 856 entries on records that have at least one MARC-mapped URI entry
+    SELECT  INTO uri_count COUNT(*)
+      FROM  asset.uri_call_number_map m
+            JOIN asset.call_number cn ON (m.call_number = cn.id)
+      WHERE cn.record = source_record;
+
+    IF uri_count > 0 THEN
+        
+        SELECT  COUNT(*) INTO counter
+          FROM  oils_xpath_table(
+                    'id',
+                    'marc',
+                    'biblio.record_entry',
+                    '//*[@tag="856"]',
+                    'id=' || source_record
+                ) as t(i int,c text);
+    
+        FOR i IN 1 .. counter LOOP
+            SELECT  '<datafield xmlns="http://www.loc.gov/MARC21/slim"' || 
+                       ' tag="856"' ||
+                       ' ind1="' || FIRST(ind1) || '"'  ||
+                       ' ind2="' || FIRST(ind2) || '">' ||
+                        array_to_string(
+                            array_accum(
+                                '<subfield code="' || subfield || '">' ||
+                                regexp_replace(
+                                    regexp_replace(
+                                        regexp_replace(data,'&','&amp;','g'),
+                                        '>', '&gt;', 'g'
+                                    ),
+                                    '<', '&lt;', 'g'
+                                ) || '</subfield>'
+                            ), ''
+                        ) || '</datafield>' INTO uri_datafield
+              FROM  oils_xpath_table(
+                        'id',
+                        'marc',
+                        'biblio.record_entry',
+                        '//*[@tag="856"][position()=' || i || ']/@ind1|' ||
+                        '//*[@tag="856"][position()=' || i || ']/@ind2|' ||
+                        '//*[@tag="856"][position()=' || i || ']/*/@code|' ||
+                        '//*[@tag="856"][position()=' || i || ']/*[@code]',
+                        'id=' || source_record
+                    ) as t(id int,ind1 text, ind2 text,subfield text,data text);
+
+            uri_text := uri_text || uri_datafield;
+        END LOOP;
+
+        IF uri_text <> '' THEN
+            UPDATE  biblio.record_entry
+              SET   marc = regexp_replace(marc,'(</[^>]*record>)', uri_text || E'\\1')
+              WHERE id = target_record;
+        END IF;
+
+    END IF;
+
+       -- Find and move metarecords to the target record
+       SELECT  INTO metarec *
+         FROM  metabib.metarecord
+         WHERE master_record = source_record;
+
+       IF FOUND THEN
+               UPDATE  metabib.metarecord
+                 SET   master_record = target_record,
+                       mods = NULL
+                 WHERE id = metarec.id;
+
+               moved_objects := moved_objects + 1;
+       END IF;
+
+       -- Find call numbers attached to the source ...
+       FOR source_cn IN SELECT * FROM asset.call_number WHERE record = source_record LOOP
+
+               SELECT  INTO target_cn *
+                 FROM  asset.call_number
+                 WHERE label = source_cn.label
+                       AND owning_lib = source_cn.owning_lib
+                       AND record = target_record;
+
+               -- ... and if there's a conflicting one on the target ...
+               IF FOUND THEN
+
+                       -- ... move the copies to that, and ...
+                       UPDATE  asset.copy
+                         SET   call_number = target_cn.id
+                         WHERE call_number = source_cn.id;
+
+                       -- ... move V holds to the move-target call number
+                       FOR hold IN SELECT * FROM action.hold_request WHERE target = source_cn.id AND hold_type = 'V' LOOP
+               
+                               UPDATE  action.hold_request
+                                 SET   target = target_cn.id
+                                 WHERE id = hold.id;
+               
+                               moved_objects := moved_objects + 1;
+                       END LOOP;
+
+               -- ... if not ...
+               ELSE
+                       -- ... just move the call number to the target record
+                       UPDATE  asset.call_number
+                         SET   record = target_record
+                         WHERE id = source_cn.id;
+               END IF;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find T holds targeting the source record ...
+       FOR hold IN SELECT * FROM action.hold_request WHERE target = source_record AND hold_type = 'T' LOOP
+
+               -- ... and move them to the target record
+               UPDATE  action.hold_request
+                 SET   target = target_record
+                 WHERE id = hold.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find serial records targeting the source record ...
+       FOR ser_rec IN SELECT * FROM serial.record_entry WHERE record = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  serial.record_entry
+                 SET   record = target_record
+                 WHERE id = ser_rec.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find serial subscriptions targeting the source record ...
+       FOR ser_sub IN SELECT * FROM serial.subscription WHERE record_entry = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  serial.subscription
+                 SET   record_entry = target_record
+                 WHERE id = ser_sub.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find booking resource types targeting the source record ...
+       FOR booking IN SELECT * FROM booking.resource_type WHERE record = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  booking.resource_type
+                 SET   record = target_record
+                 WHERE id = booking.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find acq lineitems targeting the source record ...
+       FOR acq_lineitem IN SELECT * FROM acq.lineitem WHERE eg_bib_id = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  acq.lineitem
+                 SET   eg_bib_id = target_record
+                 WHERE id = acq_lineitem.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find acq user purchase requests targeting the source record ...
+       FOR acq_request IN SELECT * FROM acq.user_request WHERE eg_bib = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  acq.user_request
+                 SET   eg_bib = target_record
+                 WHERE id = acq_request.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find parts attached to the source ...
+       FOR source_part IN SELECT * FROM biblio.monograph_part WHERE record = source_record LOOP
+
+               SELECT  INTO target_part *
+                 FROM  biblio.monograph_part
+                 WHERE label = source_part.label
+                       AND record = target_record;
+
+               -- ... and if there's a conflicting one on the target ...
+               IF FOUND THEN
+
+                       -- ... move the copy-part maps to that, and ...
+                       UPDATE  asset.copy_part_map
+                         SET   part = target_part.id
+                         WHERE part = source_part.id;
+
+                       -- ... move P holds to the move-target part
+                       FOR hold IN SELECT * FROM action.hold_request WHERE target = source_part.id AND hold_type = 'P' LOOP
+               
+                               UPDATE  action.hold_request
+                                 SET   target = target_part.id
+                                 WHERE id = hold.id;
+               
+                               moved_objects := moved_objects + 1;
+                       END LOOP;
+
+               -- ... if not ...
+               ELSE
+                       -- ... just move the part to the target record
+                       UPDATE  biblio.monograph_part
+                         SET   record = target_record
+                         WHERE id = source_part.id;
+               END IF;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- Find multi_home items attached to the source ...
+       FOR multi_home IN SELECT * FROM biblio.peer_bib_copy_map WHERE peer_record = source_record LOOP
+               -- ... and move them to the target record
+               UPDATE  biblio.peer_bib_copy_map
+                 SET   peer_record = target_record
+                 WHERE id = multi_home.id;
+
+               moved_objects := moved_objects + 1;
+       END LOOP;
+
+       -- And delete mappings where the item's home bib was merged with the peer bib
+       DELETE FROM biblio.peer_bib_copy_map WHERE peer_record = (
+               SELECT (SELECT record FROM asset.call_number WHERE id = call_number)
+               FROM asset.copy WHERE id = target_copy
+       );
+
+    -- Finally, "delete" the source record
+    DELETE FROM biblio.record_entry WHERE id = source_record;
+
+       -- That's all, folks!
+       RETURN moved_objects;
+END;
+$func$ LANGUAGE plpgsql;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0649');
+
+CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
+ SELECT cp.id, COALESCE(c.circ_count, 0::bigint) + COALESCE(count(DISTINCT circ.id), 0::bigint) + COALESCE(count(DISTINCT acirc.id), 0::bigint) AS circ_count
+   FROM asset."copy" cp
+   LEFT JOIN extend_reporter.legacy_circ_count c USING (id)
+   LEFT JOIN "action".circulation circ ON circ.target_copy = cp.id
+   LEFT JOIN "action".aged_circulation acirc ON acirc.target_copy = cp.id
+  GROUP BY cp.id, c.circ_count;
+
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('0650');
+
+CREATE OR REPLACE FUNCTION asset.cache_copy_visibility () RETURNS TRIGGER as $func$
+DECLARE
+    add_front       TEXT;
+    add_back        TEXT;
+    add_base_query  TEXT;
+    add_peer_query  TEXT;
+    remove_query    TEXT;
+    do_add          BOOLEAN := false;
+    do_remove       BOOLEAN := false;
+BEGIN
+    add_base_query := $$
+        SELECT  cp.id, cp.circ_lib, cn.record, cn.id AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN asset.call_number cn ON (cn.id = cp.call_number)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+                JOIN biblio.record_entry b ON (cn.record = b.id)
+          WHERE NOT cp.deleted
+                AND NOT cn.deleted
+                AND NOT b.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_peer_query := $$
+        SELECT  cp.id, cp.circ_lib, pbcm.peer_record AS record, NULL AS call_number, cp.location, cp.status
+          FROM  asset.copy cp
+                JOIN biblio.peer_bib_copy_map pbcm ON (pbcm.target_copy = cp.id)
+                JOIN actor.org_unit a ON (cp.circ_lib = a.id)
+                JOIN asset.copy_location cl ON (cp.location = cl.id)
+                JOIN config.copy_status cs ON (cp.status = cs.id)
+          WHERE NOT cp.deleted
+                AND cs.opac_visible
+                AND cl.opac_visible
+                AND cp.opac_visible
+                AND a.opac_visible
+    $$;
+    add_front := $$
+        INSERT INTO asset.opac_visible_copies (copy_id, circ_lib, record)
+          SELECT DISTINCT ON (id, record) id, circ_lib, record FROM (
+    $$;
+    add_back := $$
+        ) AS x
+    $$;
+    remove_query := $$ DELETE FROM asset.opac_visible_copies WHERE copy_id IN ( SELECT id FROM asset.copy WHERE $$;
+
+    IF TG_TABLE_NAME = 'peer_bib_copy_map' THEN
+        IF TG_OP = 'INSERT' THEN
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.target_copy || ' AND pbcm.peer_record = ' || NEW.peer_record;
+            EXECUTE add_front || add_peer_query || add_back;
+            RETURN NEW;
+        ELSE
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE copy_id = ' || OLD.target_copy || ' AND record = ' || OLD.peer_record || ';';
+            EXECUTE remove_query;
+            RETURN OLD;
+        END IF;
+    END IF;
+
+    IF TG_OP = 'INSERT' THEN
+
+        IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    -- handle items first, since with circulation activity
+    -- their statuses change frequently
+    IF TG_TABLE_NAME IN ('copy', 'unit') THEN
+
+        IF OLD.location    <> NEW.location OR
+           OLD.call_number <> NEW.call_number OR
+           OLD.status      <> NEW.status OR
+           OLD.circ_lib    <> NEW.circ_lib THEN
+            -- any of these could change visibility, but
+            -- we'll save some queries and not try to calculate
+            -- the change directly
+            do_remove := true;
+            do_add := true;
+        ELSE
+
+            IF OLD.deleted <> NEW.deleted THEN
+                IF NEW.deleted THEN
+                    do_remove := true;
+                ELSE
+                    do_add := true;
+                END IF;
+            END IF;
+
+            IF OLD.opac_visible <> NEW.opac_visible THEN
+                IF OLD.opac_visible THEN
+                    do_remove := true;
+                ELSIF NOT do_remove THEN -- handle edge case where deleted item
+                                        -- is also marked opac_visible
+                    do_add := true;
+                END IF;
+            END IF;
+
+        END IF;
+
+        IF do_remove THEN
+            DELETE FROM asset.opac_visible_copies WHERE copy_id = NEW.id;
+        END IF;
+        IF do_add THEN
+            add_base_query := add_base_query || ' AND cp.id = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    IF TG_TABLE_NAME IN ('call_number', 'record_entry') THEN -- these have a 'deleted' column
+        IF OLD.deleted AND NEW.deleted THEN -- do nothing
+
+            RETURN NEW;
+        ELSIF NEW.deleted THEN -- remove rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                DELETE FROM asset.opac_visible_copies WHERE copy_id IN (SELECT id FROM asset.copy WHERE call_number = NEW.id);
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                DELETE FROM asset.opac_visible_copies WHERE record = NEW.id;
+            END IF;
+            RETURN NEW;
+        ELSIF OLD.deleted THEN -- add rows
+            IF TG_TABLE_NAME = 'call_number' THEN
+                add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+                EXECUTE add_front || add_base_query || add_back;
+            ELSIF TG_TABLE_NAME = 'record_entry' THEN
+                add_base_query := add_base_query || ' AND cn.record = ' || NEW.id;
+                add_peer_query := add_peer_query || ' AND pbcm.peer_record = ' || NEW.id;
+                EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+            END IF;
+            RETURN NEW;
+        END IF;
+    END IF;
+
+    IF TG_TABLE_NAME = 'call_number' THEN
+
+        IF OLD.record <> NEW.record THEN
+            -- call number is linked to different bib
+            remove_query := remove_query || 'call_number = ' || NEW.id || ');';
+            EXECUTE remove_query;
+            add_base_query := add_base_query || ' AND cn.id = ' || NEW.id;
+            EXECUTE add_front || add_base_query || add_back;
+        END IF;
+
+        RETURN NEW;
+
+    END IF;
+
+    IF TG_TABLE_NAME IN ('record_entry') THEN
+        RETURN NEW; -- don't have 'opac_visible'
+    END IF;
+
+    -- actor.org_unit, asset.copy_location, asset.copy_status
+    IF NEW.opac_visible = OLD.opac_visible THEN -- do nothing
+
+        RETURN NEW;
+
+    ELSIF NEW.opac_visible THEN -- add rows
+
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            add_base_query := add_base_query || ' AND cp.circ_lib = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.circ_lib = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            add_base_query := add_base_query || ' AND cp.location = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.location = ' || NEW.id;
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            add_base_query := add_base_query || ' AND cp.status = ' || NEW.id;
+            add_peer_query := add_peer_query || ' AND cp.status = ' || NEW.id;
+        END IF;
+        EXECUTE add_front || add_base_query || ' UNION ' || add_peer_query || add_back;
+    ELSE -- delete rows
+
+        IF TG_TABLE_NAME = 'org_unit' THEN
+            remove_query := 'DELETE FROM asset.opac_visible_copies WHERE circ_lib = ' || NEW.id || ';';
+        ELSIF TG_TABLE_NAME = 'copy_location' THEN
+            remove_query := remove_query || 'location = ' || NEW.id || ');';
+        ELSIF TG_TABLE_NAME = 'copy_status' THEN
+            remove_query := remove_query || 'status = ' || NEW.id || ');';
+        END IF;
+        EXECUTE remove_query;
+    END IF;
+    RETURN NEW;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;