Index: openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/tasks-chunk-postgresql.xql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	12 Aug 2004 17:46:41 -0000	1.10
+++ openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql	30 Aug 2004 13:04:32 -0000	1.11
@@ -10,18 +10,19 @@
 		to_char(et.due_date,'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, 
 		et.online_p, 
 		et.late_submit_p, 
+		et.task_item_id,
 		et.item_id,
 		et.requires_grade_p, et.description, et.grade_item_id,
 		coalesce(cr.content_length,0) as content_length,
 		et.data as task_data,
 		cr.title as task_title,
-   		et.task_id as revision_id,
-		ets.solution_id as solution_id
+   		et.task_id as revision_id
 	from cr_revisions cr,
-		 evaluation_tasksi et left outer join evaluation_tasks_solsi ets on (ets.task_item_id = et.task_item_id and content_revision__is_live(ets.solution_id) = true)
+	     evaluation_tasksi et,
+	     cr_items cri	
 	where cr.revision_id = et.revision_id
 	  and et.grade_item_id = :grade_item_id	
-	  and content_revision__is_live(et.task_id) = true 
+	  and cri.live_revision = et.task_id
 	$assignments_orderby
 
       </querytext>
@@ -35,20 +36,20 @@
 		et.online_p, 
 		et.late_submit_p, 
 		et.item_id,
+		et.task_item_id,
 		et.due_date,
 		et.requires_grade_p, et.description, et.grade_item_id,
 		cr.title as task_title,
 		et.data as task_data,
 	   	et.task_id as revision_id,
 		coalesce(cr.content_length,0) as content_length,
-		et.late_submit_p,
-		ea.answer_id as answer_id
+		et.late_submit_p
 	from cr_revisions cr, 
-		 evaluation_tasksi et left outer join evaluation_answersi ea on (ea.task_item_id = et.task_item_id and content_revision__is_live(ea.answer_id) = true
-                                                                    and ea.party_id = evaluation__party_id(:user_id,et.task_id))
+		 evaluation_tasksi et,
+	         cr_items cri
 	where cr.revision_id = et.revision_id
 	  and grade_item_id = :grade_item_id
-	  and content_revision__is_live(et.task_id) = true 
+	  and cri.live_revision = et.task_id
     $assignments_orderby
 	
       </querytext>
@@ -73,12 +74,36 @@
 <fullquery name="grade_names">      
       <querytext>
 
-		select grade_name, grade_plural_name 
-		from evaluation_grades 
-		where grade_item_id = :grade_item_id and content_revision__is_live(grade_id) = true
+		select eg.grade_name, eg.grade_plural_name 
+		from evaluation_grades eg, cr_items cri
+		where eg.grade_item_id = :grade_item_id 
+		and cri.live_revision = eg.grade_id
 	
       </querytext>
 </fullquery>
 
+<fullquery name="solution_info">      
+      <querytext>
+
+	    select ets.solution_id
+	    from evaluation_tasks_sols ets, cr_items cri
+	    where ets.task_item_id = :task_item_id
+	    and cri.live_revision = ets.solution_id
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="answer_info">      
+      <querytext>
+
+      select ea.answer_id
+      from evaluation_answers ea, cr_items cri
+      where ea.task_item_id = :task_item_id 
+      and cri.live_revision = ea.answer_id
+      and ea.party_id = evaluation__party_id(:user_id,:task_id)
+      
+      </querytext>
+</fullquery>
+
 </queryset>