Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl	26 Jan 2004 15:39:46 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl	11 Feb 2004 18:29:07 -0000	1.14
@@ -750,7 +750,7 @@
     @param extra_vars an ns_set of extra vars
 
     @param start_with The object type to start with when gathering
-    attributes for this object type
+    attributes for this object type.  Defaults to the object type.
 
     @param form_id The form id from templating form system if we're
     using the forms API to specify attributes
@@ -863,6 +863,19 @@
 	    
 
     if { ![empty_string_p $form_id]} {
+
+        #DRB: This needs to be cached!
+        set __id_column [db_string get_id_column {}]
+	if { [info exists real_params([string toupper $__id_column])] && ![info exists param_array([string toupper $__id_column])] } {
+            set param_array([string toupper $__id_column]) 1
+            set $__id_column [template::element::get_value $form_id "$variable_prefix$__id_column"]
+      	    lappend pieces [list $__id_column]
+	}
+
+        if { [string equal $start_with ""] } {
+            set start_with $object_type
+        }
+
 	# Append the values from the template form for each attribute
 	foreach row [package_object_attribute_list -start_with $start_with $object_type] {
 	    set __attribute [lindex $row 2]
Index: openacs-4/packages/acs-subsite/tcl/package-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/tcl/package-procs.xql	3 Jan 2004 01:44:10 -0000	1.5
+++ openacs-4/packages/acs-subsite/tcl/package-procs.xql	11 Feb 2004 18:29:07 -0000	1.6
@@ -87,6 +87,16 @@
       
     </querytext>
   </fullquery>
+  
+  <fullquery name="package_instantiate_object.get_id_column">      
+    <querytext>
+      
+      select id_column
+      from acs_object_types
+      where object_type = :object_type
+      
+    </querytext>
+  </fullquery>
 
   
   <fullquery name="package_object_view_helper.select_type_info">