Index: openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql 9 Jan 2004 21:02:50 -0000 1.4 +++ openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql 9 Jan 2004 21:54:24 -0000 1.5 @@ -1,60 +1,49 @@ - oracle8.1.6 +oracle8.1.6 - - - begin - :1 := calendar.new( - owner_id => :owner_id, - private_p => :private_p, - calendar_name => :calendar_name, - package_id => :package_id, - creation_user => :creation_user, - creation_ip => :creation_ip - ); - end; - - - + + + begin + :1 := calendar.new( + owner_id => :owner_id, + private_p => :private_p, + calendar_name => :calendar_name, + package_id => :package_id, + creation_user => :creation_user, + creation_ip => :creation_ip + ); + end; - - - - - select calendar.name(:calendar_id) - from dual - - + - - + select calendar_name, calendar_id, acs_permission.permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p from calendars where (private_p = 'f' and package_id = :package_id $permissions_clause) or (private_p = 't' and owner_id = :user_id) order by private_p asc, upper(calendar_name) - + - + and acs_permission.permission_p(calendar_id, :user_id, :privilege) = 't' - + - + begin calendar.del(:calendar_id); end; - +