Index: openacs-4/packages/calendar/sql/postgresql/calendar-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/calendar-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	8 Sep 2001 00:36:49 -0000	1.4
+++ openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	9 Sep 2001 07:18:46 -0000	1.5
@@ -262,7 +262,7 @@
        varchar(200),            -- calendar.calendar_name%TYPE
        varchar,            -- acs_objects.object_type%TYPE
        integer,            -- calendar.owner_id%TYPE
-       integer,            -- calendar.private_p
+       boolean,            -- calendar.private_p
        integer,            -- calendar.package_id
        integer,            -- acs_objects.context_id%TYPE
        timestamp,          -- acs_objects.creation_date%TYPE
@@ -280,8 +280,8 @@
 	new__package_id		alias for $6;
 	new__context_id		alias for $7;
 	new__creation_date	alias for $8;
-	new__createion_user	alias for $9;
-	new__createion_ip	alias for $10;
+	new__creation_user	alias for $9;
+	new__creation_ip	alias for $10;
 
     begin
         v_calendar_id := acs_object__new(
@@ -296,13 +296,14 @@
 	insert into     calendars
                         (calendar_id, calendar_name, owner_id, package_id, private_p)
 	values          (v_calendar_id, new__calendar_name, new__owner_id, new__package_id, new__private_p);
-
+      
 	PERFORM acs_permission__grant_permission (
-		v_calendar_id,
-	        new__owner_id,
-		"calendar_admin"
-	);
+              v_calendar_id,
+              new__owner_id,
+              ''calendar_admin''
+        );
 
+
 	return v_calendar_id;
     end;'
 LANGUAGE 'plpgsql';   
Index: openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql	5 Sep 2001 09:44:59 -0000	1.2
+++ openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql	9 Sep 2001 07:18:46 -0000	1.3
@@ -134,7 +134,7 @@
        varchar,            -- calendar.calendar_name%TYPE
        varchar,            -- acs_objects.object_type%TYPE
        integer,            -- calendar.owner_id%TYPE
-       integer,            -- calendar.private_p
+       boolean,            -- calendar.private_p
        integer,            -- calendar.package_id
        integer,            -- acs_objects.context_id%TYPE
        timestamp,          -- acs_objects.creation_date%TYPE
Index: openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	8 Sep 2001 00:36:49 -0000	1.2
+++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	9 Sep 2001 07:18:46 -0000	1.3
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_1">      
+<fullquery name="cal_assign_item_permission.1_grant_calendar_permissions_to_items">      
       <querytext>
 	select acs_permission__grant_permission (
 					:cal_item_id,
@@ -15,7 +15,7 @@
 </fullquery>
 
 
-<fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_2">      
+<fullquery name="cal_assign_item_permission.2_grant_calendar_permissions_to_items">      
       <querytext>
 	select acs_permission__grant_permission (
 					:cal_item_id,
@@ -27,9 +27,9 @@
 </fullquery>
 
  
-<fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_3"> 
+<fullquery name="cal_assign_item_permission.3_grant_calendar_permissions_to_items"> 
       <querytext>
-	select acs_permission__revokke_permission (
+	select acs_permission__revoke_permission (
 					:cal_item_id,
 					:party_id,
 					:permission
@@ -60,8 +60,8 @@
 <fullquery name="cal_item_create.insert_timespan">      
       <querytext>
 	select timespan__new (    
-					:to_date(:start_date,:date_format),
-					:to_date(:end_date,:date_format)
+					to_date(:start_date,:date_format),
+					to_date(:end_date,:date_format)
 	) 
 
       </querytext>
@@ -89,7 +89,7 @@
 </fullquery>
 
  
-<fullquery name="cal_item_create.grant_calendar_permissions_to_items_4">      
+<fullquery name="cal_item_create.4_grant_calendar_permissions_to_items">      
       <querytext>
 	select acs_permission__grant_permission (
 					:cal_item_id,
Index: openacs-4/packages/calendar/tcl/cal-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/tcl/cal-item-procs.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/tcl/cal-item-procs.tcl	9 Sep 2001 07:18:46 -0000	1.2
@@ -34,7 +34,7 @@
 
 	    # grant read permission first
 
-	    db_exec_plsql grant_calendar_permissions_to_items {
+	    db_exec_plsql 1_grant_calendar_permissions_to_items {
 		begin
 		acs_permission.grant_permission (
 		  object_id       =>      :cal_item_id,
@@ -48,7 +48,7 @@
 	
 	# grant other permission
 
-	db_exec_plsql grant_calendar_permissions_to_items {
+	db_exec_plsql 2_grant_calendar_permissions_to_items {
 	    begin
 	    acs_permission.grant_permission (
 	      object_id       =>      :cal_item_id,
@@ -63,7 +63,7 @@
 	
 	# revoke the permissions
 
-	db_exec_plsql grant_calendar_permissions_to_items {
+	db_exec_plsql 3_grant_calendar_permissions_to_items {
 	    begin
 	    acs_permission.revoke_permission (
 	      object_id       =>      :cal_item_id,
@@ -166,7 +166,7 @@
 
 	# setting the permission
 
-	db_exec_plsql grant_calendar_permissions_to_items {
+	db_exec_plsql 4_grant_calendar_permissions_to_items {
 	    begin
   	      acs_permission.grant_permission (
                 object_id       =>      :cal_item_id,
Index: openacs-4/packages/calendar/tcl/calendar-community-core-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-community-core-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/tcl/calendar-community-core-procs-postgresql.xql	24 Aug 2001 01:19:03 -0000	1.1
+++ openacs-4/packages/calendar/tcl/calendar-community-core-procs-postgresql.xql	9 Sep 2001 07:18:46 -0000	1.2
@@ -24,7 +24,7 @@
 </fullquery>
 
  
-<fullquery name="cc_is_party_group_p.get_group_result">      
+<fullquery name="cc_is_party_user_p.get_group_result">      
       <querytext>
       
 	select    acs_object_util__get_object_type(:party_id)