Index: openacs-4/packages/calendar/sql/postgresql/cal-item-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/cal-item-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/sql/postgresql/cal-item-create.sql	5 Sep 2001 09:44:59 -0000	1.2
+++ openacs-4/packages/calendar/sql/postgresql/cal-item-create.sql	8 Sep 2001 00:36:49 -0000	1.3
@@ -173,7 +173,7 @@
 	);
 
     insert into cal_items
-	(new__cal_item_id, new__on_which_calendar)
+	(cal_item_id, on_which_calendar)
     values          
 	(v_cal_item_id, new__on_which_calendar);
 
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.3 -r1.4
--- openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	5 Sep 2001 11:22:19 -0000	1.3
+++ openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	8 Sep 2001 00:36:49 -0000	1.4
@@ -272,16 +272,16 @@
 RETURNS integer 
 AS 'declare
 	v_calendar_id           calendars.calendar_id%TYPE;
-	new__calendar_id	alias for $1,
-	new__calendar_name	alias for $2,
-	new__object_type	alias for $3,
-	new__owner_id		alias for $4,
-	new__private_p		alias for $5,
-	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__calendar_id	alias for $1;
+	new__calendar_name	alias for $2;
+	new__object_type	alias for $3;
+	new__owner_id		alias for $4;
+	new__private_p		alias for $5;
+	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;
 
     begin
         v_calendar_id := acs_object__new(
@@ -294,7 +294,7 @@
 	);
 	
 	insert into     calendars
-                        (new__calendar_id, new__calendar_name, new__owner_id, new__package_id, new__private_p)
+                        (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 (
@@ -312,7 +312,7 @@
 )
 RETURNS integer
 AS 'declare
-	delete__calendar_id		alias for $1
+	delete__calendar_id		alias for $1;
     begin
 	delete from calendars
 	where calendar_id = delete__calendar_id;
@@ -340,8 +340,8 @@
 )
 RETURNS varchar
 AS 'declare
-	name__calendar_id		alias for $1
-	v_calendar_name			calendars.calendar_name%TYPE
+	name__calendar_id		alias for $1;
+	v_calendar_name			calendars.calendar_name%TYPE;
 
     begin
 	select	calendar_name
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.1 -r1.2
--- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	24 Aug 2001 01:19:03 -0000	1.1
+++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	8 Sep 2001 00:36:49 -0000	1.2
@@ -5,19 +5,6 @@
 
 <fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_1">      
       <querytext>
-
-    <!--FIX ME PLSQL
-	FIX ME PLSQL
-
-		begin
-		  acs_permission.grant_permission (
-			object_id       =>      :cal_item_id,
-			grantee_id      =>      :party_id,
-			privilege       =>      'cal_item_read'
-		  );
-		end;
-	-->   
-
 	select acs_permission__grant_permission (
 					:cal_item_id,
 					:party_id,
@@ -30,19 +17,6 @@
 
 <fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_2">      
       <querytext>
-
-   <!--  FIX ME PLSQL
-	FIX ME PLSQL
-
-		begin
-		  acs_permission__grant_permission (
-			object_id       =>      :cal_item_id,
-			grantee_id      =>      :party_id,
-			privilege       =>      :permission
-		  );
-		end;
--->
-	
 	select acs_permission__grant_permission (
 					:cal_item_id,
 					:party_id,
@@ -55,19 +29,6 @@
  
 <fullquery name="cal_assign_item_permission.grant_calendar_permissions_to_items_3"> 
       <querytext>
-
-     <! --FIX ME PLSQL
-	FIX ME PLSQL
-
-	    begin
-	      acs_permission.revoke_permission (
-			object_id       =>      :cal_item_id,
-			grantee_id      =>      :party_id,
-			privilege       =>      :permission
-	    );
-	    end;
--->
-
 	select acs_permission__revokke_permission (
 					:cal_item_id,
 					:party_id,
@@ -80,19 +41,6 @@
  
 <fullquery name="cal_item_create.insert_activity">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-	begin
-	  :1 := acs_activity.new (
-		name          => :name,
-		description   => :description,
-		creation_user => :creation_user,
-		creation_ip   => :creation_ip
-	  );
-	end;
--->
-
 	select acs_activity__new (
 					null,
 					:name,
@@ -111,23 +59,7 @@
 
 <fullquery name="cal_item_create.insert_timespan">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-
-	begin
-	  :1 := timespan.new (  
-		start_date => to_date(:start_date,:date_format),
-		end_date   => to_date(:end_date,:date_format)
-	  );
-	end;
--->
-  
 	select timespan__new (    
-
-				<!--NOT PROPERLY DONE
-		THESE ARE THE ONLY ARGS NEEDED DUNNO THE FORMAT THOU-->
-
 					:to_date(:start_date,:date_format),
 					:to_date(:end_date,:date_format)
 	) 
@@ -138,21 +70,6 @@
  
 <fullquery name="cal_item_create.cal_item_add">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-
-	begin
-	  :1 := cal_item__new(
-  		on_which_calendar  => :on_which_calendar,
-		activity_id        => :activity_id,
-		timespan_id        => :timespan_id,
-		creation_user      => :creation_user,
-		creation_ip        => :creation_ip
-	  );
-	end;
--->
-    
 	select cal_item__new (
 					null,
 					:on_which_calendar,
@@ -174,18 +91,6 @@
  
 <fullquery name="cal_item_create.grant_calendar_permissions_to_items_4">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-	    begin
-  	      acs_permission.grant_permission (
-                object_id       =>      :cal_item_id,
-                grantee_id      =>      :grantee_id,
-                privilege       =>      :privilege
-              );
-	    end;
--->
-
 	select acs_permission__grant_permission (
 					:cal_item_id,
 					:grantee_id,
@@ -198,18 +103,6 @@
  
 <fullquery name="cal_item_update.update_interval">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-	begin
-	  time_interval.edit (
-	    interval_id  => :interval_id,
-	    start_date   => to_date(:start_date,:date_format),
-	    end_date     => to_date(:end_date,:date_format)
-	  );
-	end;
--->
-    
 	select time_interval__edit (
 					:interval_id,
 					to_date(:start_date,:date_format),
@@ -222,19 +115,6 @@
  
 <fullquery name="cal_item_delete.delete_cal_item">      
       <querytext>
-
-<!--      FIX ME PLSQL
-	FIX ME PLSQL
-
-	begin
-	  cal_item.delete (
-	    cal_item_id  => :cal_item_id
-	  );
-	end;
--->
- 
-<!-- THIS IS DONE AND CHECK CORRECTLY  -->
-
 	select cal_item__delete (
 					:cal_item_id
 	)
Index: openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql	24 Aug 2001 01:19:03 -0000	1.1
+++ openacs-4/packages/calendar/tcl/calendar-procs-postgresql.xql	8 Sep 2001 00:36:49 -0000	1.2
@@ -5,20 +5,6 @@
 
 <fullquery name="calendar_create.create_new_calendar">      
       <querytext>
-      <!--FIX ME PLSQL
-FIX ME PLSQL
-
-	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__new(
 		null,
 		:calendar_name,
@@ -48,17 +34,6 @@
  
 <fullquery name="calendar_assign_permissions.assign_calendar_permissions">      
       <querytext>
-      <!--FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	      acs_permission__grant_permission (
-	        object_id       =>      :calendar_id,
-	        grantee_id      =>      :party_id,
-	        privilege       =>      :cal_privilege
-	      );
-	    end;
-      -->
 	    select ac_permission__grant_permission(
 			:calendar_id,
 			:party_id,
@@ -70,17 +45,6 @@
  
 <fullquery name="calendar_assign_permissions.revoke_calendar_permissions">      
       <querytext>
-      <!--FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	      acs_permission__revoke_permission (
-	        object_id       =>      :calendar_id,
-	        grantee_id      =>      :party_id,
-	        privilege       =>      :cal_privilege
-	      );
-	    end;
-      -->
 	    select acs_permission_revoke_permission (
 			:calendar_id,
 			:party_id,