[open-ils-commits] r14963 - branches/rel_1_4/Open-ILS/src/sql/Pg (dbs)

svn at svn.open-ils.org svn at svn.open-ils.org
Wed Nov 18 21:35:09 EST 2009


Author: dbs
Date: 2009-11-18 21:35:07 -0500 (Wed, 18 Nov 2009)
New Revision: 14963

Removed:
   branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
Modified:
   branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql
Log:
Backport the upgrade script from the 1.6.0.0 package, plus the fix from https://bugs.launchpad.net/evergreen/+bug/485143

Thanks to Brandon Uhlmann for reporting the problem in the 1.6.0.0 package. 

Also remove the vestigial 1.2.3-1.4-upgrade-db.sql script.


Deleted: branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
===================================================================
--- branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql	2009-11-19 02:31:38 UTC (rev 14962)
+++ branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql	2009-11-19 02:35:07 UTC (rev 14963)
@@ -1,5691 +0,0 @@
-/*
- * Copyright (C) 2008  Equinox Software, Inc.
- * Mike Rylander <miker at 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.
- *
- */
-
-
-\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.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 COLUMN hold_verify BOOL NOT NULL DEFAULT FALSE;
-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
-);
-INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule) VALUES (1,11,1,1);
-
-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;
-
-    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", at 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", at 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, at ind2)"/>
-						</nonSort>
-						<title>
-							<xsl:value-of select="substring($titleChop, at 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', at 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, at code) and following-sibling::marc:subfield[@code=$axis])      or (contains($afterCodes, at 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;
-

Modified: branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql
===================================================================
--- branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql	2009-11-19 02:31:38 UTC (rev 14962)
+++ branches/rel_1_4/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql	2009-11-19 02:35:07 UTC (rev 14963)
@@ -15,6 +15,33 @@
  */
 
 
+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;
@@ -135,6 +162,18 @@
 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,
@@ -153,7 +192,7 @@
 
 CREATE TABLE config.z3950_attr (
     id          SERIAL  PRIMARY KEY,
-    source      TEXT    NOT NULL REFERENCES config.z3950_source (name),
+    source      TEXT    NOT NULL REFERENCES config.z3950_source (name) DEFERRABLE INITIALLY DEFERRED,
     name        TEXT    NOT NULL,
     label       TEXT    NOT NULL,
     code        INT     NOT NULL,
@@ -1320,7 +1359,6 @@
 	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
 );
-INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule) VALUES (1,11,1,1);
 
 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
@@ -1972,8 +2010,8 @@
 -- 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,
-    definition      BIGINT      NOT NULL REFERENCES vandelay.import_item_attr_definition (id) ON DELETE CASCADE,
+    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,
@@ -2517,7 +2555,7 @@
     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", at code)]');
-INSERT INTO vandelay.bib_attr_definition ( id, code, description, xpath ) VALUES (2, 'author', oils_i18n_gettext(1, 'Author of work', 'vqbrad', 'description'),'//*[@tag="100" or @tag="110" or @tag="113"]/*[contains("ad", at 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", at 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$);
@@ -5688,3 +5726,10 @@
 
 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';
+



More information about the open-ils-commits mailing list