Index: openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl	14 Aug 2002 20:28:28 -0000	1.10
+++ openacs-4/packages/recruiting/tcl/dotlrn-recruiting-procs.tcl	14 Aug 2002 20:33:55 -0000	1.11
@@ -276,7 +276,7 @@
         } {
             db_1row get_recruiting_candidate {}
 
-            array set the_status [recruiting_status_type::get -status_type_id $status]
+            array set the_status [recruiting::status_type::get -status_type_id $status]
 
             set recruiting_candidate(candidate_id) $candidate_id
             set recruiting_candidate(package_id) $package_id
@@ -423,3 +423,4 @@
     }
 
 }
+
Index: openacs-4/packages/recruiting/www/edit-ratings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/edit-ratings.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/edit-ratings.tcl	14 Aug 2002 20:28:28 -0000	1.3
+++ openacs-4/packages/recruiting/www/edit-ratings.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -14,7 +14,7 @@
 set user_id [ad_verify_and_get_user_id]
 
 array set interview_info [recruiting::interview::get -interview_id $interview_id]
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 
 form create rate_sheet
 
@@ -84,3 +84,4 @@
 set context_bar [list [list "index" "Recruiting"] [list "my-completed-interviews" "My Completed Interviews"] "Edit Rate Sheet"]
 
 
+
Index: openacs-4/packages/recruiting/www/my-completed-interviews.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-completed-interviews.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/recruiting/www/my-completed-interviews.tcl	9 Aug 2002 20:30:51 -0000	1.4
+++ openacs-4/packages/recruiting/www/my-completed-interviews.tcl	14 Aug 2002 20:33:55 -0000	1.5
@@ -15,7 +15,7 @@
 ui::table::set_column_alignment interviews [list left left center center]
 db_foreach my_completed_interviews {} {
     ui::table::add_sortable_row interviews [list "$last_name, $first_name" \
-            "$location<br>Home: [recruiting_candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting_candidate::format_phone -phone_number $cell_phone]" \
+            "$location<br>Home: [recruiting::candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting::candidate::format_phone -phone_number $cell_phone]" \
             "$average_rating" \
             "$should_hire_p" \
             "(<a href=\"rating-sheet?[export_vars interview_id]\">view my ratings</a>) (<a href=edit-ratings?[export_vars {candidate_id interview_id}]>modify interview</a>)"]
@@ -31,3 +31,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/my-new-interviews.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-new-interviews.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/my-new-interviews.tcl	9 Aug 2002 20:30:51 -0000	1.3
+++ openacs-4/packages/recruiting/www/my-new-interviews.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -14,7 +14,7 @@
 ui::table::set_column_headings interviews [list "Name" "Location"]
 db_foreach my_new_interviews {} {
     ui::table::add_sortable_row interviews [list "$last_name, $first_name" \
-            "$location<br>Home: [recruiting_candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting_candidate::format_phone -phone_number $cell_phone]" \
+            "$location<br>Home: [recruiting::candidate::format_phone -phone_number $home_phone]<br>Mobile: [recruiting::candidate::format_phone -phone_number $cell_phone]" \
             "(<a href=\"rate-candidate?[export_vars {interview_id candidate_id}]\">rate this candidate</a>)"]
 } if_no_rows {
     ui::table::add_sortable_row interviews [list "You don't have any candidates to interview right now."]
@@ -27,3 +27,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/rate-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/rate-candidate.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/recruiting/www/rate-candidate.tcl	14 Aug 2002 20:28:28 -0000	1.4
+++ openacs-4/packages/recruiting/www/rate-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.5
@@ -13,7 +13,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_verify_and_get_user_id]
 
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 
 form create rate_sheet
 
@@ -76,3 +76,4 @@
 
 set context_bar [list [list "index" "Recruiting"] [list "my-new-interviews" "My New Interviews"] "One Rate Sheet"]
 
+
Index: openacs-4/packages/recruiting/www/rating-sheet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/rating-sheet.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/recruiting/www/rating-sheet.tcl	14 Aug 2002 20:28:28 -0000	1.4
+++ openacs-4/packages/recruiting/www/rating-sheet.tcl	14 Aug 2002 20:33:55 -0000	1.5
@@ -18,7 +18,7 @@
     ad_script_abort
 }
 
-array set candidate_info [recruiting_candidate::get -candidate_id $interview_info(candidate_id)]
+array set candidate_info [recruiting::candidate::get -candidate_id $interview_info(candidate_id)]
 
 set interviewer_id $interview_info(interviewer_id)
 set candidate_id $interview_info(candidate_id)
@@ -55,3 +55,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/archive-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/archive-candidate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/admin/archive-candidate.tcl	9 Aug 2002 20:30:51 -0000	1.2
+++ openacs-4/packages/recruiting/www/admin/archive-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.3
@@ -17,7 +17,7 @@
 
 if {$archive_p == "notyet"} {
     
-    array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+    array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
     
     ui::table::set_title archive "Archiving $candidate_info(first_name) $candidate_info(last_name)"
     ui::table::set_form archive [ns_conn url]
@@ -30,7 +30,7 @@
 } else {
     
     if {$archive_p == "Yes"} {
-        recruiting_candidate::archive -candidate_id $candidate_id
+        recruiting::candidate::archive -candidate_id $candidate_id
         ns_returnredirect list-candidates
     } else {
         ns_returnredirect [ns_urldecode $referrer]
@@ -41,3 +41,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl	14 Aug 2002 20:28:28 -0000	1.3
+++ openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -18,7 +18,7 @@
 
 set user_id [ad_verify_and_get_user_id]
 
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 
 set candidate_name [person::name -person_id $candidate_id]
 set url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]$package_url"
@@ -72,3 +72,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl	2 Aug 2002 18:53:56 -0000	1.2
+++ openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl	14 Aug 2002 20:33:55 -0000	1.3
@@ -12,7 +12,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_verify_and_get_user_id]
 
-array set info [recruiting_candidate::get -candidate_id $candidate_id]
+array set info [recruiting::candidate::get -candidate_id $candidate_id]
 
 form create change_status
 element create change_status status \
@@ -39,3 +39,4 @@
 set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] [list "view-one-candidate?[export_vars candidate_id]" "One Candidate"] "Change Status"]
 
 ad_return_template
+
Index: openacs-4/packages/recruiting/www/admin/delete-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-candidate.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/recruiting/www/admin/delete-candidate.tcl	9 Aug 2002 20:30:51 -0000	1.4
+++ openacs-4/packages/recruiting/www/admin/delete-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.5
@@ -17,7 +17,7 @@
 
 if {$delete_p == "notyet"} {
     
-    array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+    array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
     
     ui::table::set_title delete "Deleting $candidate_info(first_name) $candidate_info(last_name)"
     ui::table::set_form delete [ns_conn url]
@@ -30,7 +30,7 @@
 } else {
     
     if {$delete_p == "Yes"} {
-        recruiting_candidate::delete -candidate_id $candidate_id
+        recruiting::candidate::delete -candidate_id $candidate_id
         ns_returnredirect list-candidates
     } else {
         ns_returnredirect [ns_urldecode $referrer]
@@ -41,3 +41,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/delete-interview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-interview.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/admin/delete-interview.tcl	14 Aug 2002 20:28:28 -0000	1.3
+++ openacs-4/packages/recruiting/www/admin/delete-interview.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -18,7 +18,7 @@
 
 if {$delete_p == "notyet"} {
     
-    array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+    array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
     array set interview_info [recruiting::interview::get -interview_id $interview_id]
     
     ui::table::set_title delete "Deleting interview for $candidate_info(first_name) $candidate_info(last_name)"
@@ -42,3 +42,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/edit-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/edit-candidate.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/admin/edit-candidate.tcl	2 Aug 2002 18:53:56 -0000	1.3
+++ openacs-4/packages/recruiting/www/admin/edit-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -16,7 +16,7 @@
 # don't let any candidates be created (what would their
 # status type be)?
 
-array set info [recruiting_candidate::get -candidate_id $candidate_id]
+array set info [recruiting::candidate::get -candidate_id $candidate_id]
 
 form create edit_candidate
 element create edit_candidate first_name \
@@ -91,15 +91,15 @@
         -datatype text \
         -widget text \
         -html {size 14} \
-        -value [recruiting_candidate::format_phone -phone_number $info(home_phone)] \
+        -value [recruiting::candidate::format_phone -phone_number $info(home_phone)] \
         -optional
 
 element create edit_candidate cell_phone \
         -label "Mobile phone:" \
         -datatype text \
         -widget text \
         -html {size 14} \
-        -value [recruiting_candidate::format_phone -phone_number $info(cell_phone)] \
+        -value [recruiting::candidate::format_phone -phone_number $info(cell_phone)] \
         -optional
 
 element create edit_candidate email \
@@ -127,7 +127,7 @@
             home_phone cell_phone \
             email status    
     
-    recruiting_candidate::update_candidate \
+    recruiting::candidate::update_candidate \
             -candidate_id $candidate_id \
             -first_name $first_name \
             -last_name $last_name \
@@ -138,8 +138,8 @@
             -zip $zip \
             -zip_plus_four $zip_plus_four \
             -country $country \
-            -home_phone [recruiting_candidate::strip_phone -phone_number $home_phone] \
-            -cell_phone [recruiting_candidate::strip_phone -phone_number $cell_phone] \
+            -home_phone [recruiting::candidate::strip_phone -phone_number $home_phone] \
+            -cell_phone [recruiting::candidate::strip_phone -phone_number $cell_phone] \
             -email $email \
             -status $status \
             -package_id $package_id
@@ -151,3 +151,4 @@
 set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] "Edit Candidate"]
 
 ad_return_template
+
Index: openacs-4/packages/recruiting/www/admin/new-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/new-candidate.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/recruiting/www/admin/new-candidate.tcl	7 Aug 2002 23:39:19 -0000	1.5
+++ openacs-4/packages/recruiting/www/admin/new-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.6
@@ -112,7 +112,7 @@
             -first_names $first_name \
             -last_name $last_name]
 
-    recruiting_candidate::new \
+    recruiting::candidate::new \
             -candidate_id $person_id \
             -first_name $first_name \
             -last_name $last_name \
@@ -123,8 +123,8 @@
             -zip $zip \
             -zip_plus_four $zip_plus_four \
             -country $country \
-            -home_phone [recruiting_candidate::strip_phone -phone_number $home_phone] \
-            -cell_phone [recruiting_candidate::strip_phone -phone_number $cell_phone] \
+            -home_phone [recruiting::candidate::strip_phone -phone_number $home_phone] \
+            -cell_phone [recruiting::candidate::strip_phone -phone_number $cell_phone] \
             -email $email \
             -status $status
     
@@ -135,3 +135,4 @@
 set context_bar [list [list "../" "Recruiting"] [list "index" "Admin"] [list "list-candidates" "Candidates"] "New Candidate"]
 
 ad_return_template
+
Index: openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl	7 Aug 2002 23:39:19 -0000	1.1
+++ openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.2
@@ -13,6 +13,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_verify_and_get_user_id]
 
-recruiting_candidate::unarchive -candidate_id $candidate_id
+recruiting::candidate::unarchive -candidate_id $candidate_id
 
 ns_returnredirect list-archived-candidates
+
Index: openacs-4/packages/recruiting/www/admin/view-average-ratings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-average-ratings.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/admin/view-average-ratings.tcl	9 Aug 2002 20:30:51 -0000	1.2
+++ openacs-4/packages/recruiting/www/admin/view-average-ratings.tcl	14 Aug 2002 20:33:55 -0000	1.3
@@ -10,7 +10,7 @@
     candidate_id:notnull
 }
 
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 
 ui::table::set_title ratings "Average ratings for $candidate_info(first_name) $candidate_info(last_name)"
 ui::table::set_column_headings ratings [list "Criteria" "Average Rating"]
@@ -39,3 +39,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/view-comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-comments.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/recruiting/www/admin/view-comments.tcl	9 Aug 2002 20:30:51 -0000	1.2
+++ openacs-4/packages/recruiting/www/admin/view-comments.tcl	14 Aug 2002 20:33:55 -0000	1.3
@@ -13,7 +13,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_verify_and_get_user_id]
 
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 
 ui::table::set_title comments "Comments for $candidate_info(first_name) $candidate_info(last_name)"
 
@@ -27,3 +27,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl	9 Aug 2002 20:30:51 -0000	1.8
+++ openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl	14 Aug 2002 20:33:55 -0000	1.9
@@ -15,7 +15,7 @@
 
 set referrer [ns_urlencode [ns_conn url]?[export_vars candidate_id]]
 
-array set info [recruiting_candidate::get \
+array set info [recruiting::candidate::get \
         -candidate_id $candidate_id]
 
 
@@ -32,8 +32,8 @@
 ui::table::set_title candidate "Recruiting Candidate Detail"
 ui::table::add_unsorted_row candidate [list "Name:" "$info(last_name), $info(first_name)"]
 ui::table::add_unsorted_row candidate [list "Address:" "$address"]
-ui::table::add_unsorted_row candidate [list "Home Phone:" "[recruiting_candidate::format_phone -phone_number $info(home_phone)]"]
-ui::table::add_unsorted_row candidate [list "Mobile Phone:" "[recruiting_candidate::format_phone -phone_number $info(cell_phone)]"]
+ui::table::add_unsorted_row candidate [list "Home Phone:" "[recruiting::candidate::format_phone -phone_number $info(home_phone)]"]
+ui::table::add_unsorted_row candidate [list "Mobile Phone:" "[recruiting::candidate::format_phone -phone_number $info(cell_phone)]"]
 ui::table::add_unsorted_row candidate [list "Status:" "$info(status) (<a href=change-candidate-status?candidate_id=$info(candidate_id)>change status</a>)"]
 
 set possible_ratings [db_string get_num_criteria {}]
@@ -84,3 +84,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/view-ratings-by-criteria.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-ratings-by-criteria.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/recruiting/www/admin/view-ratings-by-criteria.tcl	14 Aug 2002 20:28:28 -0000	1.3
+++ openacs-4/packages/recruiting/www/admin/view-ratings-by-criteria.tcl	14 Aug 2002 20:33:55 -0000	1.4
@@ -11,7 +11,7 @@
     criteria_id:notnull
 }
 
-array set candidate_info [recruiting_candidate::get -candidate_id $candidate_id]
+array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id]
 array set criteria_info [recruiting::criteria::get -criteria_id $criteria_id]
 
 ui::table::set_title ratings "$criteria_info(criteria_name) ratings for $candidate_info(first_name) $candidate_info(last_name)"
@@ -41,3 +41,4 @@
 
 
 
+
Index: openacs-4/packages/recruiting/www/admin/view-ratings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-ratings.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/recruiting/www/admin/view-ratings.tcl	14 Aug 2002 20:28:28 -0000	1.4
+++ openacs-4/packages/recruiting/www/admin/view-ratings.tcl	14 Aug 2002 20:33:55 -0000	1.5
@@ -11,7 +11,7 @@
 }
 
 array set interview_info [recruiting::interview::get -interview_id $interview_id]
-array set candidate_info [recruiting_candidate::get -candidate_id $interview_info(candidate_id)]
+array set candidate_info [recruiting::candidate::get -candidate_id $interview_info(candidate_id)]
 
 set interviewer_id $interview_info(interviewer_id)
 set candidate_id $interview_info(candidate_id)
@@ -53,3 +53,4 @@
 
 
 
+