Index: openacs-4/packages/calendar/www/cal-item-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item-oracle.xql	24 Aug 2001 01:47:36 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-item-oracle.xql	9 Jan 2002 23:52:58 -0000	1.2
@@ -26,26 +26,15 @@
  
 <fullquery name="list_calendars">      
       <querytext>
-      
 
-	select    object_id as calendar_id,
-    	          calendar.name(object_id) as calendar_name
-	from      acs_permissions
-	where     privilege in ( 
-	            'calendar_write',
-	            'calendar_admin'
-	          )
-	and       grantee_id = :user_id
-        and       acs_object_util.object_type_p(
-                    object_id, 
-                    'calendar'
-                  ) = 't'
-        and       calendar.private_p(
-                    object_id
-                  ) = 'f'
-	          
 
-    
+        select    calendar_id, calendar_name
+        from      calendars
+        where     acs_permission.permission_p(calendar_id, :user_id, 'calendar_write') = 't'
+        and       private_p = 'f'        
+
+
+
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/calendar/www/cal-item-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item-postgresql.xql	15 Sep 2001 07:14:32 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item-postgresql.xql	9 Jan 2002 23:52:44 -0000	1.3
@@ -27,24 +27,10 @@
 <fullquery name="list_calendars">      
       <querytext>
       
-
-	select    object_id as calendar_id,
-    	          calendar__name(object_id) as calendar_name
-	from      acs_permissions
-	where     privilege in ( 
-	            'calendar_write',
-	            'calendar_admin'
-	          )
-	and       grantee_id = :user_id
-        and       acs_object_util__object_type_p(
-                    object_id, 
-                    'calendar'
-                  ) = 't'
-        and       calendar__private_p(
-                    object_id
-                  ) = 'f'
-	          
-
+        select    calendar_id, calendar_name
+        from      calendars
+        where     acs_permission__permission_p(calendar_id, :user_id, 'calendar_write') = 't'
+        and       private_p = 'f';          
     
       </querytext>
 </fullquery>