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.1 -r1.2
--- openacs-4/etc/install/tcl/dotlrn-procs.tcl	11 Oct 2003 13:43:46 -0000	1.1
+++ openacs-4/etc/install/tcl/dotlrn-procs.tcl	11 Oct 2003 17:20:21 -0000	1.2
@@ -5,9 +5,9 @@
 # 
 # @author Peter Marklund
 
-namespace eval twt::dotlrn {}
+namespace eval ::twt::dotlrn {}
 
-ad_proc twt::dotlrn::add_term { server_url term_name start_month start_year end_month end_year } {
+ad_proc ::twt::dotlrn::add_term { server_url term_name start_month start_year end_month end_year } {
 
     do_request "$server_url/dotlrn/admin/term-new"
     form find ~n add_term
@@ -27,14 +27,14 @@
     form submit
 }
 
-ad_proc twt::dotlrn::setup_terms { server_url } {
+ad_proc ::twt::dotlrn::setup_terms { server_url } {
 
-    dotlrn::add_term $server_url "Fall" "September" "2003" "January" "2004"    
-    dotlrn::add_term $server_url "Spring" "January" "2004" "July" "2004"
-    dotlrn::add_term $server_url "Fall" "September" "2004" "January" "2005"    
+    add_term $server_url "Fall" "September" "2003" "January" "2004"    
+    add_term $server_url "Spring" "January" "2004" "July" "2004"
+    add_term $server_url "Fall" "September" "2004" "January" "2005"    
 }
 
-ad_proc twt::dotlrn::add_department { server_url pretty_name description external_url } {
+ad_proc ::twt::dotlrn::add_department { server_url pretty_name description external_url } {
 
     do_request "$server_url/dotlrn/admin/department-new"
     form find ~n add_department
@@ -48,26 +48,26 @@
     form submit
 }
 
-ad_proc twt::dotlrn::setup_departments { server_url } {
+ad_proc ::twt::dotlrn::setup_departments { server_url } {
 
-    dotlrn::add_department $server_url "Mathematics" \
+    add_department $server_url "Mathematics" \
 	                       "The Faculty of Mathematics consists of the Department of Applied Mathematics & Theoretical Physics (DAMTP) and the Department of Pure Mathematics & Mathematical Statistics (DPMMS). The  Statistical Laboratory is a sub-department of the DPMMS. Also located within the University of Cambridge is the Isaac Newton Institute for Mathematical Sciences." \
 			       "http://www.maths.cam.ac.uk/"
 
-    dotlrn::add_department $server_url "Computer Science" \
+    add_department $server_url "Computer Science" \
 	                       "The Computer Laboratory is the Computer Science department of the University of Cambridge. The University Computing Service has a separate set of web pages." \
 			       "http://www.cl.cam.ac.uk/"
 
-    dotlrn::add_department $server_url "Architecture" \
+    add_department $server_url "Architecture" \
 	                       "Because of the great diversity of offerings in the College of Environmental Design and in the Department of Architecture in areas such as building environments, practice of design, design methods, structures and construction, history, social and cultural factors in design, and design itself, it is possible to obtain either a very broad and general foundation or to concentrate in one or several areas." \
 	                       "http://arch.ced.berkeley.edu/"
 
-    dotlrn::add_department $server_url "Business Administration" \
+    add_department $server_url "Business Administration" \
                                "The department offers a range of courses in Business Administration, Finance, and Law" \
                                "http://mitsloan.mit.edu/"
 }
 
-ad_proc twt::dotlrn::add_subject { server_url department_pretty_name pretty_name description } {
+ad_proc ::twt::dotlrn::add_subject { server_url department_pretty_name pretty_name description } {
 
     do_request "$server_url/dotlrn/admin/class-new"
 
@@ -82,43 +82,43 @@
     form submit
 }
 
-ad_proc twt::setup_subjects { server_url } {
+ad_proc ::twt::dotlrn::setup_subjects { server_url } {
 
     # Mathematics Department
-    dotlrn::add_subject $server_url "Mathematics" "Differential Geometry" " An introduction to differential geometry with applications to general relativity. Metrics, Lie bracket, connections, geodesics, tensors, intrinsic and extrinsic curvature are studied on abstractly defined manifolds using coordinate charts. Curves and surfaces in three dimensions are studied as important special cases. Gauss-Bonnet theorem for surfaces and selected introductory topics in special and general relativity are also studied. 18.100 is required, 18.101 is strongly recommended, and 18.901 would be helpful."
+    add_subject $server_url "Mathematics" "Differential Geometry" " An introduction to differential geometry with applications to general relativity. Metrics, Lie bracket, connections, geodesics, tensors, intrinsic and extrinsic curvature are studied on abstractly defined manifolds using coordinate charts. Curves and surfaces in three dimensions are studied as important special cases. Gauss-Bonnet theorem for surfaces and selected introductory topics in special and general relativity are also studied. 18.100 is required, 18.101 is strongly recommended, and 18.901 would be helpful."
 
     # Computer Science department
-    dotlrn::add_subject $server_url "Computer Science" "Peer to Peer Computing" "The term peer-to-peer (P2P) refers to a class of systems and applications that employ distributed resources to perform a critical function in a decentralized manner..."
+    add_subject $server_url "Computer Science" "Peer to Peer Computing" "The term peer-to-peer (P2P) refers to a class of systems and applications that employ distributed resources to perform a critical function in a decentralized manner..."
 
-    dotlrn::add_subject $server_url "Computer Science" "Advanced Topics in Programming Languages" "This course focuses on bioinformatics applications, high-performance computing, and the application of high-performance computing to bioinformatics applications."
+    add_subject $server_url "Computer Science" "Advanced Topics in Programming Languages" "This course focuses on bioinformatics applications, high-performance computing, and the application of high-performance computing to bioinformatics applications."
 
-    dotlrn::add_subject $server_url "Computer Science" "Computer and Network Security" "This class serves as an introduction to information systems security and covers security issues at an undergraduate level"
+    add_subject $server_url "Computer Science" "Computer and Network Security" "This class serves as an introduction to information systems security and covers security issues at an undergraduate level"
 
     # Architecture Department
-    dotlrn::add_subject $server_url "Architecture" "Architecture and Culture" "Selected examples of architecture and interior design are used as case studies to illustrate the presence of ideas in built matter. A range of projects are analysed and discussed in terms of the conceptual qualities that underpin the physical manifestations of architecture and interior design."
+    add_subject $server_url "Architecture" "Architecture and Culture" "Selected examples of architecture and interior design are used as case studies to illustrate the presence of ideas in built matter. A range of projects are analysed and discussed in terms of the conceptual qualities that underpin the physical manifestations of architecture and interior design."
 
     # Business Administration Department
-    dotlrn::add_subject $server_url "Business Administration" "Economic Analysis for Business Decisions" " Introduces students to principles of microeconomic analysis used in managerial decision making. Topics include demand analysis, cost and production functions, the behavior of competitive and non-competitive markets, sources and uses of market power, and game theory and competitive strategy, with applications to various business and public policy decisions. Antitrust policy and other government regulations are also discussed. 15.010 restricted to first-year Sloan masters students. 15.011 primarily for non-Sloan School students."
+    add_subject $server_url "Business Administration" "Economic Analysis for Business Decisions" " Introduces students to principles of microeconomic analysis used in managerial decision making. Topics include demand analysis, cost and production functions, the behavior of competitive and non-competitive markets, sources and uses of market power, and game theory and competitive strategy, with applications to various business and public policy decisions. Antitrust policy and other government regulations are also discussed. 15.010 restricted to first-year Sloan masters students. 15.011 primarily for non-Sloan School students."
 
-    dotlrn::add_subject $server_url "Business Administration" "Organizational Psychology & Sociology" "Organizations are changing rapidly. To deal with these changes requires new skills and attitudes on the part of managers. The goal of the OPS course is to make you aware of this challenge and equip you to better meet it. In short, the purpose is to acquaint you with some of psychological and sociological phenomena that regularly occur in organizations - the less visible forces that influence employee and managerial behavior.  The aim is to increase your understanding of these forces -- in yourself and in others -- so that as they become more visible, they become manageable (more or less) and hence subject to analysis and choice."
+    add_subject $server_url "Business Administration" "Organizational Psychology & Sociology" "Organizations are changing rapidly. To deal with these changes requires new skills and attitudes on the part of managers. The goal of the OPS course is to make you aware of this challenge and equip you to better meet it. In short, the purpose is to acquaint you with some of psychological and sociological phenomena that regularly occur in organizations - the less visible forces that influence employee and managerial behavior.  The aim is to increase your understanding of these forces -- in yourself and in others -- so that as they become more visible, they become manageable (more or less) and hence subject to analysis and choice."
 
-    dotlrn::add_subject $server_url "Business Administration" "Advanced Corporate Finance" "The primary objective of the advanced corporate finance course is to conduct an in-depth analysis of special topics of interest to corporate finance managers.  Our attempt will be to obtain a detailed understanding of the motives and reasons that lead to certain corporate decisions specifically in relation to the following issues: Mergers and Acquisitions, Corporate Restructurings, Corporate Bankruptcy, Corporate Governance"
+    add_subject $server_url "Business Administration" "Advanced Corporate Finance" "The primary objective of the advanced corporate finance course is to conduct an in-depth analysis of special topics of interest to corporate finance managers.  Our attempt will be to obtain a detailed understanding of the motives and reasons that lead to certain corporate decisions specifically in relation to the following issues: Mergers and Acquisitions, Corporate Restructurings, Corporate Bankruptcy, Corporate Governance"
 }
 
-ad_proc twt::dotlrn::get_class_add_urls { server_url } {
+ad_proc ::twt::dotlrn::get_class_add_urls { server_url } {
 
-    return [util::get_url_list $server_url "$server_url/dotlrn/admin/classes" "class-instance-new"]
+    return [::twt::util::get_url_list $server_url "$server_url/dotlrn/admin/classes" "class-instance-new"]
 }
 
-ad_proc twt::dotlrn::setup_classes { server_url } {
+ad_proc ::twt::dotlrn::setup_classes { server_url } {
 
-    dotlrn::setup_classes_for_term $server_url "Fall 2003/2004"
-    dotlrn::setup_classes_for_term $server_url "Spring 2004"
+    setup_classes_for_term $server_url "Fall 2003/2004"
+    setup_classes_for_term $server_url "Spring 2004"
 }
 
-ad_proc twt::dotlrn::setup_classes_for_term { server_url term_name } {
+ad_proc ::twt::dotlrn::setup_classes_for_term { server_url term_name } {
 
-    foreach link [dotlrn::get_class_add_urls $server_url] {
+    foreach link [get_class_add_urls $server_url] {
 
         do_request $link
         form find ~n "add_class_instance"
@@ -132,15 +132,15 @@
     }
 }
 
-ad_proc twt::dotlrn::setup_communities { server_url } {
+ad_proc ::twt::dotlrn::setup_communities { server_url } {
 
     add_community $server_url "Tennis Club" "Community for the university tennis club with tournaments and other events, also helps you find people to play with." "Open"
     add_community $server_url "Business Alumni Class of 1997" "Alumni community for the Business Administration graduates from the class of 1997." "Closed"
     add_community $server_url "Business Administration Program" "Community for all students following the Business Administration Program" "Closed"
     add_community $server_url "Star Trek Fan Club" "Community for die-hard fans of Star Trek" "Needs Approval"
 }
 
-ad_proc twt::dotlrn::add_community { server_url name description policy } {
+ad_proc ::twt::dotlrn::add_community { server_url name description policy } {
     
     do_request "${server_url}/dotlrn/admin/club-new"    
 
@@ -156,7 +156,7 @@
     form submit
 }
 
-ad_proc twt::dotlrn::add_site_wide_admin { server_url } {
+ad_proc ::twt::dotlrn::add_site_wide_admin { server_url } {
 
     global __admin_last_name