Index: openacs-4/contrib/packages/project-manager/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-oracle.xql,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/project-manager/www/index-oracle.xql	22 Oct 2004 04:28:37 -0000	1.1.2.1
+++ openacs-4/contrib/packages/project-manager/www/index-oracle.xql	26 Oct 2004 02:58:47 -0000	1.1.2.2
@@ -4,7 +4,7 @@
 
   <fullquery name="project_folders">
     <querytext>
-        SELECT 
+        SELECT
         p.item_id as project_item_id,
         p.project_id,
         p.parent_id as folder_id,
@@ -14,10 +14,8 @@
         to_char(p.planned_start_date, 'MM/DD/YY') as planned_start_date,
         to_char(p.planned_end_date, 'MM/DD/YY') as planned_end_date,
         p.ongoing_p,
-        om.category_id,
-        (select t.name 
-         from categories ctg 
-         where ctg.deprecated_p = 'f' and om.category_id = t.category_id) category_name,
+        c.category_id,
+        c.category_name,
         p.earliest_finish_date - sysdate as days_to_earliest_finish,
         p.latest_finish_date - sysdate as days_to_latest_finish,
         p.actual_hours_completed,
@@ -28,19 +26,30 @@
         case when o.name is null then '--no customer--' else o.name
                 end as customer_name,
         o.organization_id as customer_id
-        FROM pm_projectsx p ,
-             pm_project_assignment pa , 
-             organizations o,
-             category_object_map om ,
-             cr_items i, 
-             pm_project_status s ,
-             category_translations t
-        WHERE p.item_id = pa.project_id (+) and 
-              p.customer_id = o.organization_id (+) and 
-              p.item_id = om.object_id (+) and 
-              om.category_id = t.category_id(+) and 
-              p.project_id = i.live_revision and
-              s.status_id           = p.status_id
+        FROM pm_projectsx p 
+             LEFT JOIN pm_project_assignment pa 
+                ON p.item_id = pa.project_id
+             LEFT JOIN organizations o ON p.customer_id =
+                o.organization_id 
+             LEFT JOIN (
+                        select 
+                        om.category_id, 
+                        om.object_id, 
+                        t.name as category_name 
+                        from 
+                        category_object_map om, 
+                        category_translations t, 
+                        categories ctg 
+                        where 
+                        om.category_id = t.category_id and 
+                        ctg.category_id = t.category_id and 
+                        ctg.deprecated_p = 'f')
+                 c ON p.item_id = c.object_id, 
+        cr_items i, 
+        pm_project_status s
+        WHERE 
+        p.project_id = i.live_revision and
+        s.status_id           = p.status_id
         [template::list::filter_where_clauses -and -name projects]
         [template::list::orderby_clause -orderby -name projects]
     </querytext>