Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql	13 Mar 2002 22:54:44 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql	18 Mar 2002 21:59:14 -0000	1.5
@@ -1,39 +1,49 @@
 <?xml version="1.0"?>
 <queryset>
-<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="ad_permission_grant.grant_permission">
-<querytext>
-	select
-	acs_permission__grant_permission(:object_id,
-					:user_id,
-					:privilege);
-</querytext>
-</fullquery>
+    <fullquery name="permission::grant.grant_permission">
+        <querytext>
+            declare
+            begin
+                acs_permission__grant_permission(
+                    object_id => :object_id,
+                    grantee_id => :party_id,
+                    privilege => :privilege
+                );
+            end;
+        </querytext>
+    </fullquery>
 
-<fullquery name="ad_permission_revoke.revoke_permission">
-<querytext>
-	select
-	acs_permission__revoke_permission(:object_id,
-					:user_id,
-					:privilege);
-</querytext>
-</fullquery>
+    <fullquery name="permission::revoke.revoke_permission">
+        <querytext>
+            declare
+            begin
+                acs_permission__revoke_permission(
+                    object_id => :object_id,
+                    grantee_id => :party_id,
+                    privilege => :privilege
+                );
+            end;
+        </querytext>
+    </fullquery>
 
-<fullquery name="ad_permission_p.result">
-<querytext>
-    select count(*)
-      from dual
-     where acs_permission__permission_p(:object_id, :user_id, :privilege) =
-'t'
-</querytext>
-</fullquery>
+    <fullquery name="permission::permission_p.select_permission_p">
+        <querytext>
+            select count(*)
+            from dual
+            where exists (select 1
+                          from dual
+                          where 't' = acs_permission__permission_p(:object_id, :party_id, :privilege))
+        </querytext>
+    </fullquery>
 
-<fullquery name="ad_require_permission.name">      
-      <querytext>
-      select acs_object__name(:object_id)
-      </querytext>
-</fullquery>
+    <fullquery name="permission::require_permission.name">      
+        <querytext>
+            select acs_object__name(:object_id)
+            from dual
+        </querytext>
+    </fullquery>
 
     <fullquery name="permission::toggle_inherit.toggle_inherit">
         <querytext>