Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs-postgresql.xql	11 Jun 2004 21:11:53 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs-postgresql.xql	2 Jul 2004 21:17:04 -0000	1.2
@@ -12,38 +12,28 @@
     <version>7.3</version>
   </rdbms>
   
-  <fullquery name="pm::util::category_selects_helper.get_categories">
+  <fullquery name="pm::util::category_selects_not_cached.get_categories">
     <querytext>
-    select 
+    SELECT 
     t.name as cat_name, 
     t.category_id as cat_id, 
-    tm.tree_id 
-    from 
+    tm.tree_id,
+    tt.name as tree_name
+    FROM
     category_tree_map tm, 
     categories c, 
-    category_translations t 
-    where 
+    category_translations t,
+    category_tree_translations tt 
+    WHERE 
     c.tree_id      = tm.tree_id and 
     c.category_id  = t.category_id and 
     tm.object_id   = :package_id and
+    tm.tree_id = tt.tree_id and
     c.deprecated_p = 'f'
-    order 
-    by t.name
+    ORDER BY 
+    tt.name,
+    t.name
     </querytext>
   </fullquery>
-
-  <fullquery name="pm::util::category_selects_helper.get_category_trees">
-    <querytext>
-    select 
-    tt.name as tree_name, 
-    tt.tree_id 
-    from 
-    category_tree_map tm, 
-    category_tree_translations tt 
-    where 
-    tm.object_id = :package_id and 
-    tm.tree_id = tt.tree_id
-    </querytext>
-  </fullquery>
   
 </queryset>