Index: openacs-4/packages/categories/www/categories-browse-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/categories-browse-oracle.xql	27 Apr 2003 11:36:50 -0000	1.1
+++ openacs-4/packages/categories/www/categories-browse-oracle.xql	7 May 2003 13:35:06 -0000	1.2
@@ -3,26 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-  <fullquery name="check_permissions_on_trees">
-    <querytext>
-      select t.tree_id
-      from category_trees t, category_temp tmp
-      where (t.site_wide_p = 't'
-             or acs_permission.permission_p(t.tree_id, :user_id, 'category_tree_read') = 't')
-      and t.tree_id = tmp.category_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="get_categorized_object_count">
-    <querytext>
-      select n.object_id
-      from acs_named_objects n, ($subtree_sql) s
-      where n.object_id = s.object_id
-      and acs_permission.permission_p(n.object_id, :user_id, 'read') = 't'
-      $letter_sql
-    </querytext>
-  </fullquery>
-
   <fullquery name="get_categorized_objects">
     <querytext>
       select r.*
@@ -35,8 +15,13 @@
             and o.object_id = n.object_id
             and p.package_id = n.package_id
             and t.package_key = p.package_key
-            and acs_permission.permission_p(n.object_id, :user_id, 'read') = 't'
+            and exists (select 1
+                        from acs_object_party_privilege_map oppm
+                        where oppm.object_id = n.object_id
+                        and oppm.party_id = :user_id
+                        and oppm.privilege = 'read')
             $letter_sql
+            $package_sql
             $order_by_clause) r
       where r.row_number between :first_row and :last_row
     </querytext>