Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	27 May 2001 04:39:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	16 Aug 2002 03:57:48 -0000	1.6
@@ -33,10 +33,8 @@
 upvar 0 "rel_attrs:rowcount" index
 set index 0
 
+set item_title [db_string get_title ""]
 
-template::query get_title item_title onevalue "
-  select content_item.get_title(:item_id) from dual"
-
 # Create the main multirow datasource
 
 set form_complete 1
@@ -70,16 +68,7 @@
     set form_complete 0
 
     # Get the header
-    template::query get_rel_info onerow "
-      select 
-	content_item.get_title(:item_id) as item_title,
-	content_item.get_title(:related_id) as related_title,
-	pretty_name
-      from
-	acs_object_types
-      where
-	object_type = :relation_type
-    "
+    db_1row get_rel_info "" -column_array rel_info
 
     # Create the form section
     form section rel_form_2 \
@@ -131,14 +120,7 @@
           
           # Insert at the end if no order
           if { [template::util::is_nil order_n] } {
-              template::query get_order order_n onevalue "
-        select 
-	  NVL(max(order_n) + 1, 1) 
-	from 
-	  cr_item_rels
-	where 
-	  item_id = :item_id
-        " 
+              set order_n [db_string get_order ""]
           }
 
           # Perform the insertion