Index: openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -24,10 +24,10 @@
     @param creation_ip
 } {
     return [package_exec_plsql -var_list [list \
-        extlink_id $extlink_id \
-        target_folder_id $target_folder_id \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list extlink_id $extlink_id ] \
+        [list target_folder_id $target_folder_id ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_extlink copy]
 }
 
@@ -38,7 +38,7 @@
     @param extlink_id item_id of extlink to delete
 } {
     return [package_exec_plsql -var_list [list \
-        extlink_id $extlink_id \
+        [list extlink_id $extlink_id ] \
     ] content_extlink del]
 }
 
@@ -51,6 +51,6 @@
     @return 1 if extlink, otherwise 0
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_extlink is_extlink]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -1,4 +1,5 @@
 
+
 ad_library {
 
     Tcl API for cr_items in the content repository
@@ -20,9 +21,8 @@
     {-creation_user ""}
     {-context_id ""}
     {-creation_ip ""}
-    {-item_subtype ""}
+    {-item_subtype "content_item"}
     {-content_type "content_revision"}
-    {-object_type "content_item"}
     {-title ""}
     {-description ""}
     {-mime_type ""}
@@ -31,7 +31,7 @@
     {-data ""}
     {-relation_tag ""}
     {-is_live ""}
-    {-storage_type ""}
+    {-storage_type "file"}
     {-attributes ""}
 } {
     @author Dave Bauer (dave@thedesignexperience.org)
@@ -48,7 +48,7 @@
     @param item_id - item_id of this content_item. If this is not
     specified an item_id will be generated automatically
     @param parent_id - parent object of this content_item
-    @param object_type - content_item or subtype of content_item
+    @param item_subtype
     @param content_type - content_revision or subtype of content_revision
     @param context_id -
     @param creation_user -
@@ -63,45 +63,40 @@
 
     @see content::symlink::new content::extlink::new content::folder::new
 } {
-    if {![string equal "" $attributes]} {
-	set var_list $attributes
-    } else {
-	set var_list [list]
-    }
-    
+    set var_list [list]
     lappend var_list \
-	name $name \
-        parent_id $parent_id \
-        item_id $item_id \
-        locale $locale \
-        creation_date $creation_date \
-        creation_user $creation_user \
-        context_id $context_id \
-        creation_ip $creation_ip \
-        item_subtype $item_subtype \
-        content_type $content_type \
-        title $title \
-        description $description \
-        mime_type $mime_type \
-        nls_language $nls_language \
-        text $text \
-        data $data \
-        relation_tag $relation_tag \
-        is_live $is_live \
-        storage_type $storage_type
-	
-    foreach var [list item_id name parent_id content_type context_id creation_date] {
-	lappend var_list [list $var [set $var]]
-    }
+	[list name $name ] \
+        [list parent_id $parent_id ] \
+        [list item_id $item_id ] \
+        [list locale $locale ] \
+        [list creation_date $creation_date ] \
+        [list creation_user $creation_user ] \
+        [list context_id $context_id ] \
+        [list creation_ip $creation_ip ] \
+        [list item_subtype $item_subtype ] \
+        [list content_type $content_type ] \
+        [list title $title ] \
+        [list description $description ] \
+        [list mime_type $mime_type ] \
+        [list nls_language $nls_language ] \
+        [list text $text ] \
+        [list data $data ] \
+        [list relation_tag $relation_tag ] \
+        [list is_live $is_live ] \
+        [list storage_type $storage_type]
 
     # the content type is not the object type of the cr_item so we pass in
-    # the cr_item subtype here and content_type as part of var_list
-
-    set item_id [package_instantiate_object \
-		     -creation_user $creation_user \
-		     -creation_ip $creation_ip \
+    # the cr_item subtype here and content_type as part of
+    # var_list
+    ns_log notice "
+DB --------------------------------------------------------------------------------
+DB DAVE debugging /var/lib/aolserver/ctk/packages/acs-content-repository/tcl/content-item-procs.tcl
+DB --------------------------------------------------------------------------------
+DB var_list = '${var_list}'
+DB --------------------------------------------------------------------------------"
+    set item_id [package_exec_plsql \
 		     -var_list $var_list \
-		     $object_type]
+		     content_item new]
     return $item_id
 }
 
@@ -254,7 +249,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_best_revision]
 }
 
@@ -267,7 +262,7 @@
     @return VARCHAR2(100)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_content_type]
 }
 
@@ -280,7 +275,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_context]
 }
 
@@ -297,9 +292,9 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_path $item_path \
-        root_folder_id $root_folder_id \
-        resolve_index $resolve_index \
+        [list item_path $item_path ] \
+        [list root_folder_id $root_folder_id ] \
+        [list resolve_index $resolve_index ] \
     ] content_item get_id]
 }
 
@@ -312,7 +307,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_latest_revision]
 }
 
@@ -325,7 +320,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_live_revision]
 }
 
@@ -338,7 +333,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_parent_folder]
 }
 
@@ -353,8 +348,8 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        root_folder_id $root_folder_id \
+        [list item_id $item_id ] \
+        [list root_folder_id $root_folder_id ] \
     ] content_item get_path]
 }
 
@@ -369,8 +364,8 @@
     @return DATE
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        is_live $is_live \
+        [list item_id $item_id ] \
+        [list is_live $is_live ] \
     ] content_item get_publish_date]
 }
 
@@ -383,7 +378,7 @@
     @return NUMBER
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_revision_count]
 }
 
@@ -396,7 +391,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item get_root_folder]
 }
 
@@ -411,8 +406,8 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        use_context $use_context \
+        [list item_id $item_id ] \
+        [list use_context $use_context ] \
     ] content_item get_template]
 }
 
@@ -427,8 +422,8 @@
     @return VARCHAR2(1000)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        is_live $is_live \
+        [list item_id $item_id ] \
+        [list is_live $is_live ] \
     ] content_item get_title]
 }
 
@@ -443,8 +438,8 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        root_folder_id $root_folder_id \
+        [list item_id $item_id ] \
+        [list root_folder_id $root_folder_id ] \
     ] content_item get_virtual_path]
 }
 
@@ -459,8 +454,8 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        folder_id $folder_id \
+        [list item_id $item_id ] \
+        [list folder_id $folder_id ] \
     ] content_item is_index_page]
 }
 
@@ -473,7 +468,7 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item is_publishable]
 }
 
@@ -486,7 +481,7 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item is_published]
 }
 
@@ -501,8 +496,8 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        object_type $object_type \
-        supertype $supertype \
+        [list object_type $object_type ] \
+        [list supertype $supertype ] \
     ] content_item is_subclass]
 }
 
@@ -519,9 +514,9 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        content_type $content_type \
-        relation_tag $relation_tag \
+        [list item_id $item_id ] \
+        [list content_type $content_type ] \
+        [list relation_tag $relation_tag ] \
     ] content_item is_valid_child]
 }
 
@@ -536,9 +531,9 @@
     @param use_context
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        template_id $template_id \
-        use_context $use_context \
+        [list item_id $item_id ] \
+        [list template_id $template_id ] \
+        [list use_context $use_context ] \
     ] content_item register_template]
 }
 
@@ -559,11 +554,11 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        object_id $object_id \
-        relation_tag $relation_tag \
-        order_n $order_n \
-        relation_type $relation_type \
+        [list item_id $item_id ] \
+        [list object_id $object_id ] \
+        [list relation_tag $relation_tag ] \
+        [list order_n $order_n ] \
+        [list relation_type $relation_type ] \
     ] content_item relate]
 }
 
@@ -576,8 +571,8 @@
     @param publish_status
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
-        publish_status $publish_status \
+        [list revision_id $revision_id ] \
+        [list publish_status $publish_status ] \
     ] content_item set_live_revision]
 }
 
@@ -592,9 +587,9 @@
     @param end_when
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        start_when $start_when \
-        end_when $end_when \
+        [list item_id $item_id ] \
+        [list start_when $start_when ] \
+        [list end_when $end_when ] \
     ] content_item set_release_period]
 }
 
@@ -609,9 +604,9 @@
     @param use_context
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        template_id $template_id \
-        use_context $use_context \
+        [list item_id $item_id ] \
+        [list template_id $template_id ] \
+        [list use_context $use_context ] \
     ] content_item unregister_template]
 }
 
@@ -622,7 +617,7 @@
     @param rel_id
 } {
     return [package_exec_plsql -var_list [list \
-        rel_id $rel_id \
+        [list rel_id $rel_id ] \
     ] content_item unrelate]
 }
 
@@ -633,7 +628,7 @@
     @param item_id
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_item unset_live_revision]
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-keyword-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -20,8 +20,8 @@
     @param root_path
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        root_path $root_path \
+        [list item_id $item_id ] \
+        [list root_path $root_path ] \
     ] content_keyword write_to_file]
 }
 
@@ -32,7 +32,7 @@
     @param keyword_id
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
+        [list keyword_id $keyword_id ] \
     ] content_keyword del]
 }
 
@@ -45,7 +45,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
+        [list keyword_id $keyword_id ] \
     ] content_keyword get_description]
 }
 
@@ -58,7 +58,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
+        [list keyword_id $keyword_id ] \
     ] content_keyword get_heading]
 }
 
@@ -71,7 +71,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
+        [list keyword_id $keyword_id ] \
     ] content_keyword get_path]
 }
 
@@ -88,9 +88,9 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        keyword_id $keyword_id \
-        recurse $recurse \
+        [list item_id $item_id ] \
+        [list keyword_id $keyword_id ] \
+        [list recurse $recurse ] \
     ] content_keyword is_assigned]
 }
 
@@ -103,7 +103,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
+        [list keyword_id $keyword_id ] \
     ] content_keyword is_leaf]
 }
 
@@ -122,11 +122,11 @@
     @param creation_ip
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        keyword_id $keyword_id \
-        context_id $context_id \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list item_id $item_id ] \
+        [list keyword_id $keyword_id ] \
+        [list context_id $context_id ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_keyword item_assign]
 }
 
@@ -139,8 +139,8 @@
     @param keyword_id
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        keyword_id $keyword_id \
+        [list item_id $item_id ] \
+        [list keyword_id $keyword_id ] \
     ] content_keyword item_unassign]
 }
 
@@ -167,14 +167,14 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        heading $heading \
-        description $description \
-        parent_id $parent_id \
-        keyword_id $keyword_id \
-        creation_date $creation_date \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
-        object_type $object_type \
+        [list heading $heading ] \
+        [list description $description ] \
+        [list parent_id $parent_id ] \
+        [list keyword_id $keyword_id ] \
+        [list creation_date $creation_date ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
+        [list object_type $object_type ] \
     ] content_keyword new]
 }
 
@@ -187,8 +187,8 @@
     @param description
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
-        description $description \
+        [list keyword_id $keyword_id ] \
+        [list description $description ] \
     ] content_keyword set_description]
 }
 
@@ -201,7 +201,7 @@
     @param heading
 } {
     return [package_exec_plsql -var_list [list \
-        keyword_id $keyword_id \
-        heading $heading \
+        [list keyword_id $keyword_id ] \
+        [list heading $heading ] \
     ] content_permission set_heading]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-permission-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -39,12 +39,12 @@
     @param object_type
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        holder_id $holder_id \
-        privilege $privilege \
-        recepient_id $recepient_id \
-        is_recursive $is_recursive \
-        object_type $object_type \
+        [list object_id $object_id ] \
+        [list holder_id $holder_id ] \
+        [list privilege $privilege ] \
+        [list recepient_id $recepient_id ] \
+        [list is_recursive $is_recursive ] \
+        [list object_type $object_type ] \
     ] content_permission grant_permission]
 }
 
@@ -59,9 +59,9 @@
     @param privilege
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        grantee_id $grantee_id \
-        privilege $privilege \
+        [list object_id $object_id ] \
+        [list grantee_id $grantee_id ] \
+        [list privilege $privilege ] \
     ] content_permission grant_permission_h]
 }
 
@@ -78,9 +78,9 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        holder_id $holder_id \
-        privilege $privilege \
+        [list object_id $object_id ] \
+        [list holder_id $holder_id ] \
+        [list privilege $privilege ] \
     ] content_permission has_grant_authority]
 }
 
@@ -99,10 +99,10 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        holder_id $holder_id \
-        privilege $privilege \
-        revokee_id $revokee_id \
+        [list object_id $object_id ] \
+        [list holder_id $holder_id ] \
+        [list privilege $privilege ] \
+        [list revokee_id $revokee_id ] \
     ] content_permission has_revoke_authority]
 }
 
@@ -117,9 +117,9 @@
     @param child_creator_id
 } {
     return [package_exec_plsql -var_list [list \
-        parent_object_id $parent_object_id \
-        child_object_id $child_object_id \
-        child_creator_id $child_creator_id \
+        [list parent_object_id $parent_object_id ] \
+        [list child_object_id $child_object_id ] \
+        [list child_creator_id $child_creator_id ] \
     ] content_permission inherit_permissions]
 }
 
@@ -136,9 +136,9 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        holder_id $holder_id \
-        privilege $privilege \
+        [list object_id $object_id ] \
+        [list holder_id $holder_id ] \
+        [list privilege $privilege ] \
     ] content_permission permission_p]
 }
 
@@ -159,12 +159,12 @@
     @param object_type
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        holder_id $holder_id \
-        privilege $privilege \
-        revokee_id $revokee_id \
-        is_recursive $is_recursive \
-        object_type $object_type \
+        [list object_id $object_id ] \
+        [list holder_id $holder_id ] \
+        [list privilege $privilege ] \
+        [list revokee_id $revokee_id ] \
+        [list is_recursive $is_recursive ] \
+        [list object_type $object_type ] \
     ] content_permission revoke_permission]
 }
 
@@ -179,8 +179,8 @@
     @param privilege
 } {
     return [package_exec_plsql -var_list [list \
-        object_id $object_id \
-        revokee_id $revokee_id \
-        privilege $privilege \
+        [list object_id $object_id ] \
+        [list revokee_id $revokee_id ] \
+        [list privilege $privilege ] \
     ] content_premission revoke_permission_h]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -81,25 +81,28 @@
     set attribute_values ""
 
     if { [exists_and_not_null attributes] } {
-	set type_attributes [package_object_attribute_list $object_type]
+	set type_attributes [package_object_attribute_list $content_type]
 	set valid_attributes [list]
 	# add in extended attributes for this type, ingore
 	# content_revision as those are already captured as named
 	# parameters to this procedure
 	
-	foreach e $type_attributes {
-	    if {![string equal "cr_revisions" [lindex $e 1]]} {
-		lappend $valid_attributes [lindex $e 2]
+	foreach type_attribute $type_attributes {
+	    if {![string equal "cr_revisions" [lindex $type_attribute 1]]} {
+		lappend valid_attributes [lindex $type_attribute 2]
 	    }
 	}
+	foreach attribute_pair $attributes {
+	    set attribute_name [lindex $attribute_pair 0]
+	    set attribute_value [lindex $attribute_pair 1]
+	    if {[lsearch $valid_attributes $attribute_name] > -1}  {
 
-	if {[lsearch $valid_attributes $attribute] > -1}  {
-
-	    # create local variable to use for binding
-	    
-	    set $attribute $value
-	    append attribute_names  ", ${attribute}"
-	    append attribute_values ", :${attribute}"
+		# create local variable to use for binding
+		
+		set $attribute_name $attribute_value
+		append attribute_names  ", ${attribute_name}"
+		append attribute_values ", :${attribute_name}"
+	    }
 	}
     }
     
@@ -128,8 +131,8 @@
     @param revision_id_dest
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
-        revision_id_dest $revision_id_dest \
+        [list revision_id $revision_id ] \
+        [list revision_id_dest $revision_id_dest ] \
     ] content_revision content_copy]
 }
 
@@ -150,11 +153,11 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
-        copy_id $copy_id \
-        target_item_id $target_item_id \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list revision_id $revision_id ] \
+        [list copy_id $copy_id ] \
+        [list target_item_id $target_item_id ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_revision copy]
 }
 
@@ -165,7 +168,7 @@
     @param revision_id
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision del]
 }
 
@@ -178,7 +181,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision export_xml]
 }
 
@@ -191,7 +194,7 @@
     @return NUMBER
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision get_number]
 }
 
@@ -208,9 +211,9 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        revision_id $revision_id \
-        doc_id $doc_id \
+        [list item_id $item_id ] \
+        [list revision_id $revision_id ] \
+        [list doc_id $doc_id ] \
     ] content_revision import_xml]
 }
 
@@ -221,7 +224,7 @@
     @param revision_id
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision index_attributes]
 }
 
@@ -234,7 +237,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision is_latest]
 }
 
@@ -247,7 +250,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision is_live]
 }
 
@@ -264,9 +267,9 @@
     @return NUMBER
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
-        revision_id $revision_id \
-        clob_loc $clob_loc \
+        [list item_id $item_id ] \
+        [list revision_id $revision_id ] \
+        [list clob_loc $clob_loc ] \
     ] content_revision read_xml]
 }
 
@@ -281,9 +284,9 @@
     @param replace
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
-        search $search \
-        replace $replace \
+        [list revision_id $revision_id ] \
+        [list search $search ] \
+        [list replace $replace ] \
     ] content_revision replace]
 }
 
@@ -296,7 +299,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision revision_name]
 }
 
@@ -307,7 +310,7 @@
     @param revision_id
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision to_html]
 }
 
@@ -318,7 +321,7 @@
     @param revision_id
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
+        [list revision_id $revision_id ] \
     ] content_revision to_temporary_clob]
 }
 
@@ -333,16 +336,15 @@
     @return NUMBER
 } {
     return [package_exec_plsql -var_list [list \
-        revision_id $revision_id \
-        clob_loc $clob_loc \
+        [list revision_id $revision_id ] \
+        [list clob_loc $clob_loc ] \
     ] content_revision write_xml]
 }
 
 
 ad_proc -public content::revision::update_attribute_index {
 } {
 } {
-    return [package_exec_plsql -var_list [list \
-    ] content_revision update_attribute_index]
+    return [package_exec_plsql content_revision update_attribute_index]
 }
 
Index: openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-symlink-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -24,10 +24,10 @@
     @param creation_ip
 } {
     return [package_exec_plsql -var_list [list \
-        symlink_id $symlink_id \
-        target_folder_id $target_folder_id \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list symlink_id $symlink_id ] \
+        [list target_folder_id $target_folder_id ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_symlink copy]
 }
 
@@ -38,7 +38,7 @@
     @param symlink_id
 } {
     return [package_exec_plsql -var_list [list \
-        symlink_id $symlink_id \
+        [list symlink_id $symlink_id ] \
     ] content_symlink del]
 }
 
@@ -51,7 +51,7 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_symlink is_symlink]
 }
 
@@ -78,14 +78,14 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        name $name \
-        label $label \
-        target_id $target_id \
-        parent_id $parent_id \
-        symlink_id $symlink_id \
-        creation_date $creation_date \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list name $name ] \
+        [list label $label ] \
+        [list target_id $target_id ] \
+        [list parent_id $parent_id ] \
+        [list symlink_id $symlink_id ] \
+        [list creation_date $creation_date ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_symlink new]
 }
 
@@ -98,7 +98,7 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_symlink resolve]
 }
 
@@ -111,6 +111,6 @@
     @return VARCHAR2(100)
 } {
     return [package_exec_plsql -var_list [list \
-        item_id $item_id \
+        [list item_id $item_id ] \
     ] content_symlink resolve_content_type]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -19,7 +19,7 @@
     @param template_id
 } {
     return [package_exec_plsql -var_list [list \
-        template_id $template_id \
+        [list template_id $template_id ] \
     ] content_template del]
 }
 
@@ -34,8 +34,8 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        template_id $template_id \
-        root_folder_id $root_folder_id \
+        [list template_id $template_id ] \
+        [list root_folder_id $root_folder_id ] \
     ] content_template get_path]
 }
 
@@ -58,7 +58,7 @@
     @return VARCHAR2
 } {
     return [package_exec_plsql -var_list [list \
-        template_id $template_id \
+        [list template_id $template_id ] \
     ] content_template is_template]
 }
 
@@ -85,13 +85,13 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        name $name \
-        text $text \
-        parent_id $parent_id \
-        is_live $is_live \
-        template_id $template_id \
-        creation_date $creation_date \
-        creation_user $creation_user \
-        creation_ip $creation_ip \
+        [list name $name ] \
+        [list text $text ] \
+        [list parent_id $parent_id ] \
+        [list is_live $is_live ] \
+        [list template_id $template_id ] \
+        [list creation_date $creation_date ] \
+        [list creation_user $creation_user ] \
+        [list creation_ip $creation_ip ] \
     ] content_template new]
 }
Index: openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl	10 Jun 2004 01:13:57 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl	13 Jun 2004 18:44:22 -0000	1.2
@@ -34,14 +34,14 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        attribute_name $attribute_name \
-        datatype $datatype \
-        pretty_name $pretty_name \
-        pretty_plural $pretty_plural \
-        sort_order $sort_order \
-        default_value $default_value \
-        column_spec $column_spec \
+        [list content_type $content_type ] \
+        [list attribute_name $attribute_name ] \
+        [list datatype $datatype ] \
+        [list pretty_name $pretty_name ] \
+        [list pretty_plural $pretty_plural ] \
+        [list sort_order $sort_order ] \
+        [list default_value $default_value ] \
+        [list column_spec $column_spec ] \
     ] content_type create_attribute]
 }
 
@@ -64,13 +64,13 @@
     @param name_method
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        supertype $supertype \
-        pretty_name $pretty_name \
-        pretty_plural $pretty_plural \
-        table_name $table_name \
-        id_column $id_column \
-        name_method $name_method \
+        [list content_type $content_type ] \
+        [list supertype $supertype ] \
+        [list pretty_name $pretty_name ] \
+        [list pretty_plural $pretty_plural ] \
+        [list table_name $table_name ] \
+        [list id_column $id_column ] \
+        [list name_method $name_method ] \
     ] content_type create_type]
 }
 
@@ -85,9 +85,9 @@
     @param drop_column
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        attribute_name $attribute_name \
-        drop_column $drop_column \
+        [list content_type $content_type ] \
+        [list attribute_name $attribute_name ] \
+        [list drop_column $drop_column ] \
     ] content_type drop_attribute]
 }
 
@@ -102,9 +102,9 @@
     @param drop_table_p
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        drop_children_p $drop_children_p \
-        drop_table_p $drop_table_p \
+        [list content_type $content_type ] \
+        [list drop_children_p $drop_children_p ] \
+        [list drop_table_p $drop_table_p ] \
     ] content_type drop_type]
 }
 
@@ -119,8 +119,8 @@
     @return NUMBER(38)
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        use_context $use_context \
+        [list content_type $content_type ] \
+        [list use_context $use_context ] \
     ] content_type get_template]
 }
 
@@ -133,7 +133,7 @@
     @return CHAR
 } {
     return [package_exec_plsql -var_list [list \
-        object_type $object_type \
+        [list object_type $object_type ] \
     ] content_type is_content_type]
 }
 
@@ -144,7 +144,7 @@
     @param content_type
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
+        [list content_type $content_type ] \
     ] content_type refresh_view]
 }
 
@@ -163,11 +163,11 @@
     @param max_n
 } {
     return [package_exec_plsql -var_list [list \
-        parent_type $parent_type \
-        child_type $child_type \
-        relation_tag $relation_tag \
-        min_n $min_n \
-        max_n $max_n \
+        [list parent_type $parent_type ] \
+        [list child_type $child_type ] \
+        [list relation_tag $relation_tag ] \
+        [list min_n $min_n ] \
+        [list max_n $max_n ] \
     ] content_type register_child_type]
 }
 
@@ -180,8 +180,8 @@
     @param mime_type
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        mime_type $mime_type \
+        [list content_type $content_type ] \
+        [list mime_type $mime_type ] \
     ] content_type register_mime_type]
 }
 
@@ -200,11 +200,11 @@
     @param max_n
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        target_type $target_type \
-        relation_tag $relation_tag \
-        min_n $min_n \
-        max_n $max_n \
+        [list content_type $content_type ] \
+        [list target_type $target_type ] \
+        [list relation_tag $relation_tag ] \
+        [list min_n $min_n ] \
+        [list max_n $max_n ] \
     ] content_type register_relation_type]
 }
 
@@ -221,10 +221,10 @@
     @param is_default
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        template_id $template_id \
-        use_context $use_context \
-        is_default $is_default \
+        [list content_type $content_type ] \
+        [list template_id $template_id ] \
+        [list use_context $use_context ] \
+        [list is_default $is_default ] \
     ] content_type register_template]
 }
 
@@ -239,9 +239,9 @@
     @param use_context
 } {
     return [package_exec_plsql -var_list [list \
-        template_id $template_id \
-        v_content_type $v_content_type \
-        use_context $use_context \
+        [list template_id $template_id ] \
+        [list v_content_type $v_content_type ] \
+        [list use_context $use_context ] \
     ] content_type rotate_template]
 }
 
@@ -256,9 +256,9 @@
     @param use_context
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        template_id $template_id \
-        use_context $use_context \
+        [list content_type $content_type ] \
+        [list template_id $template_id ] \
+        [list use_context $use_context ] \
     ] content_type set_default_template]
 }
 
@@ -273,9 +273,9 @@
     @param relation_tag
 } {
     return [package_exec_plsql -var_list [list \
-        parent_type $parent_type \
-        child_type $child_type \
-        relation_tag $relation_tag \
+        [list parent_type $parent_type ] \
+        [list child_type $child_type ] \
+        [list relation_tag $relation_tag ] \
     ] content_type unregister_child_type]
 }
 
@@ -288,8 +288,8 @@
     @param mime_type
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        mime_type $mime_type \
+        [list content_type $content_type ] \
+        [list mime_type $mime_type ] \
     ] content_type unregister_mime_type]
 }
 
@@ -304,9 +304,9 @@
     @param relation_tag
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        target_type $target_type \
-        relation_tag $relation_tag \
+        [list content_type $content_type ] \
+        [list target_type $target_type ] \
+        [list relation_tag $relation_tag ] \
     ] content_type unregister_relation_type]
 }
 
@@ -321,9 +321,9 @@
     @param use_context
 } {
     return [package_exec_plsql -var_list [list \
-        content_type $content_type \
-        template_id $template_id \
-        use_context $use_context \
+        [list content_type $content_type ] \
+        [list template_id $template_id ] \
+        [list use_context $use_context ] \
     ] content_type unregister_template]
 }