[open-ils-commits] r18039 - in trunk/Open-ILS/src: perlmods/OpenILS/Application/Storage/Driver/Pg sql/Pg sql/Pg/upgrade (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Sep 27 15:11:26 EDT 2010
Author: miker
Date: 2010-09-27 15:11:21 -0400 (Mon, 27 Sep 2010)
New Revision: 18039
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0420.schema.premunge_dates.sql
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
trunk/Open-ILS/src/sql/Pg/030.schema.metabib.sql
Log:
make pubdate sorting on search faster by pre-munging date1 and date2 into an acceptable sortkey
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm 2010-09-27 18:51:29 UTC (rev 18038)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm 2010-09-27 19:11:21 UTC (rev 18039)
@@ -449,44 +449,22 @@
$desc = 'DESC' if ($self->find_modifier('descending'));
if ($sort_filter eq 'rel') { # relevance ranking flips sort dir
- if ($desc eq 'ASC') {
+ if ($desc eq 'ASC') {
$desc = 'DESC';
} else {
$desc = 'ASC';
}
} else {
if ($sort_filter eq 'title') {
- my $default = $desc eq 'DESC' ? ' ' : 'zzzzzz';
- $rank = <<" SQL";
-( COALESCE( FIRST ((
- SELECT frt.value
- FROM metabib.full_rec frt
- WHERE frt.record = m.source
- AND frt.tag = 'tnf'
- AND frt.subfield = 'a'
- LIMIT 1
- )),'$default'))::TEXT
- SQL
+ $rank = "FIRST((SELECT frt.value FROM metabib.full_rec frt WHERE frt.record = m.source AND frt.tag = 'tnf' AND frt.subfield = 'a' LIMIT 1))";
} elsif ($sort_filter eq 'pubdate') {
- my $default = $desc eq 'DESC' ? '0' : '99999';
- $rank = "COALESCE( FIRST(NULLIF(LPAD(REGEXP_REPLACE(mrd.date1, E'\\\\D+', '0', 'g'),4,'0'),'0000')), '$default' )::INT";
+ $rank = "FIRST(mrd.date1)";
} elsif ($sort_filter eq 'create_date') {
- $rank = "( FIRST (( SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )::TIMESTAMPTZ";
+ $rank = "FIRST((SELECT create_date FROM biblio.record_entry rbr WHERE rbr.id = m.source))";
} elsif ($sort_filter eq 'edit_date') {
- $rank = "( FIRST (( SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source)) )::TIMESTAMPTZ";
+ $rank = "FIRST((SELECT edit_date FROM biblio.record_entry rbr WHERE rbr.id = m.source))";
} elsif ($sort_filter eq 'author') {
- my $default = $desc eq 'DESC' ? ' ' : 'zzzzzz';
- $rank = <<" SQL"
-( 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
- )),'$default'))::TEXT
- SQL
+ $rank = "FIRST((SELECT 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 LIMIT 1))";
} else {
# default to rel ranking
$rank = $rel;
@@ -532,7 +510,7 @@
ARRAY_ACCUM(DISTINCT m.source) AS records,
$rel AS rel,
$rank AS rank,
- COALESCE( FIRST(NULLIF(LPAD(REGEXP_REPLACE(mrd.date1, E'\\\\D+', '0', 'g'),4,'0'),'0000')), '0' )::INT AS tie_break
+ FIRST(mrd.date1) AS tie_break
FROM metabib.metarecord_source_map m
JOIN metabib.rec_descriptor mrd ON (m.source = mrd.record)
$$flat_plan{from}
@@ -550,7 +528,7 @@
$bib_level
AND $$flat_plan{where}
GROUP BY 1
- ORDER BY 4 $desc, 5 DESC, 3 DESC
+ ORDER BY 4 $desc NULLS LAST, 5 DESC NULLS LAST, 3 DESC
LIMIT $core_limit
SQL
Modified: trunk/Open-ILS/src/sql/Pg/030.schema.metabib.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/030.schema.metabib.sql 2010-09-27 18:51:29 UTC (rev 18038)
+++ trunk/Open-ILS/src/sql/Pg/030.schema.metabib.sql 2010-09-27 19:11:21 UTC (rev 18039)
@@ -729,8 +729,8 @@
JOIN config.marc21_physical_characteristic_subfield_map s ON (s.id = p.subfield)
JOIN config.marc21_physical_characteristic_value_map v ON (v.id = p.value)
WHERE p.ptype = 'v' AND s.subfield = 'e' ),
- biblio.marc21_extract_fixed_field( bib_id, 'Date1'),
- biblio.marc21_extract_fixed_field( bib_id, 'Date2');
+ LPAD(NULLIF(REGEXP_REPLACE(biblio.marc21_extract_fixed_field( bib_id, 'Date1'), E'\\D', '0', 'g')::INT,0)::TEXT,4,'0'),
+ LPAD(NULLIF(REGEXP_REPLACE(biblio.marc21_extract_fixed_field( bib_id, 'Date2'), E'\\D', '9', 'g')::INT,9999)::TEXT,4,'0');
RETURN;
END;
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0420.schema.premunge_dates.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0420.schema.premunge_dates.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0420.schema.premunge_dates.sql 2010-09-27 19:11:21 UTC (rev 18039)
@@ -0,0 +1,40 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0420'); -- miker
+
+CREATE OR REPLACE FUNCTION metabib.reingest_metabib_rec_descriptor( bib_id BIGINT ) RETURNS VOID AS $func$
+BEGIN
+ PERFORM * FROM config.internal_flag WHERE name = 'ingest.assume_inserts_only' AND enabled;
+ IF NOT FOUND THEN
+ DELETE FROM metabib.rec_descriptor WHERE record = bib_id;
+ END IF;
+ INSERT INTO metabib.rec_descriptor (record, item_type, item_form, bib_level, control_type, enc_level, audience, lit_form, type_mat, cat_form, pub_status, item_lang, vr_format, date1, date2)
+ SELECT bib_id,
+ biblio.marc21_extract_fixed_field( bib_id, 'Type' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'Form' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'BLvl' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'Ctrl' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'ELvl' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'Audn' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'LitF' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'TMat' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'Desc' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'DtSt' ),
+ biblio.marc21_extract_fixed_field( bib_id, 'Lang' ),
+ ( SELECT v.value
+ FROM biblio.marc21_physical_characteristics( bib_id) p
+ JOIN config.marc21_physical_characteristic_subfield_map s ON (s.id = p.subfield)
+ JOIN config.marc21_physical_characteristic_value_map v ON (v.id = p.value)
+ WHERE p.ptype = 'v' AND s.subfield = 'e' ),
+ LPAD(NULLIF(REGEXP_REPLACE(biblio.marc21_extract_fixed_field( bib_id, 'Date1'), E'\\D', '0', 'g')::INT,0)::TEXT,4,'0'),
+ LPAD(NULLIF(REGEXP_REPLACE(biblio.marc21_extract_fixed_field( bib_id, 'Date2'), E'\\D', '9', 'g')::INT,9999)::TEXT,4,'0');
+
+ RETURN;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+UPDATE metabib.rec_descriptor
+ SET date1=LPAD(NULLIF(REGEXP_REPLACE(date1, E'\\D', '0', 'g')::INT,0)::TEXT,4,'0')
+ date2=LPAD(NULLIF(REGEXP_REPLACE(date2, E'\\D', '9', 'g')::INT,9999)::TEXT,4,'0');
+
+COMMIT;
More information about the open-ils-commits
mailing list