Index: openacs-4/etc/install/dotlrn-basic-setup.test =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/dotlrn-basic-setup.test,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/dotlrn-basic-setup.test 11 Oct 2003 17:20:45 -0000 1.2 +++ openacs-4/etc/install/dotlrn-basic-setup.test 11 Oct 2003 22:12:36 -0000 1.3 @@ -39,8 +39,8 @@ ::twt::util::log "Set up class forums - one per class" ::twt::forums::add_default_forums $server_url - ::twt::util::log "Add forum postings" - ::twt::forums::add_postings + #::twt::util::log "Add forum postings" + #::twt::forums::add_postings ::twt::util::log "Add news items - one per class" ::twt::news::add_item_to_classes $server_url Index: openacs-4/etc/install/install.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v diff -u -r1.17 -r1.18 --- openacs-4/etc/install/install.sh 23 Sep 2003 20:28:12 -0000 1.17 +++ openacs-4/etc/install/install.sh 11 Oct 2003 22:12:36 -0000 1.18 @@ -359,6 +359,5 @@ echo "$0: Finished (re)installing $serverroot at $(date). Access the new site at $server_url with admin username $admin_email and password $admin_password" # Warn about errors in the HTML returned from the server - ./warn-if-installation-errors.sh `get_config_param openacs_output_file` - ./warn-if-installation-errors.sh `get_config_param openacs_packages_output_file` + ./warn-if-installation-errors.sh `get_config_param install_output_file` fi Index: openacs-4/etc/install/tcl/class-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/class-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/class-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/class-procs.tcl 11 Oct 2003 22:10:10 -0000 1.3 @@ -50,7 +50,7 @@ ad_proc ::twt::class::setup_memberships { server_url } { - foreach admin_url [get_admin_urls $server_url "Fall 2003/2004"] { + foreach admin_url [get_admin_urls $server_url "[::twt::dotlrn::current_term_pretty_name]"] { # Admin page for the class do_request "$admin_url" @@ -109,7 +109,7 @@ ad_proc ::twt::class::setup_subgroups { server_url } { - foreach admin_url [get_admin_urls $server_url "Fall 2003/2004"] { + foreach admin_url [get_admin_urls $server_url "[::twt::dotlrn::current_term_pretty_name]"] { foreach {name description policy} [subcommunity_properties_list] { @@ -145,7 +145,7 @@ ad_proc ::twt::class::add_member_applets { server_url } { - foreach admin_url [get_admin_urls $server_url "Fall 2003/2004"] { + foreach admin_url [get_admin_urls $server_url "[::twt::dotlrn::current_term_pretty_name]"] { # Only add the members applet to computing classes so that we can # demo adding it to other classes manually Index: openacs-4/etc/install/tcl/dotlrn-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/dotlrn-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/dotlrn-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/dotlrn-procs.tcl 11 Oct 2003 22:10:11 -0000 1.3 @@ -34,6 +34,10 @@ add_term $server_url "Fall" "September" "2004" "January" "2005" } +ad_proc ::twt::dotlrn::current_term_pretty_name {} { + return "Fall 2003/2004" +} + ad_proc ::twt::dotlrn::add_department { server_url pretty_name description external_url } { do_request "$server_url/dotlrn/admin/department-new" @@ -112,7 +116,7 @@ ad_proc ::twt::dotlrn::setup_classes { server_url } { - setup_classes_for_term $server_url "Fall 2003/2004" + setup_classes_for_term $server_url "[::twt::dotlrn::current_term_pretty_name]" setup_classes_for_term $server_url "Spring 2004" } Index: openacs-4/etc/install/tcl/forums-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/forums-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/forums-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/forums-procs.tcl 11 Oct 2003 22:10:11 -0000 1.3 @@ -9,7 +9,7 @@ ad_proc ::twt::forums::add_default_forums { server_url } { Adds a general forum to each class. Goes via the class admin pages. } { - foreach admin_url [::twt::class::get_admin_urls $server_url "Fall 2003/2004"] { + foreach admin_url [::twt::class::get_admin_urls $server_url "[::twt::dotlrn::current_term_pretty_name]"] { # Admin page of one class do_request $admin_url @@ -26,7 +26,14 @@ ad_proc ::twt::forums::add_postings {} { global __server_url - # Request the start page - do_request "${__server_url}/register" + # Loop over all classes + foreach forum_url [::twt::class::get_urls] { + # Create thread + # Enter thread + + # Post question + + # Post answers + } } Index: openacs-4/etc/install/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/news-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/news-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/news-procs.tcl 11 Oct 2003 22:10:11 -0000 1.3 @@ -11,7 +11,7 @@ set news_item_list [get_items] set class_counter 0 - foreach admin_url [::twt::class::get_admin_urls $server_url "Fall 2003/2004"] { + foreach admin_url [::twt::class::get_admin_urls $server_url "[::twt::dotlrn::current_term_pretty_name]"] { # We want the professor of the class to post the news item # TODO Index: openacs-4/etc/install/tcl/user-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/user-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/user-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/user-procs.tcl 11 Oct 2003 22:10:11 -0000 1.3 @@ -27,7 +27,7 @@ } { set email_list [get_users $type] - return [get_random_items_from_list $email_list $number] + return [::twt::util::get_random_items_from_list $email_list $number] } ad_proc ::twt::user::get_password { email } { Index: openacs-4/etc/install/tcl/util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/tcl/Attic/util-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/etc/install/tcl/util-procs.tcl 11 Oct 2003 17:20:21 -0000 1.2 +++ openacs-4/etc/install/tcl/util-procs.tcl 11 Oct 2003 22:10:11 -0000 1.3 @@ -157,7 +157,7 @@ puts "" puts "##############################" puts "#" - puts "# $script_name - $message" + puts "# ${script_name}: $message" puts "#" puts "##############################" puts ""