Index: openacs-4/packages/assessment/lib/section-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/lib/section-items.tcl	2 Feb 2008 15:08:03 -0000	1.14
+++ openacs-4/packages/assessment/lib/section-items.tcl	2 Sep 2008 17:41:43 -0000	1.15
@@ -1,37 +1,46 @@
+set package_url [ad_conn package_url]
 as::assessment::data -assessment_id $assessment_id
+
+set item_add_top_url [export_vars -base item-add {as_item_id section_id assessment_id return_url}]
 ad_form -name admin_section_${section_id} -form {
     {section_id:text(hidden) {value $section_id}}
 }
 
-set item_add_url [export_vars -base item-add {section_id assessment_id {after 0}}]
-set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after 0}}]
-
-db_multirow -extend { checks_related presentation_type html item_type choice_orientation item_edit_general_url item_copy_url catalog_search_url item_swap_url add_edit_check_url check_admin_url } items section_items {} {
-
-    # Build URLs
-    set item_edit_general_url [export_vars -base item-edit-general {as_item_id section_id assessment_id}]
-    set item_copy_url [export_vars -base item-copy {section_id assessment_id as_item_id {after $sort_order}}]
-    set item_add_url [export_vars -base item-add {section_id assessment_id {after $sort_order}}]
-    set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after $sort_order}}]
-    set item_swap_down_url [export_vars -base item-swap {section_id assessment_id sort_order {direction down}}]
-    set item_swap_up_url [export_vars -base item-swap {section_id assessment_id sort_order {direction up}}]
-    set item_delete_url [export_vars -base item-swap {as_item_id section_id assessment_id}]
-    set add_edit_check_url [export_vars -base ../asm-admin/add-edit-check {as_item_id section_id assessment_id {after $sort_order}}]
-    set check_admin_url [export_vars -base ../asm-admin/checks-admin {section_id assessment_id {item_id $as_item_id}}]
-
-
+db_multirow -extend { 
+    checks_related 
+    presentation_type 
+    html 
+    item_type 
+    choice_orientation 
+    allow_other_p 
+    item_edit_url 
+    item_copy_url 
+    item_delete_url 
+    item_add_url 
+    item_swap_up_url 
+    item_swap_down_url 
+} items section_items {} {
     set presentation_type [as::item_form::add_item_to_form -name admin_section_${section_id} -section_id $section_id -item_id $as_item_id -random_p f]
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
     }
     array set item [as::item::item_data -as_item_id $as_item_id]
 
+    set item_edit_url [export_vars -base item-edit-general {as_item_id section_id assessment_id return_url}]
+    set item_copy_url [export_vars -base item-copy {as_item_id section_id assessment_id return_url {after $sort_order}}]
+    set item_delete_url [export_vars -base item-delete {as_item_id section_id assessment_id return_url}]
+    set item_add_url [export_vars -base item-add {as_item_id section_id assessment_id return_url {after $sort_order}}]
+    set item_swap_up_url [export_vars -base item-swap {as_item_id section_id assessment_id return_url sort_order {direction up}}]
+    set item_swap_down_url [export_vars -base item-swap {as_item_id section_id assessment_id return_url sort_order {direction down}}]
+
     if {$presentation_type == "rb" || $presentation_type == "cb"} {
 	array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
 	set choice_orientation $type(choice_orientation)
+#        set allow_other_p $item(allow_other_p)
 	array unset type
     } else {
 	set choice_orientation ""
+#        set allow_other_p "f"
     }
 
     set item_type $item(item_type)