Index: openacs-4/packages/curriculum-central/www/all-uos-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-view-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/all-uos-view-postgresql.xql	15 Feb 2006 11:07:35 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/all-uos-view-postgresql.xql	28 Apr 2006 06:41:27 -0000	1.2
@@ -15,9 +15,9 @@
 
    <fullquery name="units_of_study">
      <querytext>
-       SELECT map.map_id, n.uos_code, n.uos_name, uos.uos_id,
+       SELECT DISTINCT n.uos_code, n.uos_name, uos.uos_id,
            rev.year_id, y.name, rev.core_id,
-	   map.live_revision_id, uosr.session_ids
+	   uosr.session_ids
        FROM cc_uos uos, cc_uos_revisions uosr, cc_stream_uos_map map,
            cc_stream_uos_map_rev rev, cc_year y, cc_uos_name n,
 	   cc_department d
Index: openacs-4/packages/curriculum-central/www/all-uos-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/all-uos-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum-central/www/all-uos-view.tcl	16 Feb 2006 10:44:17 -0000	1.3
+++ openacs-4/packages/curriculum-central/www/all-uos-view.tcl	28 Apr 2006 06:41:27 -0000	1.4
@@ -25,20 +25,18 @@
 # Retrieve a list of Units of Study.
 set units_of_study [db_list_of_lists units_of_study {}]
 
-template::multirow create stream map_id year_id year_name \
+template::multirow create stream year_id year_name \
     session_id session_name rel_name uos_id uos_code uos_name \
     year_session_group uos_details_url
 
 foreach uos $units_of_study {
-    set map_id [lindex $uos 0]
-    set uos_code [lindex $uos 1]
-    set uos_name [lindex $uos 2]
-    set uos_id [lindex $uos 3]
-    set year_id [lindex $uos 4]
-    set year_name [lindex $uos 5]
-    set rel_id [lindex $uos 6]
-    set live_revision_id [lindex $uos 7]
-    set session_ids [lindex $uos 8]
+    set uos_code [lindex $uos 0]
+    set uos_name [lindex $uos 1]
+    set uos_id [lindex $uos 2]
+    set year_id [lindex $uos 3]
+    set year_name [lindex $uos 4]
+    set rel_id [lindex $uos 5]
+    set session_ids [lindex $uos 6]
 
     foreach session_id $session_ids {
 	
@@ -53,7 +51,7 @@
 	set rel_name [curriculum_central::stream::stream_uos_relation_name \
 			 -id $rel_id]
 
-	template::multirow append stream $map_id $year_id $year_name \
+	template::multirow append stream $year_id $year_name \
 	    $session_id $session_name $rel_name $uos_id $uos_code \
 	    $uos_name $year_session_group $uos_details_url