Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql	4 Apr 2005 18:23:47 -0000	1.11
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql	7 Apr 2005 18:57:34 -0000	1.12
@@ -14,7 +14,7 @@
 		et.item_id,
 		et.requires_grade_p, et.description, et.grade_item_id,
 		coalesce(round(cr.content_length/1024,0),0) as content_length,
-		cr.filename as task_data,
+		et.data as task_data,
 		crmt.label as pretty_mime_type,
 		cr.title as task_title,
    		et.task_id as revision_id
Index: openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl	4 Apr 2005 18:23:47 -0000	1.6
+++ openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl	7 Apr 2005 18:57:35 -0000	1.7
@@ -200,27 +200,4 @@
     }
 }
 
-ad_proc -private evaluation_assignments_portlet::uninstall {} {
-    Evaluation Portlet package uninstall proc
-} {
-    unregister_implementations
-    set ds_id [portal::get_datasource_id evaluation_assignments_portlet]
-    db_exec_plsql delete_assignments_ds { *SQL* }
-}
 
-ad_proc -private evaluation_evaluations_portlet::uninstall {} {
-    Evaluation Portlet package uninstall proc
-} {
-    unregister_implementations
-    set ds_id [portal::get_datasource_id evaluation_evaluations_portlet]
-    db_exec_plsql delete_evaluations_ds { *SQL* }
-}
-
-ad_proc -private evaluation_admin_portlet::uninstall {} {
-    Evaluation Portlet package uninstall proc
-} {
-    unregister_implementations
-    set ds_id [portal::get_datasource_id evaluation_admin_portlet]
-    db_exec_plsql delete_admin_ds { *SQL* }
-}
-
Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql	13 Jan 2005 23:45:21 -0000	1.1
+++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql	7 Apr 2005 18:57:35 -0000	1.2
@@ -5,25 +5,25 @@
 
 <fullquery name="evaluation_assignments_portlet::uninstall.delete_assignments_ds">      
       <querytext>
-
-	select portal_datasource.delete(:ds_id)
-    
+	begin
+		portal_datasource.del(datasource_id => :ds_id);
+    end;
       </querytext>
 </fullquery>
 
 <fullquery name="evaluation_evaluations_portlet::uninstall.delete_evaluations_ds">      
       <querytext>
-
-	select portal_datasource.delete(:ds_id)
-    
+	begin
+		portal_datasource.del(datasource_id => :ds_id);
+    end;
       </querytext>
 </fullquery>
 
 <fullquery name="evaluation_admin_portlet::uninstall.delete_admin_ds">      
       <querytext>
-
-	select portal_datasource.delete(:ds_id)
-    
+	begin
+		portal_datasource.del(datasource_id => :ds_id);
+    end;
       </querytext>
 </fullquery>
  
Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl	4 Apr 2005 18:23:47 -0000	1.6
+++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl	7 Apr 2005 18:57:35 -0000	1.7
@@ -409,3 +409,29 @@
         -contract_name "portal_datasource" \
         -impl_name "evaluation_admin_portlet"
 }
+
+# unistall procs
+
+ad_proc -private evaluation_assignments_portlet::uninstall {} {
+    Evaluation Portlet package uninstall proc
+} {
+    unregister_implementations
+    set ds_id [portal::get_datasource_id evaluation_assignments_portlet]
+    db_exec_plsql delete_assignments_ds { *SQL* }
+}
+
+ad_proc -private evaluation_evaluations_portlet::uninstall {} {
+    Evaluation Portlet package uninstall proc
+} {
+    unregister_implementations
+    set ds_id [portal::get_datasource_id evaluation_evaluations_portlet]
+    db_exec_plsql delete_evaluations_ds { *SQL* }
+}
+
+ad_proc -private evaluation_admin_portlet::uninstall {} {
+    Evaluation Portlet package uninstall proc
+} {
+    unregister_implementations
+    set ds_id [portal::get_datasource_id evaluation_admin_portlet]
+    db_exec_plsql delete_admin_ds { *SQL* }
+}