Index: openacs-4/packages/cms/tcl/cms-folder-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/cms-folder-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/cms-folder-procs-oracle.xql	3 Jul 2001 16:37:55 -0000	1.1
+++ openacs-4/packages/cms/tcl/cms-folder-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -2,7 +2,7 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="get_name_type">
+<fullquery name="cms_folder::get_registered_types.get_name_type">
 	<querytext>
     select
       o.pretty_name,
Index: openacs-4/packages/cms/tcl/cms-folder-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/cms-folder-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/cms-folder-procs-postgresql.xql	3 Jul 2001 16:37:55 -0000	1.1
+++ openacs-4/packages/cms/tcl/cms-folder-procs-postgresql.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -2,7 +2,7 @@
 <queryset>
 <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="get_name_type">
+<fullquery name="cms_folder::get_registered_types.get_name_type">
 	<querytext>
     select
       o.pretty_name,
Index: openacs-4/packages/cms/tcl/content-add-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/content-add-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/content-add-procs.xql	2 Jul 2001 14:25:12 -0000	1.1
+++ openacs-4/packages/cms/tcl/content-add-procs.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <queryset> 
-	<fullquery name="count_text_mime_types">
+	<fullquery name="content_add::content_method_html.count_text_mime_types">
 		<querytext>
 			select count(*)
 			from cr_content_mime_type_map
@@ -9,7 +9,7 @@
 		</querytext>
 	</fullquery>
 
-	<fullquery name="count_mime_types">
+	<fullquery name="content_add::content_method_html.count_mime_types">
 		<querytext>
 			select count(*)
 			from cr_content_mime_type_map
Index: openacs-4/packages/cms/tcl/content-method-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/content-method-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/content-method-procs.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/content-method-procs.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <queryset> 
-	<fullquery name="count_text_mime_types">
+	<fullquery name="content_method::text_entry_filter_sql.count_text_mime_types">
 		<querytext>
 			select count(*)
 			from cr_content_mime_type_map
Index: openacs-4/packages/cms/tcl/form-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-oracle.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/tcl/form-procs-oracle.xql	11 Aug 2001 17:44:39 -0000	1.7
+++ openacs-4/packages/cms/tcl/form-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.8
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<partialquery name="attributes_query_1">      
+<partialquery name="content::query_form_metadata.attributes_query_1">      
 	<querytext>
 		
     select
@@ -62,7 +62,7 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="cfe_attribute_name_to_char">
+<partialquery name="content::create_form_element.cfe_attribute_name_to_char">
 	<querytext>
 
 	to_char($attribute_name, 'YYYY MM DD HH24 MI SS') 
@@ -71,21 +71,14 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="attributes_query_extra_where">
-	<querytext>
 
-	 and $extra_where
-
-	</querytext>
-</partialquery>
-
-<fullquery name="get_revision_id">
+<fullquery name="content::create_form_element.get_revision_id">
 	<querytext>
 	select content_item.get_latest_revision(:item_id) from dual
 	</querytext>
 </fullquery>
 
-<partialquery name="get_enum_1">
+<partialquery name="content::get_revision_create_element.get_enum_1">
 	<querytext>
 	select nvl(pretty_name,enum_value), enum_value
 	from acs_enum_values
@@ -94,7 +87,7 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="new_content_revision">
+<fullquery name="content::process_revision_form.new_content_revision">
 	<querytext>
              begin
 	     :revision_id := content_revision.new(
@@ -110,7 +103,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_extended_attributes">
+<fullquery name="content::process_revision_form.get_extended_attributes">
 	<querytext>
 
 	  select 
@@ -138,7 +131,7 @@
 	</querytext>
 </fullquery>
 
-<partialquery name="ied_get_objects_tree">
+<partialquery name="content::insert_element_data.ied_get_objects_tree">
 	<querytext>
 
           select 
@@ -162,33 +155,33 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="cont_new_item_non_null_params">
+<partialquery name="content::new_item.cont_new_item_non_null_params">
 	<querytext>
 	$param => :$param
 	</querytext>
 </partialquery>
 
-<partialquery name="cont_new_item_def_params">
+<partialquery name="content::new_item.cont_new_item_def_params">
 	<querytext>
 	$param => $defArray($param)
 	</querytext>
 </partialquery>
 
-<partialquery name="cont_new_item_rel_tag">
+<partialquery name="content::new_item.cont_new_item_rel_tag">
 	<querytext>
 	relation_tag => :relation_tag
 	</querytext>
 </partialquery>
 
-<fullquery name="create_new_content_item">
+<fullquery name="content::new_item.create_new_content_item">
 	<querytext>
         begin 
           :item_id := content_item.new( [join $params ","] );
         end;
         </querytext>
 </fullquery>
 
-<fullquery name="update_cr_revisions">
+<fullquery name="content::upload_content.update_cr_revisions">
 	<querytext>
 
       update cr_revisions 
@@ -198,15 +191,15 @@
 	</querytext>
 </fullquery>
 
-<partialquery name="string_to_timestamp">
+<partialquery name="content::get_sql_value.string_to_timestamp">
 	<querytext>
 
 	to_date(:$name, 'YYYY MM DD HH24 MI SS')
 
 	</querytext>
 </partialquery>
 
-<fullquery name="get_all_valid_relation_tags">
+<fullquery name="content::add_child_relation_element.get_all_valid_relation_tags">
 	<querytext>
 
     select 
@@ -223,23 +216,23 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_parent_title">
+<fullquery name="content::add_child_relation_element.get_parent_title">
 	<querytext>
 
       select content_item.get_title(:parent_id) from dual
 
 	</querytext>
 </fullquery>
 
-<partialquery name="timestamp_to_string">
+<partialquery name="content::set_attribute_values.timestamp_to_string">
 	<querytext>
 
 	to_char($attr, 'YYYY MM DD HH24 MI SS') as $attr
 
 	</querytext>
 </partialquery>
 
-<fullquery name="gcv_get_revision_id">
+<fullquery name="content::get_content_value.gcv_get_revision_id">
 	<querytext>
 
 	  begin
@@ -249,7 +242,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="ga_get_attributes">
+<fullquery name="content::get_attributes.ga_get_attributes">
 	<querytext>
 
     select
@@ -275,7 +268,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="gaev_get_enum_values">
+<fullquery name="content::get_attribute_enum_values.gaev_get_enum_values">
 	<querytext>
 
            select
@@ -291,83 +284,83 @@
 	</querytex>
 </fullquery>
 
-<fullquery name="glr_get_latest_revision">
+<fullquery name="content::get_latest_revision.glr_get_latest_revision">
 	<querytext>
 
     select content_item.get_latest_revision(:item_id) from dual
 
 	</querytext>
 </fullquery>
 
-<partialquery name="abr_new_revision_title">
+<partialquery name="content::add_basic_revision.abr_new_revision_title">
 	<querytext>
 
 begin :revision_id := content_revision.new(
          title         => :title
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_description">
+<partialquery name="content::add_basic_revision.abr_new_revision_description">
 	<querytext>
          , description         => :description
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_publish_date">
+<partialquery name="content::add_basic_revision.abr_new_revision_publish_date">
 	<querytext>
          , publish_date         => :publish_date
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_mime_type">
+<partialquery name="content::add_basic_revision.abr_new_revision_mime_type">
 	<querytext>
          , mime_type         => :mime_type
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_nls_language">
+<partialquery name="content::add_basic_revision.abr_new_revision_nls_language">
 	<querytext>
          , nls_language         => :nls_language
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_text">
+<partialquery name="content::add_basic_revision.abr_new_revision_text">
 	<querytext>
          , text         => :text
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_description_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_description_ne">
 	<querytext>
          , description         => null
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_publish_date_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_publish_date_ne">
 	<querytext>
          , publish_date         => sysdate
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_mime_type_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_mime_type_ne">
 	<querytext>
          , mime_type         => 'text/plain'
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_nls_language_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_nls_language_ne">
 	<querytext>
          , nls_language         => null
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_text_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_text_ne">
 	<querytext>
          , text         => ' '
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_end_items">
+<partialquery name="content::add_basic_revision.abr_new_revision_end_items">
 	<querytext>
        , item_id       => content_symlink.resolve(:item_id),
          revision_id   => :revision_id,
@@ -378,7 +371,7 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="upcff_update_cr_revisions">
+<fullquery name="content::update_content_from_file.upcff_update_cr_revisions">
 	<querytext>
 
     update cr_revisions 
@@ -388,7 +381,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="cc_copy_content">
+<fullquery name="content::copy_content.cc_copy_content">
 	<querytext>
 
            begin
Index: openacs-4/packages/cms/tcl/form-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/tcl/form-procs-postgresql.xql	12 Aug 2001 14:49:52 -0000	1.8
+++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql	14 Aug 2001 18:11:30 -0000	1.9
@@ -2,7 +2,7 @@
 <queryset>
 <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="attributes_query_1">      
+<partialquery name="content::query_form_metadata.attributes_query_1">      
 	<querytext>
 		
     select
@@ -65,7 +65,7 @@
 	</querytext>
 </fullquery>
 
-<partialquery name="cfe_attribute_name_to_char">
+<partialquery name="content::create_form_element.cfe_attribute_name_to_char">
 	<querytext>
 
 	to_char($attribute_name, 'YYYY MM DD HH24 MI SS') 
@@ -74,13 +74,13 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="get_revision_id">
+<fullquery name="content::create_form_element.get_revision_id">
 	<querytext>
 	select content_item__get_latest_revision(:item_id)
 	</querytext>
 </fullquery>
 
-<partialquery name="get_enum_1">
+<partialquery name="content::get_revision_create_element.get_enum_1">
 	<querytext>
 	select coalesce(pretty_name,enum_value), enum_value
 	from acs_enum_values
@@ -89,15 +89,15 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="new_content_revision">
+<fullquery name="content::process_revision_form.new_content_revision">
 	<querytext>
 
 	     select content_revision__new(:title,:description,:mime_type,' ',content_symlink__resolve(:item_id),'[ns_conn peeraddr]',[User::getID]) as revision_id
 
 	</querytext>
 </fullquery>
 
-<fullquery name="get_extended_attributes">
+<fullquery name="content::process_revision_form.get_extended_attributes">
 	<querytext>
 
 	  select 
@@ -131,7 +131,7 @@
 
 </fullquery>
 
-<partialquery name="ied_get_objects_tree">
+<partialquery name="content::insert_element_data.ied_get_objects_tree">
 	<querytext>
 
           select 
@@ -160,32 +160,32 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="cont_new_item_non_null_params">
+<partialquery name="content::new_item.cont_new_item_non_null_params">
 	<querytext>
 	:$param
 	</querytext>
 
 </partialquery>
 
-<partialquery name="cont_new_item_def_params">
+<partialquery name="content::new_item.cont_new_item_def_params">
 	<querytext>
 	$defArray($param)
 	</querytext>
 </partialquery>
 
-<partialquery name="cont_new_item_rel_tag">
+<partialquery name="content::new_item.cont_new_item_rel_tag">
 	<querytext>
 null
 	</querytext>
 </partialquery>
 
-<fullquery name="create_new_content_item">
+<fullquery name="content::new_item.create_new_content_item">
 	<querytext>
           select content_item__new( [join $params ","] ) as item_id
         </querytext>
 </fullquery>
 
-<fullquery name="update_cr_revisions">
+<fullquery name="content::upload_content.update_cr_revisions">
 	<querytext>
 
       update cr_revisions 
@@ -195,15 +195,15 @@
 	</querytext>
 </fullquery>
 
-<partialquery name="string_to_timestamp">
+<partialquery name="content::get_sql_value.string_to_timestamp">
 	<querytext>
 
 	to_date(:$name, 'YYYY MM DD HH24 MI SS')
 
 	</querytext>
 </partialquery>
 
-<fullquery name="get_all_valid_relation_tags">
+<fullquery name="content::add_child_relation_element.get_all_valid_relation_tags">
 	<querytext>
 
     select 
@@ -220,31 +220,31 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_parent_title">
+<fullquery name="content::add_child_relation_element.get_parent_title">
 	<querytext>
 
       select content_item__get_title(:parent_id)
 
 	</querytext>
 </fullquery>
 
-<partialquery name="timestamp_to_string">
+<partialquery name="content::set_attribute_values.timestamp_to_string">
 	<querytext>
 
 	to_char($attr, 'YYYY MM DD HH24 MI SS') as $attr
 
 	</querytext>
 </partialquery>
 
-<fullquery name="gcv_get_revision_id">
+<fullquery name="content::get_content_value.gcv_get_revision_id">
 	<querytext>
 
 	    select content_revision__to_temporary_clob(:revision_id) as revision_id;
 
 	</querytext>
 </fullquery>
 
-<fullquery name="ga_get_attributes">
+<fullquery name="content::get_attributes.ga_get_attributes">
 	<querytext>
 
     select
@@ -275,7 +275,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="gaev_get_enum_values">
+<fullquery name="content::get_attribute_enum_values.gaev_get_enum_values">
 	<querytext>
 
            select
@@ -291,89 +291,89 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="glr_get_latest_revision">
+<fullquery name="content::get_latest_revision.glr_get_latest_revision">
 	<querytext>
 
     select content_item__get_latest_revision(:item_id)
 
 	</querytext>
 </fullquery>
 
-<partialquery name="abr_new_revision_title">
+<partialquery name="content::add_basic_revision.abr_new_revision_title">
 	<querytext>
 
    select content_revision__new(:title
 
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_description">
+<partialquery name="content::add_basic_revision.abr_new_revision_description">
 	<querytext>
          , :description
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_publish_date">
+<partialquery name="content::add_basic_revision.abr_new_revision_publish_date">
 	<querytext>
          , :publish_date
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_mime_type">
+<partialquery name="content::add_basic_revision.abr_new_revision_mime_type">
 	<querytext>
          , :mime_type
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_nls_language">
+<partialquery name="content::add_basic_revision.abr_new_revision_nls_language">
 	<querytext>
          , :nls_language
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_text">
+<partialquery name="content::add_basic_revision.abr_new_revision_text">
 	<querytext>
          , :text
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_description_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_description_ne">
 	<querytext>
          , null
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_publish_date_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_publish_date_ne"
 	<querytext>
          , now()
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_mime_type_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_mime_type_ne">
 	<querytext>
          , 'text/plain'
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_nls_language_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_nls_language_ne">
 	<querytext>
          , null
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_text_ne">
+<partialquery name="content::add_basic_revision.abr_new_revision_text_ne">
 	<querytext>
          , ' '
 	</querytext>
 </partialquery>
 
-<partialquery name="abr_new_revision_end_items">
+<partialquery name="content::add_basic_revision.abr_new_revision_end_items">
 	<querytext>
          , content_symlink__resolve(:item_id), :revision_id, now(), :creation_ip, :creation_user) as revision_id
 	</querytext>
 </partialquery>
 
-<fullquery name="upcff_update_cr_revisions">
+<fullquery name="content::update_content_from_file.upcff_update_cr_revisions">
 	<querytext>
 
     update cr_revisions 
@@ -383,7 +383,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="cc_copy_content">
+<fullquery name="content::copy_content.cc_copy_content">
 	<querytext>
 
           select content_revision__content_copy (:revision_id_src, :revision_id_dest)
Index: openacs-4/packages/cms/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/tcl/form-procs.tcl	29 Jul 2001 23:44:43 -0000	1.8
+++ openacs-4/packages/cms/tcl/form-procs.tcl	14 Aug 2001 18:11:30 -0000	1.9
@@ -21,7 +21,7 @@
   set query [db_map attributes_query_1] 
  
   if { ![template::util::is_nil extra_where] } {      
-    append query "\n   and\n      $extra_where"
+      append query [db_map attributes_query_extra_where]
   }
 
   append query "
@@ -864,12 +864,12 @@
       returning content into :1" -blob_files $tmpfile
 
     # update mime_type to match the file 
-    set mime_sql "
+
+    if { [catch {db_dml update_mime_sql "
       update cr_revisions 
         set mime_type = :mime_type 
-        where revision_id = :revision_id"
-    
-    if { [catch {db_dml update_mime_sql $mime_sql} errmsg] } {
+        where revision_id = :revision_id" } errmsg] } {
+	
 	#  if it fails, use user submitted mime_type
 	ns_log notice "form-procs - add_revision_dml - using user mime_type 
 	  instead of guessed mime type = $mime_type"
Index: openacs-4/packages/cms/tcl/form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/tcl/form-procs.xql	29 Jul 2001 23:44:43 -0000	1.5
+++ openacs-4/packages/cms/tcl/form-procs.xql	14 Aug 2001 18:11:30 -0000	1.6
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="get_content_type">      
+<fullquery name="content::create_form_element.get_content_type">      
 	<querytext>
 	select content_type from cr_items i, cr_revisions r
 	where r.item_id = i.item_id
@@ -10,7 +10,7 @@
 
 </fullquery>
 
-<partialquery name="cfe_attribute_name">
+<partialquery name="content::create_form_element.cfe_attribute_name">
 	<querytext>
 
 	$attribute_name
@@ -19,14 +19,22 @@
 
 </partialquery>
 
-<fullquery name="get_element_value">      
+<fullquery name="content::create_form_element.get_element_value">      
 	<querytext>
 	select $what from ${table_name}x where revision_id = :revision_id
 	</querytext>
 </fullquery>
 
-<fullquery name="insert_revision_form">
+<partialquery name="content::query_form_metadata.attributes_query_extra_where">
 	<querytext>
+
+	 and $extra_where
+
+	</querytext>
+</partialquery>
+
+<fullquery name="content::process_revision_form_dml.insert_revision_form">
+	<querytext>
               insert into $__last_table (
                 [join $__columns ", "]
               ) values (
@@ -35,15 +43,15 @@
 	</querytext>
 </fullquery>
 
-<partialquery name="ied_get_objects_tree_extra_where">
+<partialquery name="content::insert_element_data.ied_get_objects_tree_extra_where">
 	<querytext>
 
 	 and $extra_where
 
 	</querytext>
 </partialquery>
 
-<partialquery name="ied_get_objects_tree_order_by">
+<partialquery name="content::insert_element_data.ied_get_objects_tree_order_by">
 	<querytext>
 
           order by 
@@ -52,7 +60,7 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="process_insert_statement">
+<fullquery name="content::process_insert_statement.process_insert_statement">
 	<querytext>
               insert into $__last_table (
                 [join $__columns ", "]
@@ -62,7 +70,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="addrev_get_content_type">
+<fullquery name="content::add_revision.addrev_get_content_type">
 	<querytext>
     select object_type content_type, table_name
     from acs_object_types
@@ -71,7 +79,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="update_mime_sql">
+<fullquery name="content::upload_content.update_mime_sql">
 	<querytext>
 
       update cr_revisions 
@@ -81,7 +89,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_text_mime_types">
+<fullquery name="content::add_content_element.get_text_mime_types">
 	<querytext>
 
 	    select
@@ -100,7 +108,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_parent_type">
+<fullquery name="content::add_child_relation_element.get_parent_type">
 	<querytext>
 
     select content_type from cr_items 
@@ -109,15 +117,15 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="set_content_values">
+<fullquery name="content::get_widget_param_value.set_content_values">
 	<querytext>
 
 	$param(value)
 
 	</querytext>
 </fullquery>
 
-<fullquery name="gtap_get_attribute_data">
+<fullquery name="content::get_type_attribute_params.gtap_get_attribute_data">
 	<querytext>
 
     select
@@ -130,7 +138,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="gap_get_attribute_data">
+<fullquery name="content::get_attribute_params.gap_get_attribute_data">
 	<querytext>
 
     select
@@ -145,7 +153,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_previous_version_values">
+<fullquery name="content::set_attribute_values.get_previous_version_values">
 	<querytext>
 
     select 
@@ -158,7 +166,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="count_mime_type">
+<fullquery name="content::get_default_content_method.count_mime_type">
 	<querytext>
 
 	select count(*) from cr_content_mime_type_map
@@ -167,7 +175,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_type_info_1">
+<fullquery name="content::get_type_info.get_type_info_1">
 	<querytext>
 
       select 
@@ -180,7 +188,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="get_type_info_2">
+<fullquery name="content::get_type_info.get_type_info_2">
 	<querytext>
 
       select 
@@ -193,7 +201,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="gcv_get_previous_content">
+<fullquery name="content::get_content_value.gcv_get_previous_content">
 	<querytext>
 
     select 
@@ -206,15 +214,15 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="cc_get_mime_type">
+<fullquery name="content::copy_content.cc_get_mime_type">
 	<querytext>
 
       select mime_type from cr_revisions where revision_id = :revision_id_src
 
 	</querytext>
 </fullquery>
 
-<fullquery name="cc_update_cr_revisions">
+<fullquery name="cc_update_cr_revisions.cc_update_cr_revisions">
 	<querytext>
 
            update cr_revisions
@@ -224,7 +232,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="vn_same_name_count1">
+<fullquery name="content::validate_name.vn_same_name_count1">
 	<querytext>
 
 	  select count(1)
@@ -234,7 +242,7 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="vn_same_name_count2">
+<fullquery name="content::validate_name.vn_same_name_count2">
 	<querytext>
 
 	  select count(1)
Index: openacs-4/packages/cms/tcl/module-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/module-procs-oracle.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/module-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -3,23 +3,8 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="getSortedPaths.">      
+<fullquery name="cm::modules::getChildFolders.gcf_get_child_folders">      
       <querytext>
-      select 
-                         item_id, 
-                         content_item.get_path(item_id, :sorted_paths_root_id) as item_path,
-                         content_type as item_type
-                       from 
-                         cr_items
-                       where
-                         item_id in ($sql_id_list)
-                       order by item_path
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="getChildFolders.gcf_get_child_folders">      
-      <querytext>
       
         select
 	  :mount_point as mount_point,
@@ -44,23 +29,23 @@
 </fullquery>
 
  
-<fullquery name="getChildFolders.grfi_get_root_id">      
+<fullquery name="cm::modules::templates::getRootFolderId.grfi_get_root_id">      
       <querytext>
       
             select content_template.get_root_folder() from dual
       </querytext>
 </fullquery>
 
  
-<fullquery name="getSortedPaths.gri_get_root_id">      
+<fullquery name="cm::modules::sitemap::getRootFolderID.grfi_get_root_id">      
       <querytext>
       
             select content_item.get_root_folder() from dual
       </querytext>
 </fullquery>
 
  
-<fullquery name="getChildFolders.gtt_get_tree_types">      
+<fullquery name="cm::modules::types::getTreeTypes.gtt_get_tree_types">      
       <querytext>
       
           select
@@ -76,34 +61,35 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="getChildFolders.gcf_get_child_folders">      
+
+<fullquery name="cm::modules::types::getChildFolders.gcf_get_child_folders">      
       <querytext>
-      
-        select
-	  :mount_point as mount_point,
-	  r.name, 
-          r.item_id,
-          '' as children,
-	  nvl((select 't' from dual where exists
-	    (select 1 from cr_folders f_child, cr_resolved_items r_child
-	       where r_child.parent_id = r.resolved_id
-		 and f_child.folder_id = r_child.resolved_id)), 'f') expandable,
-	  r.is_symlink symlink, 
-          0 update_time
-	from
-	  cr_folders f, cr_resolved_items r
-	where
-	  r.parent_id = :id
-	and
-	  r.resolved_id = f.folder_id
-	order by
-	  name
+
+		   select
+                     :module_name as mount_point,
+                     t.pretty_name, 
+                     t.object_type,
+                     '' as children,
+                     NVL(
+                      (select 't' from dual 
+                        where exists (select 1 from acs_object_types
+                          where supertype = t.object_type)),
+                      'f'
+                     ) as expandable,
+                     'f' as symlink, 
+                     0 as update_time
+                   from 
+                     acs_object_types t
+                   where 
+                     supertype = :id
+                   order by 
+                     t.pretty_name
+
       </querytext>
 </fullquery>
 
  
-<fullquery name="getChildFolders.gcc_get_child_folders">      
+<fullquery name="cm::modules::categories::getChildFolders.gcf_get_child_folders">      
       <querytext>
       
                      select 
@@ -130,33 +116,35 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="getChildFolders.gcf_get_child_folders">      
+
+<fullquery name="cm::modules::users::getChildFolders.gcf_get_child_folders">      
       <querytext>
-      
-        select
-	  :mount_point as mount_point,
-	  r.name, 
-          r.item_id,
-          '' as children,
-	  nvl((select 't' from dual where exists
-	    (select 1 from cr_folders f_child, cr_resolved_items r_child
-	       where r_child.parent_id = r.resolved_id
-		 and f_child.folder_id = r_child.resolved_id)), 'f') expandable,
-	  r.is_symlink symlink, 
-          0 update_time
-	from
-	  cr_folders f, cr_resolved_items r
-	where
-	  r.parent_id = :id
-	and
-	  r.resolved_id = f.folder_id
-	order by
-	  name
+
+		   select
+                     :module_name as mount_point,
+                     g.group_name as name, 
+                     g.group_id, '' as children,
+                     NVL(
+                      (select 't' from dual 
+                        where exists (
+                          select 1 from group_component_map m2
+                          where m2.group_id = g.group_id)),
+                      'f' 
+                     ) as expandable,
+                     'f' as symlink,
+                     0 as update_time
+                   from 
+                     groups g $map_table
+                   where 
+                     $where_clause
+                   order by 
+                     name
+
       </querytext>
 </fullquery>
 
-<partialquery name="getSortedPaths.gsp_get_sorted_paths">
+ 
+<partialquery name="cm::modules::sitemap::getSortedPaths.gsp_get_sorted_paths">
 	<querytext>
 	               select 
                          item_id, 
@@ -170,7 +158,7 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="getSortedPaths.gsp_get_query">
+<partialquery name="cm::modules::categories::getSortedPaths.gsp_get_query">
 	<querytext>
 
           select 
@@ -185,7 +173,7 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="getSortedPaths.gsp_get_sort_paths">
+<partialquery name="cm::modules::users::getSortedPaths.gsp_get_sort_paths">
 	<querytext>
 
           select 
Index: openacs-4/packages/cms/tcl/module-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/tcl/module-procs-postgresql.xql	12 Aug 2001 14:49:52 -0000	1.2
+++ openacs-4/packages/cms/tcl/module-procs-postgresql.xql	14 Aug 2001 18:11:30 -0000	1.3
@@ -2,23 +2,8 @@
 
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="getSortedPaths.">      
-      <querytext>
-      select 
-                         item_id, 
-                         content_item__get_path(item_id, :sorted_paths_root_id) as item_path,
-                         content_type as item_type
-                       from 
-                         cr_items
-                       where
-                         item_id in ($sql_id_list)
-                       order by item_path
-      </querytext>
-</fullquery>
-
  
-<fullquery name="getChildFolders.gcf_get_child_folders">      
+<fullquery name="cm::modules::getChildFolders.gcf_get_child_folders">      
       <querytext>
       
         select
@@ -44,23 +29,23 @@
 </fullquery>
 
  
-<fullquery name="getChildFolders.grfi_get_root_id">      
+<fullquery name="cm::modules::templates::getRootFolderId.grfi_get_root_id">
       <querytext>
       
             select content_template__get_root_folder(null) 
       </querytext>
 </fullquery>
 
  
-<fullquery name="getSortedPaths.gri_get_root_id">      
+<fullquery name="cm::modules::sitemap::getRootFolderID.grfi_get_root_id">      
       <querytext>
       
             select content_item__get_root_folder(null) 
       </querytext>
 </fullquery>
 
  
-<fullquery name="getChildFolders.gtt_get_tree_types">      
+<fullquery name="cm::modules::types::getTreeTypes.gtt_get_tree_types">      
       <querytext>
       FIX ME CONNECT BY
 
@@ -77,29 +62,28 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="getChildFolders.gcf_get_child_folders">      
+
+<fullquery name="cm::modules::types::getChildFolders.gcf_get_child_folders">      
       <querytext>
-      
-        select
-	  :mount_point as mount_point,
-	  r.name, 
-          r.item_id,
-          '' as children,
-	  coalesce((select 't'  where exists
-	    (select 1 from cr_folders f_child, cr_resolved_items r_child
-	       where r_child.parent_id = r.resolved_id
-		 and f_child.folder_id = r_child.resolved_id)), 'f') expandable,
-	  r.is_symlink symlink, 
-          0 update_time
-	from
-	  cr_folders f, cr_resolved_items r
-	where
-	  r.parent_id = :id
-	and
-	  r.resolved_id = f.folder_id
-	order by
-	  name
+
+		   select
+                     :module_name as mount_point,
+                     t.pretty_name, 
+                     t.object_type,
+                     '' as children,
+                     ( CASE WHEN
+                           (select count(*) from acs_object_types
+                            where supertype = t.object_type) = 0
+                       THEN 'f' ELSE 't' END ) as expandable,
+                     'f' as symlink, 
+                     0 as update_time
+                   from 
+                     acs_object_types t
+                   where 
+                     supertype = :id
+                   order by 
+                     t.pretty_name
+
       </querytext>
 </fullquery>
 
@@ -112,12 +96,12 @@
                      content_keyword__get_heading(keyword_id) as name, 
                      keyword_id, 
                      '' as children,
-                     coalesce( (select 't'  
-                             where exists (
-                               select 1 from cr_keywords k2
+                     (CASE WHEN (
+                                 select 1 from cr_keywords k2
                                  where k2.parent_id = k.keyword_id
-                                   and content_keyword__is_leaf(k2.keyword_id) = 'f')),
-                           'f') as expandable,
+                                   and content_keyword__is_leaf(k2.keyword_id) = 'f')
+                                 ) = 1 THEN 't' ELSE 'f' END
+                      ) as expandable,
                      'f' as symlink,
                      0 as update_time           
                    from 
@@ -131,34 +115,8 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="getChildFolders.gcf_get_child_folders">      
-      <querytext>
-      
-        select
-	  :mount_point as mount_point,
-	  r.name, 
-          r.item_id,
-          '' as children,
-	  coalesce((select 't'  where exists
-	    (select 1 from cr_folders f_child, cr_resolved_items r_child
-	       where r_child.parent_id = r.resolved_id
-		 and f_child.folder_id = r_child.resolved_id)), 'f') expandable,
-	  r.is_symlink symlink, 
-          0 update_time
-	from
-	  cr_folders f, cr_resolved_items r
-	where
-	  r.parent_id = :id
-	and
-	  r.resolved_id = f.folder_id
-	order by
-	  name
-      </querytext>
-</fullquery>
 
-
-<partialquery name="getSortedPaths.gsp_get_sorted_paths">
+<partialquery name="cm::modules::sitemap::getSortedPaths.gsp_get_sorted_paths">
 	<querytext>
 	               select 
                          item_id, 
@@ -173,7 +131,7 @@
 </partialquery>
 
 
-<partialquery name="getSortedPaths.gsp_get_query">
+<partialquery name="cm::modules::categories::getSortedPaths.gsp_get_query">
 	<querytext>
 
           select 
@@ -188,7 +146,7 @@
 	</querytext>
 </partialquery>
 
-<partialquery name="getSortedPaths.gsp_get_sort_paths">
+<partialquery name="cm::modules::users::getSortedPaths.gsp_get_sort_paths">
 	<querytext>
 
           select 
Index: openacs-4/packages/cms/tcl/module-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/tcl/module-procs.tcl	11 Aug 2001 17:40:26 -0000	1.3
+++ openacs-4/packages/cms/tcl/module-procs.tcl	14 Aug 2001 18:11:30 -0000	1.4
@@ -133,7 +133,7 @@
       # Retreive the id of the root folder
       ad_proc getRootFolderID {} {
         if { ![nsv_exists browser_state sitemap_root] } {
-          template::query gri_get_root_id root_id onevalue "
+          template::query grfi_get_root_id root_id onevalue "
             select content_item.get_root_folder() from dual"
           nsv_set browser_state sitemap_root $root_id
           return $root_id
@@ -259,7 +259,7 @@
 
         # query for keyword categories
 
-        template::query gcc_get_child_folders children multilist "
+        template::query gcf_get_child_folders children multilist "
                      select 
                      :module_name as mount_point,
                      content_keyword.get_heading(keyword_id) as name, 
@@ -369,7 +369,7 @@
  
         set module_name [namespace tail [namespace current]] 
 
-        template::query gcf_child_folders result multilist "
+        template::query gcf_get_child_folders result multilist "
                      select
                      :module_name as mount_point,
                      name, key, '' as children,
Index: openacs-4/packages/cms/tcl/module-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/module-procs.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/module-procs.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="get_module_id.gmi_get_module_id">      
+<fullquery name="cm::modules::get_module_id.gmi_get_module_id">      
       <querytext>
       
         select module_id from cm_modules
@@ -11,7 +11,7 @@
 </fullquery>
 
  
-<fullquery name="getMountPoints.gmp_get_mount_points">      
+<fullquery name="cm::modules::getMountPoints.gmp_get_mount_points">      
       <querytext>
       
        select 
@@ -24,7 +24,7 @@
 </fullquery>
 
  
-<fullquery name="getChildFolders.gcf_child_folders">      
+<fullquery name="cm::modules::clipboard::getChildFolders.gcf_get_child_folders">      
       <querytext>
       
                      select
Index: openacs-4/packages/cms/tcl/perm-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/perm-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/perm-procs-oracle.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/perm-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -2,130 +2,7 @@
 
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="content::perm_form_generate.">      
-      <querytext>
-      
-    set is_request [form is_request $perm_form_name]
-   
-    
-    
-    set permission_options [list]
-    set permission_values  [list]
-
-    template::query permission_boxes multirow $__sql "
-      select 
-	t.child_privilege as privilege, 
-	lpad(' ', t.tree_level * 24, '&nbsp;') || 
-          NVL(p.pretty_name, t.child_privilege) as label,
-	cms_permission.permission_p(
-	 :object_id, :grantee_id, t.child_privilege
-	) as permission_p,
-        cms_permission.permission_p (
-	 :object_id, :grantee_id, t.privilege
-	) as parent_permission_p
-      from (
-	select privilege, child_privilege, level as tree_level
-	  from acs_privilege_hierarchy
-	  connect by privilege = prior child_privilege
-	  start with privilege = 'cm_root'
-	) t, acs_privileges p
-      where
-	p.privilege = t.child_privilege
-      and (
-	cms_permission.has_grant_authority (
-	  :object_id, :user_id, t.child_privilege
-	) = 't' 
-	or
-	cms_permission.has_revoke_authority (
-	  :object_id, :user_id, t.child_privilege, :grantee_id
-	) = 't' 
-      )
-    " -eval {
-      if { [string equal $row(parent_permission_p) f] } {
-        lappend permission_options [list $row(label) $row(privilege)]
-        if { [string equal $row(permission_p) t] && $is_request } {
-          lappend permission_values $row(privilege)
-        }
-      }
-    }
-
-    
-    
-
-
-    element create $perm_form_name object_id -label "Object ID" \
-      -datatype integer -widget hidden -param
-
-    element create $perm_form_name grantee_id -label "Grantee ID" \
-      -datatype integer -widget hidden -param
-
-    element create $perm_form_name pf_boxes -label "Permissions" \
-      -datatype text -widget checkbox -options $permission_options \
-      -values $permission_values -optional
-
-    element create $perm_form_name pf_is_recursive \
-      -label "Apply changes to child items and subfolders ?" \
-      -datatype text \
-      -widget radio -options { {Yes t} {No f} } -values { f }
-  
-      </querytext>
-</fullquery>
-
  
-<fullquery name="content::perm_form_generate.">      
-      <querytext>
-      
-
-    if { [form is_valid $perm_form_name] } {
-
-      set user_id [User::getID]
-
-      form get_values $perm_form_name object_id grantee_id pf_is_recursive
-      set permission_values [element get_values $perm_form_name pf_boxes]
-
-      db_transaction {
-
-	  
-	  foreach pair $permission_options {
-	      set privilege [lindex $pair 1]
-	      if { [lsearch $permission_values $privilege] >= 0 } {
-		  template::query pfp_grant_permission grant_permission dml $__sql_grant "
-                     begin 
-	               cms_permission.grant_permission (
-		         item_id => :object_id, 
-		         holder_id => :user_id,
-		         privilege => :privilege, 
-		         recepient_id => :grantee_id,
-                         is_recursive => :pf_is_recursive
-	               );
-	             end;"
-	      } else {
-		  template::query pfp_revoke_permission revoke_permission dml $__sql_revoke"
-                     begin 
-     	               cms_permission.revoke_permission (
-		         item_id => :object_id, 
-		         holder_id => :user_id,
-		         privilege => :privilege, 
-		         revokee_id => :grantee_id,
-                         is_recursive => :pf_is_recursive
-	               );
-	             end;"
-	      }
-	  }
-
-      }
-  
-      
-      content::check_access $object_id "cm_read" \
-        -user_id $user_id -refresh
-
-    }
-  
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="content::check_access.ca_get_perm_list">      
       <querytext>
       
Index: openacs-4/packages/cms/tcl/perm-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/perm-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/perm-procs-postgresql.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/perm-procs-postgresql.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -3,131 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="content::perm_form_generate.">      
-      <querytext>
-      FIX ME CONNECT BY
-
-    set is_request [form is_request $perm_form_name]
-   
-    
-    
-    set permission_options [list]
-    set permission_values  [list]
-
-    template::query permission_boxes multirow $__sql "
-      select 
-	t.child_privilege as privilege, 
-	lpad(' ', t.tree_level * 24, '&nbsp;') || 
-          NVL(p.pretty_name, t.child_privilege) as label,
-	cms_permission__permission_p(
-	 :object_id, :grantee_id, t.child_privilege
-	) as permission_p,
-        cms_permission__permission_p (
-	 :object_id, :grantee_id, t.privilege
-	) as parent_permission_p
-      from (
-	select privilege, child_privilege, level as tree_level
-	  from acs_privilege_hierarchy
-	  connect by privilege = prior child_privilege
-	  start with privilege = 'cm_root'
-	) t, acs_privileges p
-      where
-	p.privilege = t.child_privilege
-      and (
-	cms_permission__has_grant_authority (
-	  :object_id, :user_id, t.child_privilege
-	) = 't' 
-	or
-	cms_permission__has_revoke_authority (
-	  :object_id, :user_id, t.child_privilege, :grantee_id
-	) = 't' 
-      )
-    " -eval {
-      if { [string equal $row(parent_permission_p) f] } {
-        lappend permission_options [list $row(label) $row(privilege)]
-        if { [string equal $row(permission_p) t] && $is_request } {
-          lappend permission_values $row(privilege)
-        }
-      }
-    }
-
-    
-    
-
-
-    element create $perm_form_name object_id -label "Object ID" \
-      -datatype integer -widget hidden -param
-
-    element create $perm_form_name grantee_id -label "Grantee ID" \
-      -datatype integer -widget hidden -param
-
-    element create $perm_form_name pf_boxes -label "Permissions" \
-      -datatype text -widget checkbox -options $permission_options \
-      -values $permission_values -optional
-
-    element create $perm_form_name pf_is_recursive \
-      -label "Apply changes to child items and subfolders ?" \
-      -datatype text \
-      -widget radio -options { {Yes t} {No f} } -values { f }
-  
-      </querytext>
-</fullquery>
-
  
-<fullquery name="content::perm_form_generate.">      
-      <querytext>
-      FIX ME PLSQL
-
-
-    if { [form is_valid $perm_form_name] } {
-
-      set user_id [User::getID]
-
-      form get_values $perm_form_name object_id grantee_id pf_is_recursive
-      set permission_values [element get_values $perm_form_name pf_boxes]
-
-      db_transaction {
-
-	  
-	  foreach pair $permission_options {
-	      set privilege [lindex $pair 1]
-	      if { [lsearch $permission_values $privilege] >= 0 } {
-		  template::query pfp_grant_permission grant_permission dml $__sql_grant "
-                     begin 
-	               cms_permission__grant_permission (
-		         item_id => :object_id, 
-		         holder_id => :user_id,
-		         privilege => :privilege, 
-		         recepient_id => :grantee_id,
-                         is_recursive => :pf_is_recursive
-	               );
-	             end;"
-	      } else {
-		  template::query pfp_revoke_permission revoke_permission dml $__sql_revoke"
-                     begin 
-     	               cms_permission__revoke_permission (
-		         item_id => :object_id, 
-		         holder_id => :user_id,
-		         privilege => :privilege, 
-		         revokee_id => :grantee_id,
-                         is_recursive => :pf_is_recursive
-	               );
-	             end;"
-	      }
-	  }
-
-      }
-  
-      
-      content::check_access $object_id "cm_read" \
-        -user_id $user_id -refresh
-
-    }
-  
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="content::check_access.ca_get_perm_list">      
       <querytext>
       
Index: openacs-4/packages/cms/tcl/user-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/user-procs-oracle.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/user-procs-oracle.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="cms_admin_exists.cae_admin_exists">      
+<fullquery name="User::cms_admin_exists.cae_admin_exists">      
       <querytext>
       
       select content_permission.cm_admin_exists from dual
Index: openacs-4/packages/cms/tcl/user-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/user-procs-postgresql.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/user-procs-postgresql.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="cms_admin_exists.cae_admin_exists">      
+<fullquery name="User::cms_admin_exists.cae_admin_exists">      
       <querytext>
       
       select content_permission__cm_admin_exists 
Index: openacs-4/packages/cms/tcl/user-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/user-procs.xql	11 Aug 2001 17:41:34 -0000	1.1
+++ openacs-4/packages/cms/tcl/user-procs.xql	14 Aug 2001 18:11:30 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="getName.gn_get_name">      
+<fullquery name="User::getName.gn_get_name">      
       <querytext>
       select 
         $col