Index: openacs-4/packages/categories/www/cadmin/category-usage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-usage.tcl	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-usage.tcl	27 Apr 2003 11:37:12 -0000	1.2
@@ -52,44 +52,18 @@
 
 set order_by_clause [ad_order_by_from_sort_spec $orderby $table_def]
 
-# query to get the number of pages, number of objects etc used by the paginator
-set count_query {
-    select n.object_id
-    from category_object_map m, acs_named_objects n
-    where acs_permission.permission_p(m.object_id, :user_id, 'read') = 't'
-    and m.category_id = :category_id
-    and n.object_id = m.object_id
-}
-
-# paginated query to get the actual objects
-set paginated_query [subst {
-    select r.*
-    from (select n.object_id, n.object_name as object_name, o.creation_date,
-	         t.pretty_name as package_type, n.package_id, p.instance_name,
-                 row_number() over ($order_by_clause) as row_number
-	  from acs_objects o, acs_named_objects n, apm_packages p, apm_package_types t,
-               category_object_map m
-	  where n.object_id = m.object_id
-	  and o.object_id = n.object_id
-	  and p.package_id = n.package_id
-	  and t.package_key = p.package_key
-	  and m.category_id = :category_id
-	  and acs_permission.permission_p(m.object_id, :user_id, 'read') = 't'
-	  $order_by_clause) r
-    where r.row_number between :first_row and :last_row
-}]
-
 set p_name "category-usage"
 request create
 request set_param page -datatype integer -value 1
 
 # execute query to count objects and pages
-paginator create get_category_usages $p_name $count_query -pagesize 20 -groupsize 10 -contextual -timeout 0
+paginator create get_category_usages $p_name "" -pagesize 20 -groupsize 10 -contextual -timeout 0
+
 set first_row [paginator get_row $p_name $page]
 set last_row [paginator get_row_last $p_name $page]
 
 # execute query to get the objects on current page
-set items [ad_table -Torderby $orderby get_objects_using_category $paginated_query $table_def]
+set items [ad_table -Torderby $orderby get_objects_using_category "" $table_def]
 
 paginator get_display_info $p_name info $page
 set group [paginator get_group $p_name $page]