Index: openacs-4/packages/curriculum-central/tcl/stream-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/stream-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/curriculum-central/tcl/stream-procs.tcl 2 Feb 2006 11:45:49 -0000 1.6 +++ openacs-4/packages/curriculum-central/tcl/stream-procs.tcl 16 Feb 2006 10:44:17 -0000 1.7 @@ -205,18 +205,13 @@ ad_proc curriculum_central::stream::stream_uos_relation_get_options {} { - Returns a two-column list of UoS to Stream relations. The list - contains hard coded values for Core, Recommended and Elective, with - values of 0, 1, and 2 respectively. + Returns a two-column list of UoS to Stream relations. @return Returns a two-column list of UoS to Stream relations. } { - set relations [list] - lappend relations "[_ curriculum-central.core] 0" - lappend relations "[_ curriculum-central.recommended] 1" - lappend relations "[_ curriculum-central.elective] 2" + set package_id [ad_conn package_id] - return $relations + return [db_list_of_lists stream_uos_rels {}] } @@ -225,16 +220,12 @@ } { Returns the pretty name for the given relation_id. - @param id The ID that corresponds to either "Core", "Recommended", - or "Elective". + @param id The ID that corresponds to a defined stream to UoS relation + name. @see curriculum_central::stream::stream_uos_relation_get_options } { - if { $id eq 0 } { - return [_ curriculum-central.core] - } elseif { $id eq 1} { - return [_ curriculum-central.recommended] - } else { - return [_ curriculum-central.elective] - } -} \ No newline at end of file + set package_id [ad_conn package_id] + + return [db_string get_name {} -default ""] +}