improve call number sorting

oils_text_as_bytea now does uppercasing in addition
to converting strings to bytea, working around
the limitation that json_query can't stack transforms

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@18439 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
index 5add0f4..1a95cfc 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
@@ -230,9 +230,9 @@ sub cn_browse_pagedown {
                        $table cn
                where
                        not deleted
-                       and (oils_text_as_bytea(upper(label)) > ? or ( cn.id > ? and oils_text_as_bytea(upper(label)) = ? ))
+                       and (oils_text_as_bytea(label) > ? or ( cn.id > ? and oils_text_as_bytea(label) = ? ))
                        and owning_lib in ($orgs)
-               order by oils_text_as_bytea(upper(label)), 4, 2
+               order by oils_text_as_bytea(label), 4, 2
                limit $size;
        SQL
 
@@ -285,9 +285,9 @@ sub cn_browse_pageup {
                                $table cn
                        where
                                not deleted
-                               and (oils_text_as_bytea(upper(label)) < ? or ( cn.id < ? and oils_text_as_bytea(upper(label)) = ? ))
+                               and (oils_text_as_bytea(label) < ? or ( cn.id < ? and oils_text_as_bytea(label) = ? ))
                                and owning_lib in ($orgs)
-                       order by oils_text_as_bytea(upper(label)) desc, 4 desc, 2 desc
+                       order by oils_text_as_bytea(label) desc, 4 desc, 2 desc
                        limit $size
                ) as bar
                order by 1,4,2;
@@ -343,9 +343,9 @@ sub cn_browse_target {
                                $table cn
                        where
                                not deleted
-                               and oils_text_as_bytea(upper(label)) < ?
+                               and oils_text_as_bytea(label) < ?
                                and owning_lib in ($orgs)
-                       order by oils_text_as_bytea(upper(label)) desc, 4 desc, 2 desc
+                       order by oils_text_as_bytea(label) desc, 4 desc, 2 desc
                        limit $topsize
                ) as bar
                order by 1,4,2;
@@ -361,9 +361,9 @@ sub cn_browse_target {
                        $table cn
                where
                        not deleted
-                       and oils_text_as_bytea(upper(label)) >= ?
+                       and oils_text_as_bytea(label) >= ?
                        and owning_lib in ($orgs)
-               order by oils_text_as_bytea(upper(label)),4,2
+               order by oils_text_as_bytea(label),4,2
                limit $bottomsize;
        SQL
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
index ec69b1a..aa7bf6a 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
@@ -281,13 +281,13 @@ sub cn_browse {
        if ($page <= 0) {
                my $before = $_storage->request(
                        "open-ils.cstore.direct.asset.call_number.search.atomic",
-                       { label         => { "<" => { transform => "upper", value => ["upper", $label] } },
+                       { label         => { "<" => { transform => "oils_text_as_bytea", value => ["oils_text_as_bytea", $label] } },
                          owning_lib    => \@ou_ids,
               deleted => 'f',
                        },
                        { flesh         => 1,
                          flesh_fields  => { acn => [qw/record owning_lib/] },
-                         order_by      => { acn => "oils_text_as_bytea(upper(label)) desc, id desc, owning_lib desc" },
+                         order_by      => { acn => "oils_text_as_bytea(label) desc, id desc, owning_lib desc" },
                          limit         => $before_limit,
                          offset        => abs($page) * $page_size - $before_offset,
                        }
@@ -298,13 +298,13 @@ sub cn_browse {
        if ($page >= 0) {
                my $after = $_storage->request(
                        "open-ils.cstore.direct.asset.call_number.search.atomic",
-                       { label         => { ">=" => { transform => "upper", value => ["upper", $label] } },
+                       { label         => { ">=" => { transform => "oils_text_as_bytea", value => ["oils_text_as_bytea", $label] } },
                          owning_lib    => \@ou_ids,
               deleted => 'f',
                        },
                        { flesh         => 1,
                          flesh_fields  => { acn => [qw/record owning_lib/] },
-                         order_by      => { acn => "oils_text_as_bytea(upper(label)), id, owning_lib" },
+                         order_by      => { acn => "oils_text_as_bytea(label), id, owning_lib" },
                          limit         => $after_limit,
                          offset        => abs($page) * $page_size - $after_offset,
                        }

diff --git a/Open-ILS/src/sql/Pg/002.functions.config.sql b/Open-ILS/src/sql/Pg/002.functions.config.sql
index 339f281..3cb194f 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.functions.config.sql
+++ b/Open-ILS/src/sql/Pg/002.functions.config.sql
@@ -121,7 +121,7 @@ CREATE OR REPLACE FUNCTION public.first_word ( TEXT ) RETURNS TEXT AS $$
 $$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION oils_text_as_bytea (TEXT) RETURNS BYTEA AS $_$
-    SELECT CAST(REGEXP_REPLACE($1, $$\\$$, $$\\\\$$, 'g') AS BYTEA);
+    SELECT CAST(REGEXP_REPLACE(UPPER($1), $$\\$$, $$\\\\$$, 'g') AS BYTEA);
 $_$ LANGUAGE SQL IMMUTABLE;
 
 COMMIT;

diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql
index 1cde5a9..cb78b0c 100644 (file)
--- a/Open-ILS/src/sql/Pg/040.schema.asset.sql
+++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql
@@ -156,7 +156,7 @@ CREATE INDEX asset_call_number_record_idx ON asset.call_number (record);
 CREATE INDEX asset_call_number_creator_idx ON asset.call_number (creator);
 CREATE INDEX asset_call_number_editor_idx ON asset.call_number (editor);
 CREATE INDEX asset_call_number_dewey_idx ON asset.call_number (public.call_number_dewey(label));
-CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(upper(label)),id,owning_lib);
+CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(label),id,owning_lib);
 CREATE UNIQUE INDEX asset_call_number_label_once_per_lib ON asset.call_number (record, owning_lib, label) WHERE deleted IS FALSE;
 CREATE RULE protect_cn_delete AS ON DELETE TO asset.call_number DO INSTEAD UPDATE asset.call_number SET deleted = TRUE WHERE OLD.id = asset.call_number.id;
 

diff --git a/Open-ILS/src/sql/Pg/1.6.0.8-1.6.0.9-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.6.0.8-1.6.0.9-upgrade-db.sql
index 1ae349b..f450ac8 100644 (file)
--- a/Open-ILS/src/sql/Pg/1.6.0.8-1.6.0.9-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/1.6.0.8-1.6.0.9-upgrade-db.sql
@@ -19,11 +19,11 @@ BEGIN;
 INSERT INTO config.upgrade_log(version) VALUES ('1.6.0.9');
 
 CREATE OR REPLACE FUNCTION oils_text_as_bytea (TEXT) RETURNS BYTEA AS $_$
-    SELECT CAST(REGEXP_REPLACE($1, $$\\$$, $$\\\\$$, 'g') AS BYTEA);
+    SELECT CAST(REGEXP_REPLACE(UPPER($1), $$\\$$, $$\\\\$$, 'g') AS BYTEA);
 $_$ LANGUAGE SQL IMMUTABLE;
 
 DROP INDEX asset.asset_call_number_upper_label_id_owning_lib_idx;
-CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(upper(label)),id,owning_lib);
+CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(label),id,owning_lib);
 
 CREATE OR REPLACE VIEW reporter.old_super_simple_record AS
 SELECT  r.id,