Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.70 -r1.71
--- openacs-4/packages/dotlrn/dotlrn.info	2 Apr 2002 06:13:47 -0000	1.70
+++ openacs-4/packages/dotlrn/dotlrn.info	7 Apr 2002 04:19:07 -0000	1.71
@@ -41,8 +41,10 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-admins-sanitize.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-applet-sc-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-classes-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-classes-memberships-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-clubs-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-communities-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-communities-package-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-community-memberships-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-community-memberships-packages-create.sql"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-create.sql"/>
@@ -83,7 +85,59 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-users-package-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-users-package-drop.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-users-sanitize.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admin-profile-provider-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admin-profile-provider-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-package-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-admins-sanitize.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-applet-sc-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-classes-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-clubs-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-communities-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-communities-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-community-memberships-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-community-memberships-packages-create.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/dotlrn-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-external-profile-provider-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-external-profile-provider-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-package-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-externals-sanitize.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-main-portlet-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-main-portlet-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professor-profile-provider-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professor-profile-provider-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-package-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-professors-sanitize.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-security-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-student-profile-provider-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-student-profile-provider-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-package-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-students-sanitize.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-user-extension-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-user-profile-provider-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-user-profile-provider-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-init.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-package-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-package-drop.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/dotlrn-users-sanitize.sql"/>
             <file type="tcl_procs" path="tcl/applets-procs.tcl"/>
             <file type="query_file" path="tcl/applets-procs.xql"/>
             <file type="tcl_procs" path="tcl/class-applets-procs.tcl"/>
@@ -251,9 +305,9 @@
             <file type="query_file" path="www/configure.xql"/>
             <file type="content_page" path="www/deregister-link.adp"/>
             <file type="content_page" path="www/deregister.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/dotlrn-main-portlet-oracle.xql"/>
             <file type="content_page" path="www/dotlrn-main-portlet.adp"/>
             <file type="content_page" path="www/dotlrn-main-portlet.tcl"/>
-            <file type="query_file" path="www/dotlrn-main-portlet.xql"/>
             <file type="content_page" path="www/dotlrn-master.adp"/>
             <file type="content_page" path="www/dotlrn-master.tcl"/>
             <file type="content_page" path="www/folder-chunk.adp"/>
@@ -357,18 +411,18 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_name"  default="Community" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_plural"  default="Communities" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_main_portlet_pretty_name"  default="Groups" description="The pretty name for the dotlrn main portlet (aka &quot;My Groups&quot;)"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_wsp_page_names"  default="MySpace,Simple 2-Column;Calendar,Simple 1-Column;My Files,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_dotlrn_user_email_patterns"  description="Automatic dotLRN user email patterns"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_dotlrn,dotlrn_members_staff,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_name"  default="Subgroup" description="what subcomms are called"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_plural"  default="Subgroups" description="the plural"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_wsp_page_names"  default="MySpace,Simple 2-Column;Calendar,Simple 1-Column;My Files,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_instance_pages_csv"  default="Class Home,Simple 2-Column;Calendar,Simple 1-Column;File Storage,Simple 1-Column;Survey,Simple 1-Column" description="cvs list of the page_name/layout to create"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="club_pages_csv"  default="Community Home,Simple 2-Column;Calendar,Simple 1-Column;File Storage,Simple 1-Column;People,Simple 1-Column" description="same"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcomm_pages_csv"  default="Subgroup Home,Simple 2-Column;Subgroup Info,Simple 2-Column;Calendar,Simple 1-Column;Files,Simple 1-Column" description="default page names and layouts for subcomms"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="non_member_page_name"  default="Not-A-Member" description="The name of the not a member page"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="admin_page_name"  default="Contol Panel" description="The name of the admin page"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_news,dotlrn_dotlrn,dotlrn_bboard,dotlrn_static,dotlrn_faq,dotlrn_survey,dotlrn_members_staff,dotlrn_calendar,dotlrn_fs" description="dotLRN applets to add by default to each new community"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_club_applets"  default="dotlrn_news,dotlrn_dotlrn,dotlrn_bboard,dotlrn_static,dotlrn_faq,dotlrn_survey,dotlrn_calendar,dotlrn_fs,dotlrn_members" description="the applets to add when making a new club"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_subcomm_applets"  default="dotlrn_news,dotlrn_dotlrn,dotlrn_bboard,dotlrn_static,dotlrn_faq,dotlrn_survey,dotlrn_calendar,dotlrn_fs,dotlrn_members" description="see above"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_club_applets"  default="dotlrn_dotlrn,dotlrn_members,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_static,dotlrn_survey" description="the applets to add when making a new club"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_subcomm_applets"  default="dotlrn_members,dotlrn_dotlrn,dotlrn_bboard,dotlrn_calendar,dotlrn_fs,dotlrn_faq,dotlrn_news,dotlrn_static" description="see above"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	7 Apr 2002 04:19:07 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_classes">
+        <querytext>
+            select dotlrn_member_rels_approved.community_id, 
+                   dotlrn_class_instances_full.pretty_name,
+                   dotlrn_class_instances_full.url,
+                   acs_permission.permission_p(dotlrn_member_rels_approved.community_id, :user_id, 'admin') as admin_p,
+                   dotlrn_community.has_subcomm_p(dotlrn_member_rels_approved.community_id) as subcomm_p
+            from dotlrn_class_instances_full,
+                 dotlrn_member_rels_approved
+            where dotlrn_member_rels_approved.user_id = :user_id
+            and dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_clubs">
+        <querytext>
+            select dotlrn_member_rels_approved.community_id, 
+                   dotlrn_clubs_full.pretty_name,
+                   dotlrn_clubs_full.url,
+                   acs_permission.permission_p(dotlrn_member_rels_approved.community_id, :user_id, 'admin') as admin_p, 
+                   dotlrn_community.has_subcomm_p(dotlrn_member_rels_approved.community_id) as subcomm_p
+            from dotlrn_clubs_full,
+                 dotlrn_member_rels_approved
+            where dotlrn_member_rels_approved.user_id = :user_id
+            and dotlrn_member_rels_approved.community_id = dotlrn_clubs_full.club_id
+        </querytext>
+    </fullquery>
+
+</queryset>