Index: openacs-4/packages/cms/www/modules/types/set-default-template-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/set-default-template-oracle.xql,v
diff -u -N
--- openacs-4/packages/cms/www/modules/types/set-default-template-oracle.xql	25 May 2001 23:49:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="set_default_template">      
-      <querytext>
-      
-  begin
-  content_type.set_default_template(
-      template_id  => :template_id,
-      content_type => :content_type,
-      use_context  => :context );
-  end;
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/cms/www/modules/types/set-default-template-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/set-default-template-postgresql.xql,v
diff -u -N
--- openacs-4/packages/cms/www/modules/types/set-default-template-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="set_default_template">      
-      <querytext>
-
-        select content_type__set_default_template(
-                        :content_type,
-                        :template_id,
-                        :context );
-  
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/cms/www/modules/types/set-default-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/set-default-template.tcl,v
diff -u -N -r1.2.14.1 -r1.2.14.2
--- openacs-4/packages/cms/www/modules/types/set-default-template.tcl	18 May 2005 15:13:12 -0000	1.2.14.1
+++ openacs-4/packages/cms/www/modules/types/set-default-template.tcl	20 Nov 2006 21:56:05 -0000	1.2.14.2
@@ -1,29 +1,14 @@
 # /cms/www/modules/types/set-default-template.tcl
 # Sets a template registered to a content type/context to be the default
 
-
 request create
 request set_param template_id  -datatype integer
 request set_param context      -datatype keyword
 request set_param content_type -datatype keyword
-request set_param return_url   -datatype text     -optional
+request set_param type_props_tab -datatype text -optional -value templates
+request set_param mount_point -datatype text -optional -value types
 
-db_transaction {
+content::type::set_default_template -content_type $content_type \
+    -template_id $template_id $context
 
-
-# set the default template, automatically unsetting any preexisting default
-db_exec_plsql set_default_template "
-  begin
-  content_type.set_default_template(
-      template_id  => :template_id,
-      content_type => :content_type,
-      use_context  => :context );
-  end;"
-}
-
-# set the default return_url if none exists
-if { [template::util::is_nil return_url] } {
-    set return_url "index?content_type=$content_type&mount_point=types"
-}
-
-forward $return_url
+ad_returnredirect [export_vars -base index {content_type mount_point type_props_tab}]
Index: openacs-4/packages/cms/www/modules/types/unregister-template-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-template-oracle.xql,v
diff -u -N
--- openacs-4/packages/cms/www/modules/types/unregister-template-oracle.xql	25 May 2001 23:49:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="unregister_template">      
-      <querytext>
-      
-  begin
-    content_type.unregister_template(
-      template_id  => :template_id,
-      content_type => :content_type,
-      use_context  => :context );
-  end;
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/cms/www/modules/types/unregister-template-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-template-postgresql.xql,v
diff -u -N
--- openacs-4/packages/cms/www/modules/types/unregister-template-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="unregister_template">      
-      <querytext>
-
-
-        select content_type__unregister_template(
-                :content_type,
-                :template_id,
-                :context );
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/cms/www/modules/types/unregister-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-template.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/cms/www/modules/types/unregister-template.tcl	16 May 2005 22:59:25 -0000	1.3
+++ openacs-4/packages/cms/www/modules/types/unregister-template.tcl	20 Nov 2006 21:56:05 -0000	1.3.2.1
@@ -1,16 +1,14 @@
 # modules/types/unregister-template.tcl
 #  unregisters a template
 
-
 request create
 request set_param template_id -datatype integer
 request set_param context -datatype keyword
 request set_param content_type -datatype keyword
 request set_param type_props_tab -datatype text -optional -value templates
 request set_param mount_point -datatype text -optional -value types
 
-db_transaction {
-    db_exec_plsql unregister_template {}
-}
+content::type::unregister_template -content_type $content_type \
+    -template_id $template_id -use_context $context
 
 ad_returnredirect [export_vars -base index {content_type mount_point type_props_tab}]