Index: openacs-4/contrib/packages/simulation/tcl/simulation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/simulation-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/contrib/packages/simulation/tcl/simulation-procs.tcl	7 Jan 2004 14:46:04 -0000	1.23
+++ openacs-4/contrib/packages/simulation/tcl/simulation-procs.tcl	8 Jan 2004 16:14:04 -0000	1.24
@@ -108,32 +108,6 @@
     }
 }
 
-ad_proc simulation::get_object_options { 
-    {-content_type:required}
-} {
-    Returns a list of cr_revision.title, cr_item.item_id pairs
-    for all cr_items of the given content_type in the root
-    folder of the current package. Suitable for ad_form options for
-    select boxes.
-
-    @return [list [list cr_revision.title1 cr_item.item_id1] [list cr_revision.title2 cr_item.item_id2] ....]
-
-    @author Peter Marklund
-} {
-    set package_id [ad_conn package_id]
-    set parent_id [bcms::folder::get_id_by_package_id -package_id $package_id]
-
-    return [db_list_of_lists character_options {
-        select cr.title,
-               ci.item_id
-        from cr_items ci,
-             cr_revisions cr
-        where ci.live_revision = cr.revision_id
-        and ci.parent_id = :parent_id
-        and ci.content_type = :content_type
-    }]
-}
-
 ad_proc simulation::casting_groups {
     {-workflow_id:required}
     {-mapped_only:boolean}
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	7 Jan 2004 16:27:35 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	8 Jan 2004 16:14:04 -0000	1.10
@@ -14,7 +14,6 @@
 set page_title "Assign Characters to Roles"
 set context [list [list "." "SimInst"] $page_title]
 
-
 simulation::template::get -workflow_id $workflow_id -array sim_array
 set description $sim_array(description)
 
@@ -27,7 +26,7 @@
         }
     }
 
-set character_options [simulation::get_object_options -content_type sim_character]
+set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character]
 
 # Loop over all workflow roles and add a character select widget for each
 foreach role_id [workflow::get_roles -workflow_id $workflow_id] {
Index: openacs-4/packages/simulation/tcl/simulation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/simulation-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/simulation/tcl/simulation-procs.tcl	7 Jan 2004 14:46:04 -0000	1.23
+++ openacs-4/packages/simulation/tcl/simulation-procs.tcl	8 Jan 2004 16:14:04 -0000	1.24
@@ -108,32 +108,6 @@
     }
 }
 
-ad_proc simulation::get_object_options { 
-    {-content_type:required}
-} {
-    Returns a list of cr_revision.title, cr_item.item_id pairs
-    for all cr_items of the given content_type in the root
-    folder of the current package. Suitable for ad_form options for
-    select boxes.
-
-    @return [list [list cr_revision.title1 cr_item.item_id1] [list cr_revision.title2 cr_item.item_id2] ....]
-
-    @author Peter Marklund
-} {
-    set package_id [ad_conn package_id]
-    set parent_id [bcms::folder::get_id_by_package_id -package_id $package_id]
-
-    return [db_list_of_lists character_options {
-        select cr.title,
-               ci.item_id
-        from cr_items ci,
-             cr_revisions cr
-        where ci.live_revision = cr.revision_id
-        and ci.parent_id = :parent_id
-        and ci.content_type = :content_type
-    }]
-}
-
 ad_proc simulation::casting_groups {
     {-workflow_id:required}
     {-mapped_only:boolean}
Index: openacs-4/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/www/siminst/map-characters.tcl	7 Jan 2004 16:27:35 -0000	1.9
+++ openacs-4/packages/simulation/www/siminst/map-characters.tcl	8 Jan 2004 16:14:04 -0000	1.10
@@ -14,7 +14,6 @@
 set page_title "Assign Characters to Roles"
 set context [list [list "." "SimInst"] $page_title]
 
-
 simulation::template::get -workflow_id $workflow_id -array sim_array
 set description $sim_array(description)
 
@@ -27,7 +26,7 @@
         }
     }
 
-set character_options [simulation::get_object_options -content_type sim_character]
+set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character]
 
 # Loop over all workflow roles and add a character select widget for each
 foreach role_id [workflow::get_roles -workflow_id $workflow_id] {