Index: openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-admin-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-admin-portlet-create.sql,v
diff -u -r1.2 -r1.2.18.1
--- openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-admin-portlet-create.sql	4 Dec 2002 09:51:50 -0000	1.2
+++ openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-admin-portlet-create.sql	18 Aug 2014 21:46:03 -0000	1.2.18.1
@@ -32,61 +32,67 @@
 -- 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(
-         ''dotlrn_forums_admin_portlet'', --     name
-         ''Displays the dotlrn_forums_admin'' --     description
+         'dotlrn_forums_admin_portlet', --     name
+         'Displays the dotlrn_forums_admin' --     description
   );
 
   -- 4 defaults procs
 
   -- shadeable_p 
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''t'', -- 	configured_p
-         ''shadeable_p'', -- 	key
-         ''f'' -- 	value
+         't', -- 	config_required_p
+         't', -- 	configured_p
+         'shadeable_p', -- 	key
+         'f' -- 	value
   );	
 
   -- shaded_p 
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''t'', -- 	configured_p
-         ''shaded_p'', -- 	key
-         ''f'' -- 	value
+         't', -- 	config_required_p
+         't', -- 	configured_p
+         'shaded_p', -- 	key
+         'f' -- 	value
   );	
 
   -- hideable_p 
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''t'', -- 	configured_p
-         ''hideable_p'', -- 	key
-         ''t'' -- 	value
+         't', -- 	config_required_p
+         't', -- 	configured_p
+         'hideable_p', -- 	key
+         't' -- 	value
   );	
 
   -- user_editable_p 
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''t'', -- 	configured_p
-         ''user_editable_p'', -- 	key
-         ''f'' -- 	value
+         't', -- 	config_required_p
+         't', -- 	configured_p
+         'user_editable_p', -- 	key
+         'f' -- 	value
   );	
 
   -- link_hideable_p 
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''t'', -- 	configured_p
-         ''link_hideable_p'', -- 	key
-         ''t'' -- 	value
+         't', -- 	config_required_p
+         't', -- 	configured_p
+         'link_hideable_p', -- 	key
+         't' -- 	value
   );	
 
 
@@ -95,121 +101,143 @@
   -- package_id must be configured
   perform portal_datasource__set_def_param (
          ds_id, -- 	datasource_id
-         ''t'', -- 	config_required_p
-         ''f'', -- 	configured_p
-         ''package_id'', -- 	key
-         '''' -- 	value
+         't', -- 	config_required_p
+         'f', -- 	configured_p
+         'package_id', -- 	key
+         '' -- 	value
   );	
 
   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
 	perform acs_sc_impl__new (
-		''portal_datasource'',
-		''dotlrn_forums_admin_portlet'',
-		''dotlrn_forums_admin_portlet''
+		'portal_datasource',
+		'dotlrn_forums_admin_portlet',
+		'dotlrn_forums_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
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''GetMyName'',
-	       ''dotlrn_forums_admin_portlet::get_my_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'GetMyName',
+	       'dotlrn_forums_admin_portlet::get_my_name',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''GetPrettyName'',
-	       ''dotlrn_forums_admin_portlet::get_pretty_name'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'GetPrettyName',
+	       'dotlrn_forums_admin_portlet::get_pretty_name',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''Link'',
-	       ''dotlrn_forums_admin_portlet::link'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'Link',
+	       'dotlrn_forums_admin_portlet::link',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''AddSelfToPage'',
-	       ''dotlrn_forums_admin_portlet::add_self_to_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'AddSelfToPage',
+	       'dotlrn_forums_admin_portlet::add_self_to_page',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''Show'',
-	       ''dotlrn_forums_admin_portlet::show'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'Show',
+	       'dotlrn_forums_admin_portlet::show',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''Edit'',
-	       ''dotlrn_forums_admin_portlet::edit'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'Edit',
+	       'dotlrn_forums_admin_portlet::edit',
+	       'TCL'
 	);
 
 	perform acs_sc_impl_alias__new (
-	       ''portal_datasource'',
-	       ''dotlrn_forums_admin_portlet'',
-	       ''RemoveSelfFromPage'',
-	       ''dotlrn_forums_admin_portlet::remove_self_from_page'',
-	       ''TCL''
+	       'portal_datasource',
+	       'dotlrn_forums_admin_portlet',
+	       'RemoveSelfFromPage',
+	       'dotlrn_forums_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'', -- 	    contract_name
-                ''dotlrn_forums_admin_portlet'' -- 	    impl_name
+                'portal_datasource', -- 	    contract_name
+                'dotlrn_forums_admin_portlet' -- 	    impl_name
 	);
   return 0;
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 select inline_0();
 drop function inline_0();
