Index: openacs-4/contrib/packages/classified-ads/tcl/categories-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/tcl/categories-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/tcl/categories-procs-postgresql.xql	29 Jul 2003 09:10:42 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/tcl/categories-procs-postgresql.xql	30 Jul 2003 04:56:41 -0000	1.3
@@ -101,10 +101,10 @@
         <querytext>
             
 	    SELECT 
-	           attribute_name
+	           attribute_name, pretty_name
 	      FROM 
 	           acs_attributes att,
-		   ca_attribute_widget_values cawv,
+		   ca_attributes ca,
 		   (
 		            select 
                 		   subtree.keyword_id
@@ -113,11 +113,27 @@
 			       and parent.tree_sortkey between subtree.tree_sortkey and tree_right(subtree.tree_sortkey)
 		   ) keywords
 	    WHERE
-	          att.attribute_id = cawv.attribute_id
+	          att.attribute_id = ca.attribute_id
 	      AND
-	          cawv.keyword_id = keywords.keyword_id
+	          ca.keyword_id = keywords.keyword_id
 	           
         </querytext>
     </fullquery>
 
+    <fullquery name="classified-ads::categories::get_all_tree.get">
+        <querytext>
+            
+            select 
+	           repeat(:indent_pattern, (tree_level(subtree.tree_sortkey) - 2) * :indent_factor::integer) || subtree.heading AS heading,
+      		   subtree.keyword_id
+              from 
+	           cr_keywords parent, cr_keywords subtree
+             where 
+	           parent.keyword_id = :keyword_id 
+	       and 
+	           parent.tree_sortkey between subtree.tree_sortkey and tree_right(subtree.tree_sortkey)
+	           
+        </querytext>
+    </fullquery>
+
 </queryset>