From: gmc <gmc@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 14 Oct 2010 19:29:26 +0000 (+0000)
Subject: sort call numbers better regardless of database locale
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fcb1be4c8678265530570d622b73bd043d84ef2f;p=Evergreen.git

sort call numbers better regardless of database locale

rel_1_6 version of r18333, accounting for fact that 1.6.x does not
have label_sortkey

Signed-off-by: Galen Charlton <gmc@esilibrary.com>


git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18335 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 9439aec16b..0ad5e8fa9b 100644
--- 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 (upper(label) > ? or ( cn.id > ? and upper(label) = ? ))
+		        and (cast(upper(label) as bytea) > ? or ( cn.id > ? and cast(upper(label) as bytea) = ? ))
 			and owning_lib in ($orgs)
-		order by upper(label), 4, 2
+		order by cast(upper(label) as bytea), 4, 2
 		limit $size;
 	SQL
 
@@ -285,9 +285,9 @@ sub cn_browse_pageup {
 			        $table cn
 			where
 				not deleted
-			        and (upper(label) < ? or ( cn.id < ? and upper(label) = ? ))
+			        and (cast(upper(label) as bytea) < ? or ( cn.id < ? and cast(upper(label) as bytea) = ? ))
 				and owning_lib in ($orgs)
-			order by upper(label) desc, 4 desc, 2 desc
+			order by cast(upper(label) as bytea) 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 upper(label) < ?
+			        and cast(upper(label) as bytea) < ?
 				and owning_lib in ($orgs)
-			order by upper(label) desc, 4 desc, 2 desc
+			order by cast(upper(label) as bytea) 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 upper(label) >= ?
+		        and cast(upper(label) as bytea) >= ?
 			and owning_lib in ($orgs)
-		order by upper(label),4,2
+		order by cast(upper(label) as bytea),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 6f7f5531b3..6f617ae7d2 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
@@ -287,7 +287,7 @@ sub cn_browse {
 			},
 			{ flesh		=> 1,
 			  flesh_fields	=> { acn => [qw/record owning_lib/] },
-			  order_by	=> { acn => "upper(label) desc, id desc, owning_lib desc" },
+			  order_by	=> { acn => "cast(upper(label) as bytea) desc, id desc, owning_lib desc" },
 			  limit		=> $before_limit,
 			  offset	=> abs($page) * $page_size - $before_offset,
 			}
@@ -304,7 +304,7 @@ sub cn_browse {
 			},
 			{ flesh		=> 1,
 			  flesh_fields	=> { acn => [qw/record owning_lib/] },
-			  order_by	=> { acn => "upper(label), id, owning_lib" },
+			  order_by	=> { acn => "cast(upper(label) as bytea), id, owning_lib" },
 			  limit		=> $after_limit,
 			  offset	=> abs($page) * $page_size - $after_offset,
 			}
diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql
index 206843889e..ad36cbd8b5 100644
--- a/Open-ILS/src/sql/Pg/040.schema.asset.sql
+++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql
@@ -158,7 +158,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 (upper(label),id,owning_lib);
+CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (cast(upper(label) as bytea),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;