Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.36.2.4 -r1.36.2.5
--- openacs-4/packages/assessment/assessment.info	18 Jul 2005 18:01:01 -0000	1.36.2.4
+++ openacs-4/packages/assessment/assessment.info	27 Jul 2005 21:54:07 -0000	1.36.2.5
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="0.13" url="http://openacs.org/repository/download/apm/assessment-0.13.apm">
+    <version name="0.14" url="http://openacs.org/repository/download/apm/assessment-0.14.apm">
         <owner url="mailto:eperez@it.uc3m.es">Eduardo Perez Ureta</owner>
         <summary>Assessment package that will replace the survey,
     quizz, complex survey, poll and other data collection packages
@@ -17,7 +17,7 @@
         <description format="text/plain">Create assessments and evaluate.</description>
         <maturity>0</maturity>
 
-        <provides url="assessment" version="0.13"/>
+        <provides url="assessment" version="0.14"/>
         <requires url="acs-content-repository" version="5.1.4d3"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="5.1.5d1"/>
Index: openacs-4/packages/assessment/tcl/as-checks-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.xql,v
diff -u -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/assessment/tcl/as-checks-procs.xql	26 Jul 2005 13:41:25 -0000	1.19.2.3
+++ openacs-4/packages/assessment/tcl/as-checks-procs.xql	27 Jul 2005 21:53:56 -0000	1.19.2.4
@@ -157,7 +157,9 @@
 
 <fullquery name="as::assessment::check::action_exec.get_check_params">
       <querytext>
-       select * from as_param_map where inter_item_check_id = :inter_item_check_id
+       select ci.latest_revision as item_id,parameter_id, value, inter_item_check_id 
+       from as_param_map pm,cr_items ci  where inter_item_check_id = :inter_item_check_id and 
+       ci.item_id=pm.item_id
       </querytext>
 </fullquery>
 
@@ -200,7 +202,8 @@
 
 <fullquery name="as::assessment::check::manual_action_exec.get_check_params">
       <querytext>
-       select * from as_param_map where inter_item_check_id = :inter_item_check_id 
+       select ci.latest_revision as item_id,parameter_id, value, inter_item_check_id 
+       from as_param_map pm, cr_items ci  where inter_item_check_id = :inter_item_check_id 
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -r1.30.2.9 -r1.30.2.10
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	18 Jul 2005 18:01:01 -0000	1.30.2.9
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	27 Jul 2005 21:53:56 -0000	1.30.2.10
@@ -398,6 +398,15 @@
 		content::type::attribute::new -content_type {as_assessments} -attribute_name {type}            -datatype {number}  -pretty_name {Type}  -column_spec {integer}
 		
 	    }
+	    0.13 0.14 {
+		# update as_param_map table to set the item_id  as a cr_item and not a cr_revision id
+		
+		db_foreach as_parameter { select cr.item_id, pm.parameter_id from as_param_map pm, cr_revisions cr where cr.revision_id = pm.item_id} {
+		    db_dml  update_parameters { update as_param_map set item_id=:item_id where parameter_id=:parameter_id}
+		}
+		
+	    }
+	    
 	}
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/action-params.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-params.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/assessment/www/asm-admin/action-params.xql	18 Feb 2005 16:18:49 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/action-params.xql	27 Jul 2005 21:54:07 -0000	1.4.2.1
@@ -30,7 +30,7 @@
 
 <fullquery name="choices">
 <querytext>
-    select cri.title, sm.as_item_id
+    select cri.title, cri.item_id as as_item_id
     from as_item_section_map sm, cr_revisions cri
     where sm.as_item_id = cri.revision_id and sm.section_id in (
     select s.section_id
@@ -46,7 +46,7 @@
 
 <fullquery name="prev_choices">
 <querytext>
-    select cri.title, sm.as_item_id
+    select cri.title, cr.item_id as as_item_id
     from as_item_section_map sm, cr_revisions cri
     where sm.as_item_id = cri.revision_id and sm.section_id in (
     select s.section_id