Index: openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs-postgresql.xql,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	5 Feb 2004 23:57:49 -0000	1.2.2.2
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql	27 Feb 2004 22:46:13 -0000	1.2.2.3
@@ -3,16 +3,40 @@
 <queryset>
   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
   
-  <fullquery name="project_manager::project::default_status_open.get_default_status_open">
+  <fullquery name="pm::project::get_project_id.get_project_id">
     <querytext>
+      SELECT
+      live_revision
+      FROM
+      cr_items
+      WHERE
+      item_id = :project_item_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="pm::project::get_project_item_id.get_project_item">
+    <querytext>
+      SELECT
+      i.item_id
+      FROM
+      cr_items i,
+      cr_revisions r
+      WHERE
+      i.item_id = r.item_id and
+      r.revision_id = :project_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="pm::project::default_status_open.get_default_status_open">
+    <querytext>
       select status_id 
       from pm_project_status 
       where status_type = 'o'
       limit 1
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::default_status_closed.get_default_status_closed">
+  <fullquery name="pm::project::default_status_closed.get_default_status_closed">
     <querytext>
       select status_id 
       from pm_project_status 
@@ -21,7 +45,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::new.new_project_item">
+  <fullquery name="pm::project::new.new_project_item">
     <querytext>
         select pm_project__new_project_item (
                 :project_name,
@@ -44,7 +68,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.select_project_children">
+  <fullquery name="pm::project::compute_status.select_project_children">
     <querytext>
         select
         item_id, 
@@ -55,7 +79,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.tasks_group_query">
+  <fullquery name="pm::project::compute_status.tasks_group_query">
     <querytext>
         select
         sum(t.actual_hours_worked) as actual_hours_completed,
@@ -69,7 +93,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.tasks_query">
+  <fullquery name="pm::project::compute_status.tasks_query">
     <querytext>
         select
         t.actual_hours_worked as worked,
@@ -84,7 +108,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.dependency_query">
+  <fullquery name="pm::project::compute_status.dependency_query">
     <querytext>
         select
         d.dependency_id,
@@ -98,33 +122,34 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.project_info">
+  <fullquery name="pm::project::compute_status.project_info">
     <querytext>
         select
         to_char(planned_start_date,'J') as start_date_j,
-        to_char(planned_end_date,'J') as end_date_j
+        to_char(planned_end_date,'J') as end_date_j,
+        ongoing_p
         from         
         pm_projects 
         where
         project_id = (select live_revision from cr_items where item_id = :project_item_id)
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.update_project">
+  <fullquery name="pm::project::compute_status.update_project">
     <querytext>
         update
         pm_projects
         set 
         actual_hours_completed = :actual_hours_completed,
         estimated_hours_total  = :estimated_hours_total,
-        earliest_finish_date   = 'J[expr floor([set max_earliest_finish])]',
-        latest_finish_date     = 'J[expr  ceil([set min_latest_start])]'
+        earliest_finish_date   = :max_earliest_finish,
+        latest_finish_date     = :min_latest_start
         where
         project_id = (select live_revision from cr_items where item_id = :project_item_id)
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_parent_status.get_parent_id">
+  <fullquery name="pm::project::compute_parent_status.get_parent_id">
     <querytext>
         select
         parent_id
@@ -135,21 +160,21 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_parent_status.get_root_folder">
+  <fullquery name="pm::project::compute_parent_status.get_root_folder">
     <querytext>
         select pm_project__get_root_folder (:package_id, 'f')
     </querytext>
   </fullquery>
 
-  <fullquery name="project_manager::project::compute_status.update_task">
+  <fullquery name="pm::project::compute_status.update_task">
     <querytext>
         update
         pm_tasks_revisions
         set 
-        earliest_start  = 'J[expr ceil( [set earliest_start($task_item)])]',
-        earliest_finish = 'J[expr ceil( [set earliest_finish($task_item)])]',
-        latest_start    = 'J[expr floor([set latest_start($task_item)])]',
-        latest_finish   = 'J[expr floor([set latest_finish($task_item)])]'
+        earliest_start  = :es,
+        earliest_finish = :ef,
+        latest_start    = :ls,
+        latest_finish   = :lf
         where
         task_revision_id = (select live_revision from cr_items where item_id = :task_item)
     </querytext>