make the first_word index normalizer return a not-null value when given an empty...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16453 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 3c1d7de..2ffb67a 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -65,7 +65,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0267'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0268'); -- miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/020.schema.functions.sql b/Open-ILS/src/sql/Pg/020.schema.functions.sql
index 89a8fec..965d9a2 100644 (file)
--- a/Open-ILS/src/sql/Pg/020.schema.functions.sql
+++ b/Open-ILS/src/sql/Pg/020.schema.functions.sql
@@ -85,7 +85,7 @@ CREATE OR REPLACE FUNCTION public.naco_normalize( TEXT ) RETURNS TEXT AS $func$
 $func$ LANGUAGE 'sql' STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION public.first_word ( TEXT ) RETURNS TEXT AS $$
-        SELECT SUBSTRING( $1 FROM $_$^\S+$_$);
+        SELECT COALESCE(SUBSTRING( $1 FROM $_$^\S+$_$), '');
 $$ LANGUAGE SQL STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION public.naco_normalize_keep_comma( TEXT ) RETURNS TEXT AS $func$

diff --git a/Open-ILS/src/sql/Pg/upgrade/0268.schema.identifier-cleanup.sql b/Open-ILS/src/sql/Pg/upgrade/0268.schema.identifier-cleanup.sql
new file mode 100644 (file)
index 0000000..30f04f2
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0268.schema.identifier-cleanup.sql
@@ -0,0 +1,12 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0268'); -- miker
+
+CREATE OR REPLACE FUNCTION public.first_word ( TEXT ) RETURNS TEXT AS $$
+        SELECT COALESCE(SUBSTRING( $1 FROM $_$^\S+$_$), '');
+$$ LANGUAGE SQL STRICT IMMUTABLE;
+
+DELETE FROM config.metabib_field_index_norm_map WHERE norm IN (1,2) and field > 16;
+
+COMMIT;
+