Index: openacs-4/packages/calendar-portlet/sql/postgresql/calendar-admin-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/sql/postgresql/calendar-admin-portlet-create.sql,v
diff -u -r1.5 -r1.5.6.1
--- openacs-4/packages/calendar-portlet/sql/postgresql/calendar-admin-portlet-create.sql	15 May 2007 20:14:22 -0000	1.5
+++ openacs-4/packages/calendar-portlet/sql/postgresql/calendar-admin-portlet-create.sql	18 Aug 2014 21:04:21 -0000	1.5.6.1
@@ -34,15 +34,21 @@
 -- License version 2 or higher.  Full text of the license is available
 -- from the GNU Project: http://www.fsf.org/copyleft/gpl.html
 
-create function inline_0()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_0/0
+--
+CREATE OR REPLACE FUNCTION inline_0(
+
+) RETURNS integer AS $$
+DECLARE
   ds_id portal_datasources.datasource_id%TYPE;
-begin
+BEGIN
   ds_id := portal_datasource__new(
-   ''calendar_admin_portlet'',
-   ''Displays the calendar_admin'',
-   ''/resources/calendar''
+   'calendar_admin_portlet',
+   'Displays the calendar_admin',
+   '/resources/calendar'
   );
 
   
@@ -51,47 +57,47 @@
   -- shadeable_p 
   perform portal_datasource__set_def_param (
    ds_id,
-    ''t'',
-    ''t'',
-    ''shadeable_p'',
-    ''t''
+    't',
+    't',
+    'shadeable_p',
+    't'
 );	
 
 
   -- hideable_p 
   perform portal_datasource__set_def_param (
    ds_id,
- ''t'',
- ''t'',
- ''hideable_p'',
- ''t''
+ 't',
+ 't',
+ 'hideable_p',
+ 't'
 );	
 
   -- user_editable_p 
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''t'',
- ''user_editable_p'',
- ''t''
+ 't',
+ 't',
+ 'user_editable_p',
+ 't'
 );	
 
   -- shaded_p 
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''t'',
- ''shaded_p'',
- ''f''
+ 't',
+ 't',
+ 'shaded_p',
+ 'f'
 );	
 
   -- link_hideable_p 
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''t'',
- ''link_hideable_p'',
- ''f''
+ 't',
+ 't',
+ 'link_hideable_p',
+ 'f'
 );	
 
 
@@ -100,134 +106,156 @@
   -- calendar_id must be configured 
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''f'',
- ''calendar_id'',
- ''''
+ 't',
+ 'f',
+ 'calendar_id',
+ ''
 );
 
 
   -- default_view see cal-table-create__sql
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''t'',
- ''default_view'',
- ''day''
+ 't',
+ 't',
+ 'default_view',
+ 'day'
 );	
 
 
   -- default_view see cal-table-create__sql
   perform portal_datasource__set_def_param (
  ds_id,
- ''t'',
- ''t'',
- ''group_calendar_id'',
+ 't',
+ 't',
+ 'group_calendar_id',
  NULL
 );	
 
 -- XXX community calendars
    return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 select inline_0();
 drop function inline_0();
 
-create function inline_0()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_0/0
+--
+CREATE OR REPLACE FUNCTION inline_0(
+
+) RETURNS integer AS $$
+DECLARE
 	foo integer;
-begin
+BEGIN
 	-- create the implementation
 	foo := acs_sc_impl__new (
-		''portal_datasource'',
-		''calendar_admin_portlet'',
-		''calendar_admin_portlet''
+		'portal_datasource',
+		'calendar_admin_portlet',
+		'calendar_admin_portlet'
 	);
 	return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 select inline_0();
 drop function inline_0();
 
-create function inline_0()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_0/0
+--
+CREATE OR REPLACE FUNCTION inline_0(
+
+) RETURNS integer AS $$
+DECLARE
 	foo integer;
-begin
+BEGIN
 
 	-- add all the hooks
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''GetMyName'',
-	       ''calendar_admin_portlet::get_my_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'GetMyName',
+	       'calendar_admin_portlet::get_my_name',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''GetPrettyName'',
-	       ''calendar_admin_portlet::get_pretty_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'GetPrettyName',
+	       'calendar_admin_portlet::get_pretty_name',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''Link'',
-	       ''calendar_admin_portlet::link'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'Link',
+	       'calendar_admin_portlet::link',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''AddSelfToPage'',
-	       ''calendar_admin_portlet::add_self_to_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'AddSelfToPage',
+	       'calendar_admin_portlet::add_self_to_page',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''Show'',
-	       ''calendar_admin_portlet::show'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'Show',
+	       'calendar_admin_portlet::show',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''Edit'',
-	       ''calendar_admin_portlet::edit'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'Edit',
+	       'calendar_admin_portlet::edit',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_admin_portlet'',
-	       ''RemoveSelfFromPage'',
-	       ''calendar_admin_portlet::remove_self_from_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_admin_portlet',
+	       'RemoveSelfFromPage',
+	       'calendar_admin_portlet::remove_self_from_page',
+	       'TCL'
 	);
 	return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 select inline_0();
 drop function inline_0();
 
-create function inline_0()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_0/0
+--
+CREATE OR REPLACE FUNCTION inline_0(
+
+) RETURNS integer AS $$
+DECLARE
 	foo integer;
-begin
+BEGIN
 
 	-- Add the binding
 	perform acs_sc_binding__new (
- ''portal_datasource'',
- ''calendar_admin_portlet''
+ 'portal_datasource',
+ 'calendar_admin_portlet'
 	);
 	return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 select inline_0();
 drop function inline_0();
 
