Index: openacs-4/packages/calendar-portlet/sql/postgresql/calendar-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/sql/postgresql/calendar-portlet-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar-portlet/sql/postgresql/calendar-portlet-create.sql	15 May 2007 20:14:22 -0000	1.5
+++ openacs-4/packages/calendar-portlet/sql/postgresql/calendar-portlet-create.sql	27 Oct 2014 16:41:10 -0000	1.6
@@ -33,15 +33,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_portlet'',
-         ''Displays the calendar '',
-         ''/resources/calendar''
+         'calendar_portlet',
+         'Displays the calendar ',
+         '/resources/calendar'
   );
 
   
@@ -50,56 +56,56 @@
   -- 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'',
-	''t''
+	't',
+	't',
+	'link_hideable_p',
+	't'
 );	
 
 
     perform portal_datasource__set_def_param(
         ds_id,
-        ''t'',
-        ''f'',
-        ''scoped_p'',
-        ''t''
+        't',
+        'f',
+        'scoped_p',
+        't'
     );
 
 
@@ -108,147 +114,169 @@
   -- 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_portlet'',
-		''calendar_portlet''
+		'portal_datasource',
+		'calendar_portlet',
+		'calendar_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_portlet'',
-	       ''GetMyName'',
-	       ''calendar_portlet::get_my_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'GetMyName',
+	       'calendar_portlet::get_my_name',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''GetPrettyName'',
-	       ''calendar_portlet::get_pretty_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'GetPrettyName',
+	       'calendar_portlet::get_pretty_name',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''Link'',
-	       ''calendar_portlet::link'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'Link',
+	       'calendar_portlet::link',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''AddSelfToPage'',
-	       ''calendar_portlet::add_self_to_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'AddSelfToPage',
+	       'calendar_portlet::add_self_to_page',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''Show'',
-	       ''calendar_portlet::show'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'Show',
+	       'calendar_portlet::show',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''Edit'',
-	       ''calendar_portlet::edit'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'Edit',
+	       'calendar_portlet::edit',
+	       'TCL'
 	);
 
 	foo := acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''calendar_portlet'',
-	       ''RemoveSelfFromPage'',
-	       ''calendar_portlet::remove_self_from_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'calendar_portlet',
+	       'RemoveSelfFromPage',
+	       'calendar_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_portlet''
+	    'portal_datasource',
+	    'calendar_portlet'
 	);
 
    return 0;
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 select inline_0();
 drop function inline_0();
 
