[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8460d7aa502444d92b48ad506a45fb5bf00ca9f5
Evergreen Git
git at git.evergreen-ils.org
Wed Mar 2 17:10:00 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 8460d7aa502444d92b48ad506a45fb5bf00ca9f5 (commit)
via 4e6dd043f6e558dc1cd6fe4fef619bc005d6ba2d (commit)
via d9f68683040f88f969eba86574e0b35e3a906f1d (commit)
via 90dc59a5a70afd759b4079530e8f00a9f9d96088 (commit)
via d9348b9cc58c3b24ae435e2a4506195cef512e58 (commit)
from b8eb0b6376e85fe99eddc0999cc86d83ce922aef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8460d7aa502444d92b48ad506a45fb5bf00ca9f5
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 17:09:39 2016 -0500
LP#1470957: stamp schema upgrade
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e8620ff..a70172b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0965', :eg_version); -- gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0966', :eg_version); -- miker/jpringle/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql b/Open-ILS/src/sql/Pg/upgrade/0966.schema.normalize_pubdate_respect_null.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
rename to Open-ILS/src/sql/Pg/upgrade/0966.schema.normalize_pubdate_respect_null.sql
index b5e8a62..9907452 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0966.schema.normalize_pubdate_respect_null.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0966', :eg_version); -- miker/jpringle/gmcharlt
-- Allow NULL post-normalization sorters
CREATE OR REPLACE FUNCTION metabib.reingest_record_attributes (rid BIGINT, pattr_list TEXT[] DEFAULT NULL, prmarc TEXT DEFAULT NULL, rdeleted BOOL DEFAULT TRUE) RETURNS VOID AS $func$
commit 4e6dd043f6e558dc1cd6fe4fef619bc005d6ba2d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 17:07:28 2016 -0500
LP#1470957: adjust a previous regression test
Now that there are normalizers set for pubdate,
008/Date1 = " " is now normalized to "0000".
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg b/Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg
index 62d6dbe..0996e57 100644
--- a/Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg
+++ b/Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg
@@ -11,7 +11,15 @@ VALUES (
SELECT ok(attrs ? 'audience', 'audience attribute exists')
FROM metabib.record_attr WHERE id = CURRVAL('biblio.record_entry_id_seq');
-SELECT ok(NOT attrs ? 'date1' , 'date1 attribute does not exist')
-FROM metabib.record_attr WHERE id = CURRVAL('biblio.record_entry_id_seq');
+SELECT is(
+ (
+ SELECT attrs->'date1'
+ FROM metabib.record_attr
+ WHERE id = CURRVAL('biblio.record_entry_id_seq')
+ ),
+ '0000',
+ 'as of LP#1470957, date1 = " " normalizes to 0000'
+)
+;
ROLLBACK;
commit d9f68683040f88f969eba86574e0b35e3a906f1d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 17:02:04 2016 -0500
LP#1470957: provide pgTAP test for expected pubdate normalization
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1470957_sort_null_pubdates.sql b/Open-ILS/src/sql/Pg/t/regress/lp1470957_sort_null_pubdates.sql
new file mode 100644
index 0000000..995ee2a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/t/regress/lp1470957_sort_null_pubdates.sql
@@ -0,0 +1,21 @@
+BEGIN;
+
+SELECT plan(1);
+
+INSERT INTO biblio.record_entry (marc, last_xact_id)
+VALUES (
+ $$<record xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd" xmlns="http://www.loc.gov/MARC21/slim"><leader>00620cam a2200205Ka 4500</leader><controlfield tag="001">1</controlfield><controlfield tag="003">CONS</controlfield><controlfield tag="005">20150113170906.0</controlfield><controlfield tag="008">070101s|||| eng d</controlfield><datafield tag="245" ind1=" " ind2=" "><subfield code="a">Harry potter</subfield></datafield><datafield tag="901" ind1=" " ind2=" "><subfield code="a">1</subfield><subfield code="b"></subfield><subfield code="c">1</subfield><subfield code="t">biblio</subfield></datafield></record>$$,
+ 'LP#1414112'
+);
+
+SELECT is(
+ (
+ SELECT COUNT(*) FROM metabib.record_sorter
+ WHERE source = CURRVAL('biblio.record_entry_id_seq')
+ AND attr = 'pubdate'
+ ),
+ 0::BIGINT,
+ 'LP#1470957: do not provide sorter for |||| pubdate'
+);
+
+ROLLBACK;
commit 90dc59a5a70afd759b4079530e8f00a9f9d96088
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Mar 2 16:33:16 2016 -0500
LP#1470957: update upgrade script
This commit updates the upgrade script to account
for other changes to metabib.reingest_record_attributes()
that were made since the original patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
index 20494fe..b5e8a62 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
@@ -35,7 +35,7 @@ BEGIN
norm_attr_value := '{}'::TEXT[];
attr_vector_tmp := '{}'::INT[];
- SELECT * INTO ccvm_row FROM config.coded_value_map c WHERE c.ctype = attr_def.name LIMIT 1;
+ SELECT * INTO ccvm_row FROM config.coded_value_map c WHERE c.ctype = attr_def.name LIMIT 1;
-- tag+sf attrs only support SVF
IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
@@ -44,7 +44,7 @@ BEGIN
WHERE record = rid
AND tag LIKE attr_def.tag
AND CASE
- WHEN attr_def.sf_list IS NOT NULL
+ WHEN attr_def.sf_list IS NOT NULL
THEN POSITION(subfield IN attr_def.sf_list) > 0
ELSE TRUE
END
@@ -62,7 +62,7 @@ BEGIN
ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
-
+
-- See if we can skip the XSLT ... it's expensive
IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
-- Can't skip the transform
@@ -71,7 +71,7 @@ BEGIN
ELSE
transformed_xml := rmarc;
END IF;
-
+
prev_xfrm := xfrm.name;
END IF;
@@ -81,7 +81,7 @@ BEGIN
prev_xfrm := xfrm.name;
END IF;
- FOR tmp_xml IN SELECT oils_xpath(attr_def.xpath, transformed_xml, ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]) LOOP
+ FOR tmp_xml IN SELECT UNNEST(oils_xpath(attr_def.xpath, transformed_xml, ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]])) LOOP
tmp_val := oils_xpath_string(
'//*',
tmp_xml,
@@ -133,7 +133,7 @@ BEGIN
norm_attr_value := norm_attr_value || tmp_val;
END IF;
END LOOP;
-
+
IF attr_def.filter THEN
-- Create unknown uncontrolled values and find the IDs of the values
IF ccvm_row.id IS NULL THEN
@@ -171,7 +171,7 @@ BEGIN
requested attrs, and then add back the new
set of attr values. */
- IF ARRAY_LENGTH(pattr_list, 1) > 0 THEN
+ IF ARRAY_LENGTH(pattr_list, 1) > 0 THEN
SELECT vlist INTO attr_vector_tmp FROM metabib.record_attr_vector_list WHERE source = rid;
SELECT attr_vector_tmp - ARRAY_AGG(id::INT) INTO attr_vector_tmp FROM metabib.full_attr_id_map WHERE attr = ANY (pattr_list);
attr_vector := attr_vector || attr_vector_tmp;
commit d9348b9cc58c3b24ae435e2a4506195cef512e58
Author: Mike Rylander <mrylander at gmail.com>
Date: Thu Jul 2 14:44:25 2015 -0400
LP#1470957: Normalize date1 (pubdate sorter) to null when not numeric
We supply a normalizer function for making sure date-ish values are
always numeric (several, in fact) but we don't enable them by default
for appropriate fields. This does that.
Additionally, we allow NULL sorters so that the reingest of a "broken"
record will get fixed.
We avoid the need for a reingest to cover the sorter issue by removing
non-numeric pubdate sorters.
To test
-------
[1] Identify some records where the Date1 value in the 008 field
is '||||'.
[2] Perform a catalog search that includes some of those records
and sort by publication date newest to oldest. Note that
the |||| records sort at the top.
[3] Apply the patch and perform the schema update.
[4] Perform the search again (possibly clearing the search
results cache first). This time, the |||| records should
sort near the end.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
index 212a201..f7aa05a 100644
--- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql
+++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
@@ -1478,9 +1478,11 @@ BEGIN
attr_vector := attr_vector || attr_vector_tmp;
END IF;
- IF attr_def.sorter AND norm_attr_value[1] IS NOT NULL THEN
+ IF attr_def.sorter THEN
DELETE FROM metabib.record_sorter WHERE source = rid AND attr = attr_def.name;
- INSERT INTO metabib.record_sorter (source, attr, value) VALUES (rid, attr_def.name, norm_attr_value[1]);
+ IF norm_attr_value[1] IS NOT NULL THEN
+ INSERT INTO metabib.record_sorter (source, attr, value) VALUES (rid, attr_def.name, norm_attr_value[1]);
+ END IF;
END IF;
END LOOP;
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 2a8026c..73d7218 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -8609,6 +8609,27 @@ INSERT INTO config.index_normalizer (name, description, func, param_count) VALUE
0
);
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Number or NULL Normalize',
+ 'Normalize the value to NULL if it is not a number',
+ 'integer_or_null',
+ 0
+);
+
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Approximate Low Date Normalize',
+ 'Normalize the value to the nearest date-ish value, rounding down',
+ 'approximate_low_date',
+ 0
+);
+
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Approximate High Date Normalize',
+ 'Normalize the value to the nearest date-ish value, rounding up',
+ 'approximate_high_date',
+ 0
+);
+
-- make use of the index normalizers
INSERT INTO config.metabib_field_index_norm_map (field,norm)
@@ -8678,14 +8699,14 @@ INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
FROM config.record_attr_definition m,
config.index_normalizer i
WHERE i.func IN ('integer_or_null')
- AND m.name IN ('date1', 'date2', 'pubdate');
+ AND m.name IN ('pubdate');
INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
SELECT m.name, i.id, 0
FROM config.record_attr_definition m,
config.index_normalizer i
WHERE i.func IN ('approximate_low_date')
- AND m.name IN ('date1', 'pubdate');
+ AND m.name IN ('date1');
INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
SELECT m.name, i.id, 0
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
new file mode 100644
index 0000000..20494fe
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.normalize_pubdate_respect_null.sql
@@ -0,0 +1,269 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+-- Allow NULL post-normalization sorters
+CREATE OR REPLACE FUNCTION metabib.reingest_record_attributes (rid BIGINT, pattr_list TEXT[] DEFAULT NULL, prmarc TEXT DEFAULT NULL, rdeleted BOOL DEFAULT TRUE) RETURNS VOID AS $func$
+DECLARE
+ transformed_xml TEXT;
+ rmarc TEXT := prmarc;
+ tmp_val TEXT;
+ prev_xfrm TEXT;
+ normalizer RECORD;
+ xfrm config.xml_transform%ROWTYPE;
+ attr_vector INT[] := '{}'::INT[];
+ attr_vector_tmp INT[];
+ attr_list TEXT[] := pattr_list;
+ attr_value TEXT[];
+ norm_attr_value TEXT[];
+ tmp_xml TEXT;
+ attr_def config.record_attr_definition%ROWTYPE;
+ ccvm_row config.coded_value_map%ROWTYPE;
+BEGIN
+
+ IF attr_list IS NULL OR rdeleted THEN -- need to do the full dance on INSERT or undelete
+ SELECT ARRAY_AGG(name) INTO attr_list FROM config.record_attr_definition;
+ END IF;
+
+ IF rmarc IS NULL THEN
+ SELECT marc INTO rmarc FROM biblio.record_entry WHERE id = rid;
+ END IF;
+
+ FOR attr_def IN SELECT * FROM config.record_attr_definition WHERE NOT composite AND name = ANY( attr_list ) ORDER BY format LOOP
+
+ attr_value := '{}'::TEXT[];
+ norm_attr_value := '{}'::TEXT[];
+ attr_vector_tmp := '{}'::INT[];
+
+ SELECT * INTO ccvm_row FROM config.coded_value_map c WHERE c.ctype = attr_def.name LIMIT 1;
+
+ -- tag+sf attrs only support SVF
+ IF attr_def.tag IS NOT NULL THEN -- tag (and optional subfield list) selection
+ SELECT ARRAY[ARRAY_TO_STRING(ARRAY_AGG(value), COALESCE(attr_def.joiner,' '))] INTO attr_value
+ FROM (SELECT * FROM metabib.full_rec ORDER BY tag, subfield) AS x
+ WHERE record = rid
+ AND tag LIKE attr_def.tag
+ AND CASE
+ WHEN attr_def.sf_list IS NOT NULL
+ THEN POSITION(subfield IN attr_def.sf_list) > 0
+ ELSE TRUE
+ END
+ GROUP BY tag
+ ORDER BY tag
+ LIMIT 1;
+
+ ELSIF attr_def.fixed_field IS NOT NULL THEN -- a named fixed field, see config.marc21_ff_pos_map.fixed_field
+ attr_value := vandelay.marc21_extract_fixed_field_list(rmarc, attr_def.fixed_field);
+
+ IF NOT attr_def.multi THEN
+ attr_value := ARRAY[attr_value[1]];
+ END IF;
+
+ ELSIF attr_def.xpath IS NOT NULL THEN -- and xpath expression
+
+ SELECT INTO xfrm * FROM config.xml_transform WHERE name = attr_def.format;
+
+ -- See if we can skip the XSLT ... it's expensive
+ IF prev_xfrm IS NULL OR prev_xfrm <> xfrm.name THEN
+ -- Can't skip the transform
+ IF xfrm.xslt <> '---' THEN
+ transformed_xml := oils_xslt_process(rmarc,xfrm.xslt);
+ ELSE
+ transformed_xml := rmarc;
+ END IF;
+
+ prev_xfrm := xfrm.name;
+ END IF;
+
+ IF xfrm.name IS NULL THEN
+ -- just grab the marcxml (empty) transform
+ SELECT INTO xfrm * FROM config.xml_transform WHERE xslt = '---' LIMIT 1;
+ prev_xfrm := xfrm.name;
+ END IF;
+
+ FOR tmp_xml IN SELECT oils_xpath(attr_def.xpath, transformed_xml, ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]) LOOP
+ tmp_val := oils_xpath_string(
+ '//*',
+ tmp_xml,
+ COALESCE(attr_def.joiner,' '),
+ ARRAY[ARRAY[xfrm.prefix, xfrm.namespace_uri]]
+ );
+ IF tmp_val IS NOT NULL AND BTRIM(tmp_val) <> '' THEN
+ attr_value := attr_value || tmp_val;
+ EXIT WHEN NOT attr_def.multi;
+ END IF;
+ END LOOP;
+
+ ELSIF attr_def.phys_char_sf IS NOT NULL THEN -- a named Physical Characteristic, see config.marc21_physical_characteristic_*_map
+ SELECT ARRAY_AGG(m.value) INTO attr_value
+ FROM vandelay.marc21_physical_characteristics(rmarc) v
+ LEFT JOIN config.marc21_physical_characteristic_value_map m ON (m.id = v.value)
+ WHERE v.subfield = attr_def.phys_char_sf AND (m.value IS NOT NULL AND BTRIM(m.value) <> '')
+ AND ( ccvm_row.id IS NULL OR ( ccvm_row.id IS NOT NULL AND v.id IS NOT NULL) );
+
+ IF NOT attr_def.multi THEN
+ attr_value := ARRAY[attr_value[1]];
+ END IF;
+
+ END IF;
+
+ -- apply index normalizers to attr_value
+ FOR tmp_val IN SELECT value FROM UNNEST(attr_value) x(value) LOOP
+ FOR normalizer IN
+ SELECT n.func AS func,
+ n.param_count AS param_count,
+ m.params AS params
+ FROM config.index_normalizer n
+ JOIN config.record_attr_index_norm_map m ON (m.norm = n.id)
+ WHERE attr = attr_def.name
+ ORDER BY m.pos LOOP
+ EXECUTE 'SELECT ' || normalizer.func || '(' ||
+ COALESCE( quote_literal( tmp_val ), 'NULL' ) ||
+ CASE
+ WHEN normalizer.param_count > 0
+ THEN ',' || REPLACE(REPLACE(BTRIM(normalizer.params,'[]'),E'\'',E'\\\''),E'"',E'\'')
+ ELSE ''
+ END ||
+ ')' INTO tmp_val;
+
+ END LOOP;
+ IF tmp_val IS NOT NULL AND tmp_val <> '' THEN
+ -- note that a string that contains only blanks
+ -- is a valid value for some attributes
+ norm_attr_value := norm_attr_value || tmp_val;
+ END IF;
+ END LOOP;
+
+ IF attr_def.filter THEN
+ -- Create unknown uncontrolled values and find the IDs of the values
+ IF ccvm_row.id IS NULL THEN
+ FOR tmp_val IN SELECT value FROM UNNEST(norm_attr_value) x(value) LOOP
+ IF tmp_val IS NOT NULL AND BTRIM(tmp_val) <> '' THEN
+ BEGIN -- use subtransaction to isolate unique constraint violations
+ INSERT INTO metabib.uncontrolled_record_attr_value ( attr, value ) VALUES ( attr_def.name, tmp_val );
+ EXCEPTION WHEN unique_violation THEN END;
+ END IF;
+ END LOOP;
+
+ SELECT ARRAY_AGG(id) INTO attr_vector_tmp FROM metabib.uncontrolled_record_attr_value WHERE attr = attr_def.name AND value = ANY( norm_attr_value );
+ ELSE
+ SELECT ARRAY_AGG(id) INTO attr_vector_tmp FROM config.coded_value_map WHERE ctype = attr_def.name AND code = ANY( norm_attr_value );
+ END IF;
+
+ -- Add the new value to the vector
+ attr_vector := attr_vector || attr_vector_tmp;
+ END IF;
+
+ IF attr_def.sorter THEN
+ DELETE FROM metabib.record_sorter WHERE source = rid AND attr = attr_def.name;
+ IF norm_attr_value[1] IS NOT NULL THEN
+ INSERT INTO metabib.record_sorter (source, attr, value) VALUES (rid, attr_def.name, norm_attr_value[1]);
+ END IF;
+ END IF;
+
+ END LOOP;
+
+/* We may need to rewrite the vlist to contain
+ the intersection of new values for requested
+ attrs and old values for ignored attrs. To
+ do this, we take the old attr vlist and
+ subtract any values that are valid for the
+ requested attrs, and then add back the new
+ set of attr values. */
+
+ IF ARRAY_LENGTH(pattr_list, 1) > 0 THEN
+ SELECT vlist INTO attr_vector_tmp FROM metabib.record_attr_vector_list WHERE source = rid;
+ SELECT attr_vector_tmp - ARRAY_AGG(id::INT) INTO attr_vector_tmp FROM metabib.full_attr_id_map WHERE attr = ANY (pattr_list);
+ attr_vector := attr_vector || attr_vector_tmp;
+ END IF;
+
+ -- On to composite attributes, now that the record attrs have been pulled. Processed in name order, so later composite
+ -- attributes can depend on earlier ones.
+ PERFORM metabib.compile_composite_attr_cache_init();
+ FOR attr_def IN SELECT * FROM config.record_attr_definition WHERE composite AND name = ANY( attr_list ) ORDER BY name LOOP
+
+ FOR ccvm_row IN SELECT * FROM config.coded_value_map c WHERE c.ctype = attr_def.name ORDER BY value LOOP
+
+ tmp_val := metabib.compile_composite_attr( ccvm_row.id );
+ CONTINUE WHEN tmp_val IS NULL OR tmp_val = ''; -- nothing to do
+
+ IF attr_def.filter THEN
+ IF attr_vector @@ tmp_val::query_int THEN
+ attr_vector = attr_vector + intset(ccvm_row.id);
+ EXIT WHEN NOT attr_def.multi;
+ END IF;
+ END IF;
+
+ IF attr_def.sorter THEN
+ IF attr_vector @@ tmp_val THEN
+ DELETE FROM metabib.record_sorter WHERE source = rid AND attr = attr_def.name;
+ INSERT INTO metabib.record_sorter (source, attr, value) VALUES (rid, attr_def.name, ccvm_row.code);
+ END IF;
+ END IF;
+
+ END LOOP;
+
+ END LOOP;
+
+ IF ARRAY_LENGTH(attr_vector, 1) > 0 THEN
+ IF rdeleted THEN -- initial insert OR revivication
+ DELETE FROM metabib.record_attr_vector_list WHERE source = rid;
+ INSERT INTO metabib.record_attr_vector_list (source, vlist) VALUES (rid, attr_vector);
+ ELSE
+ UPDATE metabib.record_attr_vector_list SET vlist = attr_vector WHERE source = rid;
+ END IF;
+ END IF;
+
+END;
+
+$func$ LANGUAGE PLPGSQL;
+
+COMMIT;
+
+-- These are allowed to fail ...
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Number or NULL Normalize',
+ 'Normalize the value to NULL if it is not a number',
+ 'integer_or_null',
+ 0
+);
+
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Approximate Low Date Normalize',
+ 'Normalize the value to the nearest date-ish value, rounding down',
+ 'approximate_low_date',
+ 0
+);
+
+INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES (
+ 'Approximate High Date Normalize',
+ 'Normalize the value to the nearest date-ish value, rounding up',
+ 'approximate_high_date',
+ 0
+);
+
+INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
+ SELECT m.name, i.id, 0
+ FROM config.record_attr_definition m,
+ config.index_normalizer i
+ WHERE i.func IN ('integer_or_null')
+ AND m.name IN ('date2', 'pubdate');
+
+INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
+ SELECT m.name, i.id, 0
+ FROM config.record_attr_definition m,
+ config.index_normalizer i
+ WHERE i.func IN ('approximate_low_date')
+ AND m.name IN ('date1');
+
+INSERT INTO config.record_attr_index_norm_map (attr,norm,pos)
+ SELECT m.name, i.id, 0
+ FROM config.record_attr_definition m,
+ config.index_normalizer i
+ WHERE i.func IN ('approximate_high_date')
+ AND m.name IN ('date2');
+
+-- Get rid of bad date1 sorter values so we can avoid a reingest
+DELETE FROM metabib.record_sorter WHERE attr = 'pubdate' AND value !~ '^\d+$';
+
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/030.schema.metabib.sql | 6 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 25 ++++++++-
.../lp1414112_allow_spaces_as_ff_attr_values.pg | 12 +++-
..._values.pg => lp1470957_sort_null_pubdates.sql} | 18 ++++--
...0966.schema.normalize_pubdate_respect_null.sql} | 60 ++++++++++++++++++--
6 files changed, 103 insertions(+), 20 deletions(-)
copy Open-ILS/src/sql/Pg/t/regress/{lp1414112_allow_spaces_as_ff_attr_values.pg => lp1470957_sort_null_pubdates.sql} (69%)
copy Open-ILS/src/sql/Pg/upgrade/{0936.schema.fix_ingest_of_xpath_based_attrs.sql => 0966.schema.normalize_pubdate_respect_null.sql} (82%)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list