Index: openacs-4/packages/ams/tcl/ams-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs-postgresql.xql,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/ams/tcl/ams-procs-postgresql.xql	31 Jan 2006 00:54:50 -0000	1.19
+++ openacs-4/packages/ams/tcl/ams-procs-postgresql.xql	1 Feb 2006 01:07:37 -0000	1.20
@@ -139,7 +139,7 @@
         where 
 		alam.attribute_id = aa.attribute_id
         	and alam.list_id in ($list_ids)
-     		order by alam.sort_order
+        $orderby_clause
   </querytext>
 </fullquery>
 
@@ -175,7 +175,7 @@
         where 
 		alam.attribute_id = aa.attribute_id
          	and alam.list_id in ($list_ids)
-        order by alam.sort_order
+        $orderby_clause
   </querytext>
 </fullquery>
   
Index: openacs-4/packages/ams/tcl/ams-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/ams/tcl/ams-procs.tcl	31 Jan 2006 00:52:08 -0000	1.38
+++ openacs-4/packages/ams/tcl/ams-procs.tcl	1 Feb 2006 01:07:37 -0000	1.39
@@ -382,6 +382,7 @@
     }
     
     # To use in the query
+    set orderby_clause [ams::util::orderby_clause -list_ids $list_ids]
     set list_ids [template::util::tcl_to_sql_list $list_ids]
     set element_list ""
     if { [exists_and_not_null key] } {
@@ -477,7 +478,26 @@
     }
 }
 
+ad_proc -private ams::util::orderby_clause {
+    {-list_ids ""}
+} {
+    this gets and sql orderby clause for attributes and lists
+} {
+    if { [llength $list_ids] <= "1" } {
+	set orderby "order by alam.sort_order"
+    } else {
+	set orderby "order by CASE "
+	set count 0
+	foreach list_id $list_ids {
+	    append orderby "\n      WHEN alam.list_id = $list_id THEN $count "
+	    incr count
+	}
+	append orderby " END, alam.sort_order"
+    }
+    return $orderby
+}
 
+
 ad_proc -public ams::values_not_cached {
     -package_key:required
     -object_type:required
@@ -511,6 +531,7 @@
     }
 
     # To use in the query
+    set orderby_clause [ams::util::orderby_clause -list_ids $list_ids]
     set list_ids [template::util::tcl_to_sql_list $list_ids]
 
     if { [exists_and_not_null list_ids] } {