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.12 -r1.13
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl	29 Nov 2001 05:10:36 -0000	1.12
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl	30 Nov 2001 03:41:17 -0000	1.13
@@ -20,102 +20,57 @@
 
     ad_proc -public new {
 	{-description ""}
-	name
-	pretty_name
+	{-class_key:required}
+	{-pretty_name:required}
+	{-parent_type "dotlrn_class_instance"}
     } {
 	Creates a new class, like "Structure and Interpretation of Computer Programs."
 	The return value is the short class name, a key that works in SQL, and that uniquely
 	identifies the class.
 
 	This class can then be instantiated for a particular semester.
     } {
-	set parent_node_id [ad_conn -get node_id]
-
-	set group_type_name "dotlrn_class_$name"
-
 	db_transaction {
-	    # Create the class directly using PL/SQL API
-	    set class_group_type_key [db_exec_plsql create_class {}]
+	    # create the community type
+	    set class_key [dotlrn_community::new_type \
+		    -description $description \
+		    -community_type_key $class_key \
+		    -parent_type $parent_type \
+		    -pretty_name $pretty_name]
 
-	    # Create a new group type for that class
-	    # OLD STUFF (not relevant with PL/SQL API)
-	    # set class_group_type_key [group_type::new -group_type $group_type_name -supertype $top_group_type $pretty_name $pretty_name]
-	    
-	    # Instantiate the DOTLRN Class Manager package at that node
-	    set result [site_node_mount_application -return "package_id,node_id" $parent_node_id $name [package_key] $name]
-	    set package_id [lindex $result 0]
-	    set node_id [lindex $result 1]
-
-	    # Set some parameters
-	    ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-	    ad_parameter -package_id $package_id -set 1 community_type_level_p
-	    ad_parameter -package_id $package_id -set 0 community_level_p
-
-	    # Old stuff
-	    # dotlrn_community::new_type $class_group_type_key dotlrn_class $pretty_name
-
-	    # Set the site node
-	    dotlrn_community::set_type_package_id $class_group_type_key $package_id
-
-	    # insert the class into the DB
-	    # ALREADY DONE by PL/SQL API
-	    # db_dml insert_class {}
+	    # insert the class row (this would be much easier if object types were objects, too - ben)
+	    db_dml insert_class {}
 	}
-
-	return $class_group_type_key
     }
 
-
     ad_proc -public new_instance {
 	{-description ""}
-	class_type
-	class_name
-	term
-	year
+	{-class_type:required}
+	{-class_name:required}
+	{-term:required}
+	{-year:required}
     } {
 	Creates a new instance of a class for a particular term and year,
 	and returns the class instance key.
     } {
-	set short_name "$class_type-$term-$year"
+	set term [string trim $term]
+	set year [string trim $year]
 
-	db_transaction {
-	    # the user_id is needed to set the perms on the portals - aks
-	    set user_id [ad_conn user_id]
-	    
-	    # Create portal template page
-	    append foo $class_name " portal template"
-	    set portal_template_id [portal::create -portal_template_p "t" -name $foo $user_id ]
+	set community_key "$class_type-$term-$year"
 
-	    # Create the non-member page
-	    append bar $class_name " non-member portal"
-	    set page_id [portal::create -name $bar  -template_id $portal_template_id  $user_id]
-
-	    # Insert the class instance
-	    set community_id [db_exec_plsql create_class_instance {}]
-	    
-	    # Set up the rel segments
-	    dotlrn_community::create_rel_segments -community_id $community_id
-
-	    # Set up the node
-	    # THIS IS WRONG: the parent_node_id is the node of the class_type
-	    # set parent_node_id [ad_conn -get node_id]
-	    # So instead we DO THIS:
-	    set parent_node_id [db_string select_parent_node_id {}]
-	    
-	    # Instantiate the right package at that site node, probably portals
-	    set package_id [site_node_mount_application -return "package_id" $parent_node_id $short_name [one_class_package_key] $short_name]
-
-	    # Set the right parameters
-	    ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-	    ad_parameter -package_id $package_id -set 0 community_type_level_p
-	    ad_parameter -package_id $package_id -set 1 community_level_p
-	    
-	    # Set up the node
-	    dotlrn_community::set_package_id $community_id $package_id
-	    
-	    # Assign proper permissions to the site node
-	    # NOT CERTAIN what to do here yet
-	}
+	set extra_vars [ns_set create]
+	ns_set put $extra_vars year $year
+	ns_set put $extra_vars term $term
+	ns_set put $extra_vars class_key $class_type
+	
+	# Create the community
+	return [dotlrn_community::new \
+		-description $description \
+		-community_type $class_type \
+		-object_type dotlrn_class_instance \
+		-community_key $community_key \
+		-pretty_name $class_name \
+		-extra_vars $extra_vars]
     }
 
     ad_proc -public available_roles {