Index: openacs-4/packages/assessment/lib/section-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v
diff -u -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/assessment/lib/section-items.adp	5 Feb 2007 14:11:35 -0000	1.19.2.3
+++ openacs-4/packages/assessment/lib/section-items.adp	7 Apr 2007 21:47:17 -0000	1.19.2.4
@@ -6,7 +6,7 @@
 
 <multiple name="items">
 
-<a name=@items.as_item_id@><h4>#assessment.Question_Number#</h4>
+<a name="Q@items.as_item_id@"><h4>#assessment.Question_Number#</h4>
 
 <if @assessment_data.type@ ne 1>
 
Index: openacs-4/packages/assessment/sql/oracle/assessment-collected-data-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-collected-data-create.sql,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/sql/oracle/assessment-collected-data-create.sql	16 Oct 2006 13:17:04 -0000	1.5
+++ openacs-4/packages/assessment/sql/oracle/assessment-collected-data-create.sql	7 Apr 2007 21:47:18 -0000	1.5.2.1
@@ -213,10 +213,10 @@
 create table as_session_item_map (
 	session_id	integer
 			constraint as_sess_imap_session_fk
-			references as_sessions,
+			references as_sessions on delete cascade,
 	item_data_id	integer
 			constraint as_sess_imap_item_data_fk
-			references as_item_data,
+			references as_item_data on delete cascade,
 	constraint as_sess_imap_pk
 	primary key (session_id, item_data_id)
 );
Index: openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	16 Oct 2006 13:17:04 -0000	1.11
+++ openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	7 Apr 2007 21:47:18 -0000	1.11.2.1
@@ -215,10 +215,10 @@
 create table as_session_item_map (
 	session_id	integer
 			constraint as_session_item_map_session_fk
-			references as_sessions,
+			references as_sessions on delete cascade,
 	item_data_id	integer
 			constraint as_session_item_map_item_data_fk
-			references as_item_data,
+			references as_item_data on delete cascade,
 	constraint as_session_item_map_pk
 	primary key (session_id, item_data_id)
 );
Index: openacs-4/packages/assessment/tcl/as-session-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-session-procs.tcl,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/assessment/tcl/as-session-procs.tcl	16 Feb 2007 02:07:11 -0000	1.7.2.2
+++ openacs-4/packages/assessment/tcl/as-session-procs.tcl	7 Apr 2007 21:47:18 -0000	1.7.2.3
@@ -85,8 +85,10 @@
         }
         content::item::delete -item_id $item_id
     }
-    foreach comment_id [db_list get_comments ""] {
-	content::item::delete -item_id $comment_id
+    if {[apm_package_enabled_p "general-comments"]} {
+        foreach comment_id [db_list get_comments ""] {
+            content::item::delete -item_id $comment_id
+        }
     }
     set session_item_id [content::revision::item_id -revision_id $session_id]
     content::revision::delete -revision_id $session_id
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -r1.13.2.7 -r1.13.2.8
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	4 Apr 2007 20:21:14 -0000	1.13.2.7
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	7 Apr 2007 21:47:18 -0000	1.13.2.8
@@ -306,12 +306,12 @@
 } -after_submit {
     if {![exists_and_not_null formbutton_add_another_question] \
 	    && ![exists_and_not_null formbutton_add_another_choice]} {
-	ad_returnredirect [export_vars -base questions {assessment_id}]&\#$as_item_id
+	ad_returnredirect "[export_vars -base questions {assessment_id}]\&#Q$as_item_id"
 	
 	ad_script_abort
     } elseif {[exists_and_not_null formbutton_add_another_question]} {
 	set after [expr {$after + 1}]
-	ad_returnredirect [export_vars -base item-add {after assessment_id section_id}]&\#$as_item_id	    
+	ad_returnredirect "[export_vars -base item-add {after assessment_id section_id}]\#Q$as_item_id"
     }
 }