Index: openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 22 Jan 2006 08:43:15 -0000 1.19 +++ openacs-4/packages/curriculum-central/tcl/uos-procs-postgresql.xql 2 Feb 2006 11:45:49 -0000 1.20 @@ -6,19 +6,31 @@ SELECT * - FROM cc_uos u, cc_uos_revisions r, cr_items i + FROM cc_uos u, cc_uos_revisions r, cr_items i, cc_uos_name n WHERE u.uos_id = :uos_id AND i.item_id = u.uos_id AND r.uos_revision_id = i.latest_revision + AND n.name_id = u.uos_name_id - SELECT uos_code || ' ' ||uos_name FROM cc_uos WHERE uos_id = :uos_id + SELECT n.uos_code || ' ' || n.uos_name + FROM cc_uos u, cc_uos_name n + WHERE u.uos_id = :uos_id + AND n.name_id = u.uos_name_id + + + SELECT n.uos_code || ' ' || n.uos_name AS name, n.name_id + FROM cc_uos_name n + WHERE n.package_id = :package_id + + + SELECT d.detail_id, dr.lecturer_id, dr.objectives, @@ -224,12 +236,17 @@ SELECT cc_uos_revision__new ( null, :uos_id, - :uos_code, - :uos_name, + :uos_name_id, :credit_value, + :department_id, :unit_coordinator_id, + :session_ids, + :prerequisite_ids, + :assumed_knowledge_ids, + :corequisite_ids, + :prohibition_ids, + :no_longer_offered_ids, :activity_log, - :activity_log_format, now(), :creation_user, :creation_ip