Index: openacs-4/contrib/packages/classified-ads/tcl/classified-ads-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/tcl/classified-ads-procs-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/classified-ads/tcl/classified-ads-procs-postgresql.xql	31 Jul 2003 01:24:31 -0000	1.5
+++ openacs-4/contrib/packages/classified-ads/tcl/classified-ads-procs-postgresql.xql	31 Jul 2003 09:31:00 -0000	1.6
@@ -276,10 +276,14 @@
 		   aa.sort_order,
                    coalesce(aa.table_name, at.table_name) as table_name,
 	           coalesce(aa.column_name, aa.attribute_name) as column_name,
+		   cawv.widget,  cawv.label,  cawv.html_options, 
+		   cawv.extra_options, cawv.select_options,
+		   cawv.validate, cawv.optional_p, cawv.enabled_p,
 		   keywords.heading AS category_heading
 	      FROM 
 	           acs_attributes aa,
 		   ca_attributes ca,
+		   ca_attribute_widget_values cawv,
                    acs_object_types at,
 		   (
 		            select 
@@ -292,12 +296,16 @@
 	    WHERE
 	          aa.attribute_id = ca.attribute_id
 	      AND
+	          ca.attribute_id = cawv.attribute_id
+	      AND
 	          ca.keyword_id = keywords.keyword_id
 	      AND
                   aa.object_type = :content_type
 	      AND
                   at.object_type = :content_type
-            $storage_stub
+              $storage_stub
+         ORDER BY
+	          aa.sort_order asc
 
         </querytext>
     </fullquery>