Index: openacs-4/packages/assessment/tcl/as-apm-action-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-action-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/tcl/as-apm-action-procs-postgresql.xql	10 Feb 2005 21:28:46 -0000	1.2
+++ openacs-4/packages/assessment/tcl/as-apm-action-procs-postgresql.xql	14 Feb 2005 17:20:34 -0000	1.3
@@ -3,8 +3,14 @@
 
     <fullquery name="as::actions::insert_actions.insert_default">
         <querytext>
-		  select as_action__default_actions ($node_id,$user_id,$package_id)
+		  select as_action__default_actions ($package_id,$user_id,$package_id)
         </querytext>
     </fullquery>
 
+
+    <fullquery name="as::actions::insert_actions_after_upgrade.after_upgrade">
+        <querytext>
+		  select as_action__create_action_object ()
+        </querytext>
+    </fullquery>
 </queryset>
Index: openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl	10 Feb 2005 21:28:46 -0000	1.2
+++ openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl	14 Feb 2005 17:20:34 -0000	1.3
@@ -16,4 +16,10 @@
     db_exec_plsql insert_default {}
 }
 
+ad_proc -public as::actions::insert_actions_after_upgrade {
 
+} {
+} { 
+    db_exec_plsql after_upgrade {}
+}
+
Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/tcl/as-checks-procs.tcl	8 Feb 2005 16:56:09 -0000	1.14
+++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl	14 Feb 2005 17:20:34 -0000	1.15
@@ -351,38 +351,25 @@
     {-session_id}
     {-section_id}
     {-assessment_id}
-    {-response}
-    {-item_id_to:required}
 } {
     
 } {
     set order "f"
     set perform 0
-
-    db_foreach section_checks {} {
+    set checks [db_list_of_lists section_checks {}]
+    
+    foreach check $checks {
 	as::assessment::data -assessment_id $assessment_id
 	set new_assessment_revision $assessment_data(assessment_rev_id)
+	set section_id_to [lindex $check 2]
+	set perform [db_string check_sql "[lindex $check 0]" -default 0]
 	
-	#parse condition_sql to get item_id
-	set cond_list  [split $check_sql "="]
-	set as_item_id [lindex [split [lindex $cond_list 2] " "] 0]
-
-
-	#parse condition_sql to get choice_id
-	set cond_list  [split $check_sql "="]
-	set condition [lindex [split [lindex $cond_list 1] " "] 0]	
-
-
-	if { $condition == $response && $as_item_id == $item_id_to} {
-	    set perform 1
-
-	}
 	if {$perform == 1} {
 	    set order [db_string get_order { }]
 	}
 	
     }
-
+    
     if {$order == "f"} {
 	return $order
     } {
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.10 -r1.11
--- openacs-4/packages/assessment/tcl/as-checks-procs.xql	8 Feb 2005 16:56:09 -0000	1.10
+++ openacs-4/packages/assessment/tcl/as-checks-procs.xql	14 Feb 2005 17:20:34 -0000	1.11
@@ -231,7 +231,7 @@
 
 <fullquery name="as::assessment::check::branch_checks.section_checks">
       <querytext>
-      select * from as_inter_item_checks where action_p = 'f' and section_id_from=:section_id 
+      select check_sql,inter_item_check_id,section_id_to from as_inter_item_checks where action_p = 'f' and section_id_from=:section_id 
       </querytext>
 </fullquery>
 <fullquery name="as::assessment::check::branch_checks.get_order">
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.22 -r1.23
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	29 Jan 2005 18:03:12 -0000	1.22
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	14 Feb 2005 17:20:34 -0000	1.23
@@ -290,6 +290,11 @@
 			where short_name = 'email'
 		    }
 		}
-            }
+	    }
+	    
+	    0.10d6 0.10d7 {
+		as::actions::insert_actions_after_upgrade
+	    }
 	}
+    
 }