Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/dotlrn.info	20 Sep 2001 21:04:56 -0000	1.2
+++ openacs-4/packages/dotlrn/dotlrn.info	3 Oct 2001 21:10:57 -0000	1.3
@@ -1,36 +1,47 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
 <package key="dotlrn" url="http://software.openforce.net/openacs/packages/dotlrn/" type="apm_application">
     <package-name>dotLRN</package-name>
     <pretty-plural>dotLRN</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="1.0" url="http://software.openforce.net/openacs/packages/dotlrn/dotlrn">
+    <version name="1.0" url="http://software.openforce.net/openacs/packages/dotlrn">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:dotlrn@openforce.net">OpenForce dotLRN</owner>
-        <summary>An Education Management tool</summary>
-        <release-date>2001-10-01</release-date>
+        <summary>A Course Management System</summary>
+        <release-date>2001-10-03</release-date>
         <vendor url="http://openforce.net/">OpenForce</vendor>
-        <description format="text/html">Class Management</description>
+        <description format="text/html">Course Management</description>
 
         <provides url="dotlrn" version="1.0"/>
         <requires url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.1"/>
+        <requires url="acs-service-contract" version="4.2"/>
         <requires url="acs-subsite" version="4.2"/>
         <requires url="acs-tcl" version="4.1"/>
+        <requires url="acs-templating" version="4.1.2"/>
+        <requires url="new-portal" version="0.1a"/>
 
         <files>
             <file type="package_spec" path="dotlrn.info"/>
+            <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-clubs-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-communities-create.sql"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-init.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/dotlrn-create.sql"/>
+            <file type="tcl_procs" path="tcl/applets-procs.tcl"/>
             <file type="tcl_procs" path="tcl/class-applets-procs.tcl"/>
             <file type="tcl_procs" path="tcl/class-procs.tcl"/>
             <file type="query_file" path="tcl/class-procs.xql"/>
+            <file type="tcl_procs" path="tcl/community-procs.tcl"/>
+            <file type="query_file" path="tcl/community-procs.xql"/>
             <file type="tcl_util" path="tcl/dotlrn-filter.tcl"/>
             <file type="tcl_init" path="tcl/dotlrn-init.tcl"/>
             <file type="query_file" db_type="oracle" path="tcl/dotlrn-procs-oracle.xql"/>
@@ -51,9 +62,9 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="dotlrn_level_p"  description="Whether this is the top-level instantiation of the DotLRN package"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_type_level_p"  description="Whether this is a Class Level instance of the package"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_level_p"  description="Whether this is a Class Instance Level instantiation of the package"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="group_type_key"  description="Class Group Type"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_group_type_key"  description="Class Group Type"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="club_group_type_key"  description="Class Group Type"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="group_type_key"  default="dotlrn_community" description="Class Group Type"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_group_type_key"  default="dotlrn_class" description="Class Group Type"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="club_group_type_key"  default="dotlrn_club" description="Class Group Type"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-applet-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-applet-sc-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-applet-sc-create.sql	3 Oct 2001 01:56:53 -0000	1.1
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-applet-sc-create.sql	3 Oct 2001 21:10:59 -0000	1.2
@@ -14,10 +14,10 @@
 -- This is the service contract for dotLRN components
 
 declare
-	sc_dotlrn_contract	integer;
-	foo			integer;
+	sc_dotlrn_contract integer;
+	foo integer;
 begin
-	sc_dotlrn_contract := acs_sc_contract.new(
+	sc_dotlrn_contract := acs_sc_contract.new (
 		  contract_name => 'dotLRN_Applet',
 		  contract_desc => 'dotLRN Applet implement a specific interface'
 	);
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-communities-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql	3 Oct 2001 01:56:53 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-communities-create.sql	3 Oct 2001 21:10:59 -0000	1.3
@@ -50,7 +50,7 @@
        user_id				  integer not null
 					  constraint dlrn_comm_mem_user_id_fk references users(user_id),
        page_id				  integer not null
-					  -- constraint pointing to NPP
+					  constraint dlrn_comm_mem_page_id_fk references portals(portal_id)
 );					  
 
 
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql	20 Sep 2001 18:54:51 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql	3 Oct 2001 21:10:59 -0000	1.3
@@ -13,3 +13,6 @@
 @dotlrn-communities-create.sql
 @dotlrn-clubs-create.sql
 @dotlrn-classes-create.sql
+@dotlrn-applet-sc-create.sql
+@dotlrn-init.sql
+
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	30 Sep 2001 20:08:47 -0000	1.1
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	3 Oct 2001 21:10:59 -0000	1.2
@@ -13,8 +13,8 @@
 
 
 declare
-	year_attr_id acs_attributes.attribute_id$TYPE;
-	term_attr_id acs_attributes.attribute_id$TYPE;
+	year_attr_id acs_attributes.attribute_id%TYPE;
+	term_attr_id acs_attributes.attribute_id%TYPE;
 begin
 	-- create the major group types
 	acs_object_type.create_type (
@@ -24,7 +24,7 @@
 	  pretty_plural => 'dotLRN Communities',
 	  table_name => 'dotlrn_communities',
 	  id_column => 'community_id',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_community',
 	  type_extension_table => 'dotlrn_community_types',
 	  name_method => 'acs_group.name'
 	);
@@ -36,7 +36,7 @@
 	  pretty_plural => 'dotLRN Clubs',
 	  table_name => 'dotlrn_clubs',
 	  id_column => 'club_id',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_club',
 	  name_method => 'acs_group.name'
 	);
 
@@ -45,12 +45,13 @@
 	  object_type => 'dotlrn_class',
 	  pretty_name => 'dotLRN Class',
 	  pretty_plural => 'dotLRN Classes',
-	  table_name => 'dotlrn_classes',
-	  id_column => 'class_id',
-	  package_name => 'dotlrn',
+	  table_name => 'dotlrn_class_instances',
+	  id_column => 'class_instance_id',
+	  package_name => 'dotlrn_class',
 	  name_method => 'acs_group.name'
 	);
 
+
 	-- year attribute
 	year_attr_id:= acs_attribute.create_attribute (
 	  object_type => 'dotlrn_class',
@@ -85,7 +86,9 @@
 	  supertype => 'membership_rel',
 	  pretty_name => 'Administration Relation',
 	  pretty_plural => 'Administration Relationships',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_admin_rel',
+	  table_name => 'dotlrn_admin_rel',
+	  id_column => 'XXX',
 	  object_type_one => 'dotlrn_community', role_one => NULL,
 	  min_n_rels_one => 0, max_n_rels_one => null,
 	  object_type_two => 'party', role_two => 'admin',
@@ -97,7 +100,9 @@
 	  supertype => 'admin_rel',
 	  pretty_name => 'Instructor Relation',
 	  pretty_plural => 'Instructor Relationships',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_instructor_rel',
+	  table_name => 'dotlrn_instructor_rel',
+	  id_column => 'XXX',
 	  object_type_one => 'dotlrn_class', role_one => NULL,
 	  min_n_rels_one => 0, max_n_rels_one => null,
 	  object_type_two => 'party', role_two => 'instructor',
@@ -109,7 +114,9 @@
 	  supertype => 'admin_rel',
 	  pretty_name => 'TA Relation',
 	  pretty_plural => 'TA Relationships',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_ta_rel',
+	  table_name => 'dotlrn_ta_rel',
+	  id_column => 'XXX',
 	  object_type_one => 'dotlrn_class', role_one => NULL,
 	  min_n_rels_one => 0, max_n_rels_one => null,
 	  object_type_two => 'party', role_two => 'teaching_assistant',
@@ -121,12 +128,46 @@
 	  supertype => 'membership_rel',
 	  pretty_name => 'Student Relation',
 	  pretty_plural => 'Student Relationships',
-	  package_name => 'dotlrn',
+	  package_name => 'dotlrn_student_rel',
+	  table_name => 'dotlrn_student_rel',
+	  id_column => 'XXX',
 	  object_type_one => 'dotlrn_class', role_one => NULL,
 	  min_n_rels_one => 0, max_n_rels_one => null,
 	  object_type_two => 'party', role_two => 'student',
 	  min_n_rels_two => 0, max_n_rels_two => null
 	);
+
+	-- add permissible stuff
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_class', 'admin_rel');
+
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_club', 'admin_rel');
+
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_club', 'membership_rel');
+
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_class', 'student_rel');
+
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_class', 'instructor_rel');
+
+	insert into group_type_rels
+	(group_rel_type_id, group_type, rel_type)
+	values
+	(acs_object_id_seq.nextval, 'dotlrn_class', 'ta_rel');
+
 	
 end;
 /
Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl	3 Oct 2001 01:56:56 -0000	1.3
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl	3 Oct 2001 21:11:00 -0000	1.4
@@ -55,6 +55,8 @@
 	    # insert the class into the DB
 	    db_dml insert_class {}
 	}
+
+	return $class_group_type_key
     }
 
 
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	3 Oct 2001 01:56:56 -0000	1.2
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	3 Oct 2001 21:11:00 -0000	1.3
@@ -175,7 +175,7 @@
     } {
 	foreach applet [list_applets] {
 	    # Callback on applet
-	    acs_sc_call dotlrn $op $list_args $applet
+	    acs_sc_call dotLRN_Applet $op $list_args $applet
 	}
     }
 
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	30 Sep 2001 20:08:47 -0000	1.3
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	3 Oct 2001 21:11:00 -0000	1.4
@@ -18,6 +18,13 @@
 
 namespace eval dotlrn {
 
+    ad_proc -public class_group_type_key {
+    } {
+	Returns the group type key used for class groups
+    } {
+	return [ad_parameter class_group_type_key]
+    }
+
     ad_proc -public group_type_key {
     } {
 	Returns the group_type key that is being used for class management
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/index.tcl	20 Sep 2001 18:29:35 -0000	1.1
+++ openacs-4/packages/dotlrn/www/index.tcl	3 Oct 2001 21:11:02 -0000	1.2
@@ -9,10 +9,7 @@
     classes:multirow
 }
 
-# Temporary Hack to make sure things are installed
-dotlrn::install
-
 # Select the classes that exist
-db_multirow classes select_classes {}
+db_multirow communities select_communities {}
 
 ad_return_template