Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql	8 Aug 2006 21:26:22 -0000	1.13
+++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql	1 Nov 2013 21:08:29 -0000	1.14
@@ -26,371 +26,371 @@
 -- @note We remember September 11th, 2001
 --
 
-create function inline_0()
-returns integer as '
-begin
+CREATE OR REPLACE FUNCTION inline_0() RETURNS integer AS $$
+BEGIN
 
     -- Create the base community type
     perform dotlrn_community_type__new(
-        ''dotlrn_community'',
+        'dotlrn_community',
         null,
-        ''#dotlrn.dotlrn_community_pretty_name#'',
-        ''#dotlrn.dotlrn_community_pretty_plural#'',
-        ''#dotlrn.dotlrn_community_description#''
+        '#dotlrn.dotlrn_community_pretty_name#',
+        '#dotlrn.dotlrn_community_pretty_plural#',
+        '#dotlrn.dotlrn_community_description#'
     );
 
     -- these are the possible attributes of a community
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''header_font'',
-	   ''string'',
-	   ''#dotlrn.Header_Font#'',
-	   ''#dotlrn.Header_Fonts#'',
+	   'dotlrn_community',
+	   'header_font',
+	   'string',
+	   '#dotlrn.Header_Font#',
+	   '#dotlrn.Header_Fonts#',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''header_font_size'',
-	   ''string'',
-	   ''#dotlrn.Header_Font_Size#'',
-	   ''#dotlrn.Header_Font_Sizes#'',
+	   'dotlrn_community',
+	   'header_font_size',
+	   'string',
+	   '#dotlrn.Header_Font_Size#',
+	   '#dotlrn.Header_Font_Sizes#',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''header_font_color'',
-	   ''string'',
-	   ''#dotlrn.Header_Font_Color#'',
-	   ''#dotlrn.Header_Font_Colors#'',
+	   'dotlrn_community',
+	   'header_font_color',
+	   'string',
+	   '#dotlrn.Header_Font_Color#',
+	   '#dotlrn.Header_Font_Colors#',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''header_logo_item_id'',
-	   ''integer'',
-	   ''#dotlrn.Header_Logo_Item_ID#'',
-	   ''#dotlrn.Header_Logo_Item_ID#'',
+	   'dotlrn_community',
+	   'header_logo_item_id',
+	   'integer',
+	   '#dotlrn.Header_Logo_Item_ID#',
+	   '#dotlrn.Header_Logo_Item_ID#',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''header_logo_alt_text'',
-	   ''integer'',
-	   ''#dotlrn.Header_Logo_Alt_Text#'',
-	   ''#dotlrn.Header_Logo_Alt_Text#'',
+	   'dotlrn_community',
+	   'header_logo_alt_text',
+	   'integer',
+	   '#dotlrn.Header_Logo_Alt_Text#',
+	   '#dotlrn.Header_Logo_Alt_Text#',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
 
     -- create the dotlrn_class community type
     perform dotlrn_community_type__new(
-        ''dotlrn_class_instance'',
-        ''dotlrn_community'',
-        ''#dotlrn.dotlrn_class_instance_pretty_name#'',
-        ''#dotlrn.dotlrn_class_instance_pretty_plural#'',
-        ''#dotlrn.dotlrn_class_instance_description#''
+        'dotlrn_class_instance',
+        'dotlrn_community',
+        '#dotlrn.dotlrn_class_instance_pretty_name#',
+        '#dotlrn.dotlrn_class_instance_pretty_plural#',
+        '#dotlrn.dotlrn_class_instance_description#'
     );
 
     -- create the dotlrn_club community type
     perform dotlrn_community_type__new(
-        ''dotlrn_club'',
-        ''dotlrn_community'',
-        ''#dotlrn.dotlrn_club_pretty_name#'',
-        ''#dotlrn.dotlrn_club_pretty_plural#'',
-        ''#dotlrn.dotlrn_club_description#''
+        'dotlrn_club',
+        'dotlrn_community',
+        '#dotlrn.dotlrn_club_pretty_name#',
+        '#dotlrn.dotlrn_club_pretty_plural#',
+        '#dotlrn.dotlrn_club_description#'
     );
 
-    update acs_object_types set table_name = ''dotlrn_community'', package_name = ''dotlrn_community'' where object_type = ''dotlrn_community'';
-    update acs_object_types set table_name = ''dotlrn_class_instance'', package_name = ''dotlrn_class_instance'' where object_type = ''dotlrn_class_instance'';
-    update acs_object_types set table_name = ''dotlrn_club'', package_name = ''dotlrn_club'' where object_type = ''dotlrn_club'';
+    update acs_object_types set table_name = 'dotlrn_community', package_name = 'dotlrn_community' where object_type = 'dotlrn_community';
+    update acs_object_types set table_name = 'dotlrn_class_instance', package_name = 'dotlrn_class_instance' where object_type = 'dotlrn_class_instance';
+    update acs_object_types set table_name = 'dotlrn_club', package_name = 'dotlrn_club' where object_type = 'dotlrn_club';
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''member_pretty_name'',
-	   ''string'',
-	   ''Member Pretty Name'',
-	   ''Member Pretty Name'',
+	   'dotlrn_community',
+	   'member_pretty_name',
+	   'string',
+	   'Member Pretty Name',
+	   'Member Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute(
-	   ''dotlrn_community'',
-	   ''member_pretty_plural'',
-	   ''string'',
-	   ''Member Pretty Plural'',
-	   ''Member Pretty Plural'',
+	   'dotlrn_community',
+	   'member_pretty_plural',
+	   'string',
+	   'Member Pretty Plural',
+	   'Member Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     -- create roles
-    perform acs_rel_type__create_role(''student'', ''#dotlrn.student_role_pretty_name#'', ''#dotlrn.student_role_pretty_plural#'');
-    perform acs_rel_type__create_role(''course_assistant'', ''#dotlrn.course_assistant_role_pretty_name#'', ''#dotlrn.course_assistant_role_pretty_plural#'');
-    perform acs_rel_type__create_role(''teaching_assistant'', ''#dotlrn.teaching_assistant_role_pretty_name#'', ''#dotlrn.teaching_assistant_role_pretty_plural#'');
-    perform acs_rel_type__create_role(''instructor'', ''#dotlrn.instructor_role_pretty_name#'', ''#dotlrn.instructor_role_pretty_plural#'');
-    perform acs_rel_type__create_role(''course_admin'', ''#dotlrn.course_admin_role_pretty_name#'', ''#dotlrn.course_admin_role_pretty_plural#'');
+    perform acs_rel_type__create_role('student', '#dotlrn.student_role_pretty_name#', '#dotlrn.student_role_pretty_plural#');
+    perform acs_rel_type__create_role('course_assistant', '#dotlrn.course_assistant_role_pretty_name#', '#dotlrn.course_assistant_role_pretty_plural#');
+    perform acs_rel_type__create_role('teaching_assistant', '#dotlrn.teaching_assistant_role_pretty_name#', '#dotlrn.teaching_assistant_role_pretty_plural#');
+    perform acs_rel_type__create_role('instructor', '#dotlrn.instructor_role_pretty_name#', '#dotlrn.instructor_role_pretty_plural#');
+    perform acs_rel_type__create_role('course_admin', '#dotlrn.course_admin_role_pretty_name#', '#dotlrn.course_admin_role_pretty_plural#');
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''student_pretty_name'',
-	   ''string'',
-	   ''Student Pretty Name'',
-	   ''Student Pretty Name'',
+	   'dotlrn_community',
+	   'student_pretty_name',
+	   'string',
+	   'Student Pretty Name',
+	   'Student Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''student_pretty_plural'',
-	   ''string'',
-	   ''Student Pretty Plural'',
-	   ''Student Pretty Plural'',
+	   'dotlrn_community',
+	   'student_pretty_plural',
+	   'string',
+	   'Student Pretty Plural',
+	   'Student Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''course_assistant_pretty_name'',
-	   ''string'',
-	   ''Course Assistant Pretty Name'',
-	   ''Course Assistant Pretty Name'',
+	   'dotlrn_community',
+	   'course_assistant_pretty_name',
+	   'string',
+	   'Course Assistant Pretty Name',
+	   'Course Assistant Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''course_assistant_pretty_plural'',
-	   ''string'',
-	   ''Course Assistant Pretty Plural'',
-	   ''Course Assistant Pretty Plural'',
+	   'dotlrn_community',
+	   'course_assistant_pretty_plural',
+	   'string',
+	   'Course Assistant Pretty Plural',
+	   'Course Assistant Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''teaching_assistant_pretty_name'',
-	   ''string'',
-	   ''Teaching Assistant Pretty Name'',
-	   ''Teaching Assistant Pretty Name'',
+	   'dotlrn_community',
+	   'teaching_assistant_pretty_name',
+	   'string',
+	   'Teaching Assistant Pretty Name',
+	   'Teaching Assistant Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''teaching_assistant_pretty_plural'',
-	   ''string'',
-	   ''Teaching Assistant Pretty Plural'',
-	   ''Teaching Assistant Pretty Plural'',
+	   'dotlrn_community',
+	   'teaching_assistant_pretty_plural',
+	   'string',
+	   'Teaching Assistant Pretty Plural',
+	   'Teaching Assistant Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''instructor_pretty_name'',
-	   ''string'',
-	   ''Professor Pretty Name'',
-	   ''Professor Pretty Name'',
+	   'dotlrn_community',
+	   'instructor_pretty_name',
+	   'string',
+	   'Professor Pretty Name',
+	   'Professor Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''instructor_pretty_plural'',
-	   ''string'',
-	   ''Professor Pretty Plural'',
-	   ''Professor Pretty Plural'',
+	   'dotlrn_community',
+	   'instructor_pretty_plural',
+	   'string',
+	   'Professor Pretty Plural',
+	   'Professor Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''course_admin_pretty_name'',
-	   ''string'',
-	   ''Course Administrator Pretty Name'',
-	   ''Course Administrator Pretty Name'',
+	   'dotlrn_community',
+	   'course_admin_pretty_name',
+	   'string',
+	   'Course Administrator Pretty Name',
+	   'Course Administrator Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''course_admin_pretty_plural'',
-	   ''string'',
-	   ''Course Administrator Pretty Plural'',
-	   ''Course Administrator Pretty Plural'',
+	   'dotlrn_community',
+	   'course_admin_pretty_plural',
+	   'string',
+	   'Course Administrator Pretty Plural',
+	   'Course Administrator Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',		  
-	   ''admin_pretty_name'',
-	   ''string'',
-	   ''Administrator Pretty Name'',
-	   ''Administrator Pretty Name'',
+	   'dotlrn_community',		  
+	   'admin_pretty_name',
+	   'string',
+	   'Administrator Pretty Name',
+	   'Administrator Pretty Name',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     perform acs_attribute__create_attribute (
-	   ''dotlrn_community'',
-	   ''admin_pretty_plural'',
-	   ''string'',
-	   ''Administrator Pretty Plural'',
-	   ''Administrator Pretty Plural'',
+	   'dotlrn_community',
+	   'admin_pretty_plural',
+	   'string',
+	   'Administrator Pretty Plural',
+	   'Administrator Pretty Plural',
 	   null, null, null,
 	   0,
 	   1,
 	   null,
-	   ''generic'',
-	   ''f''
+	   'generic',
+	   'f'
     );
 
     -- create basic rel_types
 
     perform acs_rel_type__create_type (
-	   ''dotlrn_member_rel'',
-	   ''#dotlrn.dotlrn_member_rel_pretty_name#'',
-	   ''#dotlrn.dotlrn_member_rel_pretty_plural#'',
-	   ''membership_rel'',
-	   ''dotlrn_member_rels'',
-	   ''rel_id'',
-	   ''dotlrn_member_rel'',
-	   ''dotlrn_community'',
+	   'dotlrn_member_rel',
+	   '#dotlrn.dotlrn_member_rel_pretty_name#',
+	   '#dotlrn.dotlrn_member_rel_pretty_plural#',
+	   'membership_rel',
+	   'dotlrn_member_rels',
+	   'rel_id',
+	   'dotlrn_member_rel',
+	   'dotlrn_community',
 	   null,
 	   0,
 	   null,
-	   ''user'',
-	   ''member'',
+	   'user',
+	   'member',
 	   0,
 	   null
     );
 
     perform acs_rel_type__create_type (
-	   ''dotlrn_admin_rel'',
-	   ''#dotlrn.dotlrn_admin_rel_pretty_name#'',
-	   ''#dotlrn.dotlrn_admin_rel_pretty_plural#'',
-	   ''dotlrn_member_rel'',
-	   ''dotlrn_admin_rels'',
-	   ''rel_id'',
-	   ''dotlrn_admin_rel'',
-	   ''dotlrn_community'',
+	   'dotlrn_admin_rel',
+	   '#dotlrn.dotlrn_admin_rel_pretty_name#',
+	   '#dotlrn.dotlrn_admin_rel_pretty_plural#',
+	   'dotlrn_member_rel',
+	   'dotlrn_admin_rels',
+	   'rel_id',
+	   'dotlrn_admin_rel',
+	   'dotlrn_community',
 	   null,
 	   0,
 	   null,
-	   ''user'',
-	   ''admin'',
+	   'user',
+	   'admin',
 	   0,
 	   null
     );
 
     -- all rels to communities must have a portal_id
     perform acs_attribute__create_attribute (
-	  ''dotlrn_member_rel'',
-	  ''portal_id'',
-	  ''integer'',
-	  ''Page ID'',
-	  ''Page IDs'',
+	  'dotlrn_member_rel',
+	  'portal_id',
+	  'integer',
+	  'Page ID',
+	  'Page IDs',
 	  null, null, null,
 	  1,
 	  1,
 	  null,
-	  ''type_specific'',
-	  ''f''
+	  'type_specific',
+	  'f'
     );
 
     return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 select inline_0();
 drop function inline_0();