Index: openacs-4/packages/cms/www/modules/items/relate-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.tcl,v
diff -u -N -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/cms/www/modules/items/relate-items.tcl	19 Feb 2007 22:17:43 -0000	1.6.2.2
+++ openacs-4/packages/cms/www/modules/items/relate-items.tcl	19 Feb 2007 22:30:35 -0000	1.6.2.3
@@ -11,56 +11,33 @@
     -object_id $item_id -privilege write
 
 set page_title "Relate Items to [content::item::get_title -item_id $item_id]"
-set content_type [content::item::content_type -item_id $item_id]
+set item_type [content::item::content_type -item_id $item_id]
 
 # get related items from the clipboard
 set clip [cms::clipboard::parse_cookie]
 set items [cms::clipboard::get_items $clip $mount_point]
 
 set type_options_list [db_list_of_lists get_relation_type_options {}]
-
+set validation_proc "valid_${relation}_relation_p"
 set target_item_num 0
 multirow create target_items item_id title type_options tag_options
-if { $relation eq "cr_item_rel" } {
-    foreach clipped_item $items {
-	if {[cms::rel::valid_item_relation_p -item_id $item_id -target_item_id $clipped_item]} {
-	    incr target_item_num
-	    set target_type [content::item::content_type -item_id $clipped_item]
-	    set tag_options "\n<select name=relation_tag.$target_item_num>\n"
-	    foreach option [db_list ${relation}_tag_options {}] {
-		append tag_options "<option value=$option>$option</option>\n"
-	    }
-	    append tag_options "</select>"
-	    
-	    set type_options "\n<select name=relation_type.$target_item_num>\n"
-	    foreach type_option $type_options_list {
-		append type_options "<option value=\"[lindex $type_option 1]\">[lindex $type_option 0]</option>\n"
-	    }
-	    append type_options "</select>"
-	    
-	    multirow append target_items $clipped_item "[content::item::get_title -item_id $clipped_item]" $type_options $tag_options
+foreach clipped_item $items {
+    if {[cms::rel::${validation_proc} -item_id $item_id -object_id $clipped_item]} {
+	incr target_item_num
+	set object_type [content::item::content_type -item_id $clipped_item]
+	set tag_options "\n<select name=relation_tag.$target_item_num>\n"
+	foreach option [db_list ${relation}_tag_options {}] {
+	    append tag_options "<option value=$option>$option</option>\n"
 	}
-    }
-} else {
-    # $relation eq "cr_item_child_rel"
-    foreach clipped_item $items {
-	if {[cms::rel::valid_child_relation_p -item_id $item_id -child_item_id $clipped_item]} {
-	    incr target_item_num
-	    set child_type [content::item::content_type -item_id $clipped_item]
-	    set tag_options "\n<select name=relation_tag.$target_item_num>\n"
-	    foreach option [db_list ${relation}_tag_options {}] {
-		append tag_options "<option value=$option>$option</option>\n"
-	    }
-	    append tag_options "</select>"
-	    
-	    set type_options "\n<select name=relation_type.$target_item_num>\n"
-	    foreach type_option $type_options_list {
-		append type_options "<option value=\"[lindex $type_option 1]\">[lindex $type_option 0]</option>\n"
-	    }
-	    append type_options "</select>"
-	    
-	    multirow append target_items $clipped_item "[content::item::get_title -item_id $clipped_item]" $type_options $tag_options
+	append tag_options "</select>"
+	
+	set type_options "\n<select name=relation_type.$target_item_num>\n"
+	foreach type_option $type_options_list {
+	    append type_options "<option value=\"[lindex $type_option 1]\">[lindex $type_option 0]</option>\n"
 	}
+	append type_options "</select>"
+	
+	multirow append target_items $clipped_item "[content::item::get_title -item_id $clipped_item]" $type_options $tag_options
     }
 }
 
Index: openacs-4/packages/cms/www/modules/items/relate-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/Attic/relate-items.xql,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/cms/www/modules/items/relate-items.xql	19 Feb 2007 22:17:43 -0000	1.1.2.1
+++ openacs-4/packages/cms/www/modules/items/relate-items.xql	19 Feb 2007 22:30:35 -0000	1.1.2.2
@@ -5,17 +5,17 @@
       <querytext>
         select relation_tag 
           from cr_type_relations 
-         where content_type = :content_type 
-           and target_type = :target_type  
+         where content_type = :item_type 
+           and target_type = :object_type
       </querytext>
 </fullquery>
 
 <fullquery name="cr_item_child_rel_tag_options">      
       <querytext>
         select relation_tag 
           from cr_type_children
-         where parent_type = :content_type 
-           and child_type = :child_type  
+         where parent_type = :item_type 
+           and child_type = :object_type
       </querytext>
 </fullquery>