From 19baefe1cd9f9ea76b9df29ab310ee28f08532bb Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 28 Feb 2013 13:30:36 -0500 Subject: [PATCH] LP#1066326: use internal flags; sync with master After discussion with Mike Rylander, moved the new flags to internal flags, as exposing them to the staff client's global flag admin page could lead to records getting incompletely ingested without there being an easy way to rectify the problem from the staff client. Also, sync up with other recent work on ingest. Signed-off-by: Galen Charlton Signed-off-by: Mike Rylander --- Open-ILS/src/sql/Pg/002.schema.config.sql | 3 ++ Open-ILS/src/sql/Pg/030.schema.metabib.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 33 ---------------- .../XXXX.schema.partitioned-ingest.sql | 39 ++++--------------- 4 files changed, 11 insertions(+), 66 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index a686ea55a7..57d4aaf507 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -46,6 +46,9 @@ INSERT INTO config.internal_flag (name) VALUES ('ingest.disable_metabib_full_rec INSERT INTO config.internal_flag (name) VALUES ('ingest.disable_metabib_rec_descriptor'); INSERT INTO config.internal_flag (name) VALUES ('ingest.disable_metabib_field_entry'); INSERT INTO config.internal_flag (name) VALUES ('ingest.assume_inserts_only'); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_browse_indexing'); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_search_indexing'); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_facet_indexing'); INSERT INTO config.internal_flag (name) VALUES ('serial.rematerialize_on_same_holding_code'); CREATE TABLE config.global_flag ( diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql index fd041d158d..317881b1d7 100644 --- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql +++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql @@ -647,7 +647,7 @@ BEGIN END LOOP; - IF NOT skip_search THEN + IF NOT b_skip_search THEN PERFORM metabib.update_combined_index_vectors(bib_id); END IF; 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 4792e0cb95..51d608fbd8 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -8927,39 +8927,6 @@ INSERT INTO config.global_flag (name, label, enabled) TRUE ); -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_browse_indexing', - oils_i18n_gettext( - 'ingest.skip_browse_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of browse data', - 'cgf', - 'label' - ) - ); - -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_search_indexing', - oils_i18n_gettext( - 'ingest.skip_search_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of search data', - 'cgf', - 'label' - ) - ); - -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_facet_indexing', - oils_i18n_gettext( - 'ingest.skip_facet_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of facet data', - 'cgf', - 'label' - ) - ); - INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE VALUES ( 'ingest.disable_authority_linking', diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.partitioned-ingest.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.partitioned-ingest.sql index d1da1138ab..22c9263383 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.partitioned-ingest.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.partitioned-ingest.sql @@ -2,38 +2,9 @@ BEGIN; SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_browse_indexing', - oils_i18n_gettext( - 'ingest.skip_browse_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of browse data', - 'cgf', - 'label' - ) - ); - -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_search_indexing', - oils_i18n_gettext( - 'ingest.skip_search_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of search data', - 'cgf', - 'label' - ) - ); - -INSERT INTO config.global_flag (name, label) -- defaults to enabled=FALSE - VALUES ( - 'ingest.skip_facet_indexing', - oils_i18n_gettext( - 'ingest.skip_facet_indexing', - 'Bibliographic Record Ingest: Disable extraction and indexing of facet data', - 'cgf', - 'label' - ) - ); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_browse_indexing'); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_search_indexing'); +INSERT INTO config.internal_flag (name) VALUES ('ingest.skip_facet_indexing'); CREATE OR REPLACE FUNCTION metabib.reingest_metabib_field_entries( bib_id BIGINT, skip_facet BOOL DEFAULT FALSE, skip_browse BOOL DEFAULT FALSE, skip_search BOOL DEFAULT FALSE ) RETURNS VOID AS $func$ DECLARE @@ -108,6 +79,10 @@ BEGIN END LOOP; + IF NOT b_skip_search THEN + PERFORM metabib.update_combined_index_vectors(bib_id); + END IF; + RETURN; END; $func$ LANGUAGE PLPGSQL; -- 2.43.2