From a95c4b8c174d579c374831f696636bdbd58dc7ad Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Mon, 16 May 2011 14:00:04 -0400 Subject: [PATCH] SQL typo cleanup Signed-off-by: Mike Rylander --- Open-ILS/src/sql/Pg/011.schema.authority.sql | 14 ++++++-------- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Open-ILS/src/sql/Pg/011.schema.authority.sql b/Open-ILS/src/sql/Pg/011.schema.authority.sql index 3aac2340aa..060d6f0ed4 100644 --- a/Open-ILS/src/sql/Pg/011.schema.authority.sql +++ b/Open-ILS/src/sql/Pg/011.schema.authority.sql @@ -161,11 +161,11 @@ BEGIN heading_text := ''; FOR acsaf IN SELECT * FROM authority.control_set_authority_field WHERE control_set = cset AND main_entry IS NULL LOOP - tag_use := acsaf.tag; + tag_used := acsaf.tag; FOR sf IN SELECT * FROM regexp_split_to_table(acsaf.sf_list,'') LOOP tmp_text := oils_xpath_string('//*[@tag="'||tag_used||'"]/*[@code="'||sf||'"]', marcxml); IF tmp_text IS NOT NULL THEN - heading_text := heading_text || E'\U2021' || sf || ' ' || tmp_text; + heading_text := heading_text || E'\u2021' || sf || ' ' || tmp_text; END IF; END LOOP; EXIT WHEN heading_text <> ''; @@ -251,7 +251,7 @@ BEGIN auth_field := XPATH('//*[@tag="'||main_entry.tag||'"][1]',source_xml); IF ARRAY_LENGTH(auth_field) > 0 THEN FOR bib_field IN SELECT * FROM authority.control_set_bib_field WHERE authority_field = main_entry.id LOOP - replace_data := replace_data || XMLELEMENT( name datafield, bib_field.tag AS tag, XPATH('//*[local-name()="subfield"]',auth_field[1])::XML[]); + replace_data := replace_data || XMLELEMENT( name datafield, XMLATTRIBUTES(bib_field.tag AS tag), XPATH('//*[local-name()="subfield"]',auth_field[1])::XML[]); replace_rules := replace_rules || ( bib_field.tag || main_entry.sf_list || E'[0~\\)' || auth_id || '$]' ); END LOOP; EXIT; @@ -260,17 +260,15 @@ BEGIN RETURN XMLELEMENT( name record, - XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns) + XMLATTRIBUTES('http://www.loc.gov/MARC21/slim' AS xmlns), XMLELEMENT( name leader, '00881nam a2200193 4500'), replace_data, XMLELEMENT( name datafield, - '905' AS tag, - ' ' AS ind1, - ' ' AS ind2, + XMLATTRIBUTES( '905' AS tag, ' ' AS ind1, ' ' AS ind2), XMLELEMENT( name subfield, - 'r' AS code, + XMLATTRIBUTES('r' AS code), ARRAY_TO_STRING(replace_rules,',') ) ) diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 170a0ddd6b..06b0648b30 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -8655,7 +8655,7 @@ INSERT INTO authority.browse_axis_authority_field_map (axis,field) VALUES ('subject', 7 ), ('subject', 12); -INSERT INTO authority.control_set_bib_field (tag, authority_field) VALUES +INSERT INTO authority.control_set_bib_field (tag, authority_field) SELECT '100', id FROM authority.control_set_authority_field WHERE tag IN ('100') UNION SELECT '600', id FROM authority.control_set_authority_field WHERE tag IN ('100','180','181','182','185') @@ -8714,8 +8714,8 @@ INSERT INTO authority.thesaurus (code, name, control_set) VALUES ('r', oils_i18n_gettext('r','Art and Architecture Thesaurus','at','name'), 1), ('s', oils_i18n_gettext('s','Sears List of Subject Headings','at','name'), 1), ('v', oils_i18n_gettext('v','Repertoire de vedettes-matiere','at','name'), 1), - ('z', oils_i18n_gettext('z','Other','at','name') 1), - ('|', oils_i18n_gettext('|','No attempt to code','at','name') 1); + ('z', oils_i18n_gettext('z','Other','at','name'), 1), + ('|', oils_i18n_gettext('|','No attempt to code','at','name'), 1); INSERT into config.org_unit_setting_type ( name, label, description, datatype, fm_class ) VALUES -- 2.11.0