[open-ils-commits] r7472 - trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher

[svn at svn.open-ils.org]

Author: miker
Date: 2007-06-26 13:18:13 -0400 (Tue, 26 Jun 2007)
New Revision: 7472

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
Log:
excluding deleted volumes

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm	2007-06-25 03:35:09 UTC (rev 7471)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm	2007-06-26 17:18:13 UTC (rev 7472)
@@ -229,8 +229,8 @@
 		from
 		        $table cn
 		where
-		        (upper(label) > ?
-		        or ( cn.id > ? and upper(label) = ? ))
+			not deleted
+		        and (upper(label) > ? or ( cn.id > ? and upper(label) = ? ))
 			and owning_lib in ($orgs)
 		order by upper(label), 4, 2
 		limit $size;
@@ -284,8 +284,8 @@
 			from
 			        $table cn
 			where
-			        (upper(label) < ?
-			        or ( cn.id < ? and upper(label) = ? ))
+				not deleted
+			        and (upper(label) < ? or ( cn.id < ? and upper(label) = ? ))
 				and owning_lib in ($orgs)
 			order by upper(label) desc, 4 desc, 2 desc
 			limit $size
@@ -342,7 +342,8 @@
 			from
 			        $table cn
 			where
-			        upper(label) < ?
+				not deleted
+			        and upper(label) < ?
 				and owning_lib in ($orgs)
 			order by upper(label) desc, 4 desc, 2 desc
 			limit $topsize
@@ -359,7 +360,8 @@
 		from
 		        $table cn
 		where
-		        upper(label) >= ?
+			not deleted
+		        and upper(label) >= ?
 			and owning_lib in ($orgs)
 		order by upper(label),4,2
 		limit $bottomsize;