[open-ils-commits] r17258 - trunk/Open-ILS/src/perlmods/OpenILS/Application (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-08-18 23:47:35 -0400 (Wed, 18 Aug 2010)
New Revision: 17258

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
Log:
Don't show deleted authority records in startwith browse, either

Also restore the >= operator that was stomped in r17257


Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-08-19 03:35:53 UTC (rev 17257)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-08-19 03:47:35 UTC (rev 17258)
@@ -970,7 +970,7 @@
 			{ select	=> { afr => [qw/record value/] },
 			  from		=> { 'are', 'afr' },
 			  where		=> {
-				'+afr' => { tag => $tag, subfield => $subfield, value => { '>' => lc($value) } },
+				'+afr' => { tag => $tag, subfield => $subfield, value => { '>=' => lc($value) } },
 				'+are' => { 'deleted' => 'f' }
 			  },
 			  order_by	=> { afr => { value => 'asc' } },
@@ -1368,8 +1368,11 @@
 		my $before = $_storage->request(
 			"open-ils.cstore.json_query.atomic",
 			{ select	=> { afr => [qw/record value/] },
-			  from		=> 'afr',
-			  where		=> { tag => $tag, subfield => $subfield, value => { '<' => lc($value) } },
+			  from		=> { 'afr', 'are' },
+			  where		=> {
+				'+afr' => { tag => $tag, subfield => $subfield, value => { '<' => lc($value) } },
+				'+are' => { deleted => 'f' }
+			  },
 			  order_by	=> { afr => { value => 'desc' } },
 			  limit		=> $limit,
 			  offset	=> $offset
@@ -1382,8 +1385,11 @@
 		my $after = $_storage->request(
 			"open-ils.cstore.json_query.atomic",
 			{ select	=> { afr => [qw/record value/] },
-			  from		=> 'afr',
-			  where		=> { tag => $tag, subfield => $subfield, value => { '>=' => lc($value) } }, 
+			  from		=> { 'afr', 'are' },
+			  where		=> {
+				'+afr' => { tag => $tag, subfield => $subfield, value => { '>=' => lc($value) } },
+				'+are' => { deleted => 'f' }
+			  },
 			  order_by	=> { afr => { value => 'asc' } },
 			  limit		=> $limit,
 			  offset	=> $offset