From b42f3a326cf75ea5cbef1317c72c26835e81acc0 Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Tue, 20 Dec 2011 12:05:38 -0500 Subject: [PATCH] fix a problem where we got too many mbedm rows Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/src/sql/Pg/030.schema.metabib.sql | 9 +++++---- Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib_autosuggest.sql | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql index 37e23be591..6e689d4efc 100644 --- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql +++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql @@ -332,10 +332,6 @@ BEGIN -- Loop over the indexing entries FOR idx IN SELECT * FROM config.metabib_field ORDER BY format LOOP - output_row.facet_field = idx.facet_field; - output_row.suggest_field = idx.suggest_field; - output_row.search_field = idx.search_field; - SELECT INTO xfrm * from config.xml_transform WHERE name = idx.format; -- See if we can skip the XSLT ... it's expensive @@ -395,7 +391,9 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(suggest_text, E'\\s+', ' ', 'g')); + output_row.suggest_field = TRUE; RETURN NEXT output_row; + output_row.suggest_field = FALSE; END IF; -- insert raw node text for faceting @@ -412,7 +410,9 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(facet_text, E'\\s+', ' ', 'g')); + output_row.facet_field = TRUE; RETURN NEXT output_row; + output_row.facet_field = FALSE; END IF; END LOOP; @@ -426,6 +426,7 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(raw_text, E'\\s+', ' ', 'g')); + output_row.search_field = TRUE; RETURN NEXT output_row; END IF; diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib_autosuggest.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib_autosuggest.sql index 502e88e1b9..488b68dc9a 100644 --- a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib_autosuggest.sql +++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib_autosuggest.sql @@ -90,10 +90,6 @@ BEGIN -- Loop over the indexing entries FOR idx IN SELECT * FROM config.metabib_field ORDER BY format LOOP - output_row.facet_field = idx.facet_field; - output_row.suggest_field = idx.suggest_field; - output_row.search_field = idx.search_field; - SELECT INTO xfrm * from config.xml_transform WHERE name = idx.format; -- See if we can skip the XSLT ... it's expensive @@ -153,7 +149,9 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(suggest_text, E'\\s+', ' ', 'g')); + output_row.suggest_field = TRUE; RETURN NEXT output_row; + output_row.suggest_field = FALSE; END IF; -- insert raw node text for faceting @@ -170,7 +168,9 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(facet_text, E'\\s+', ' ', 'g')); + output_row.facet_field = TRUE; RETURN NEXT output_row; + output_row.facet_field = FALSE; END IF; END LOOP; @@ -184,6 +184,7 @@ BEGIN output_row.source = rid; output_row.value = BTRIM(REGEXP_REPLACE(raw_text, E'\\s+', ' ', 'g')); + output_row.search_field = TRUE; RETURN NEXT output_row; END IF; -- 2.11.0