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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/tcl/cms-folder-procs-oracle.xql	3 Jul 2001 16:37:55 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="get_name_type">
+	<querytext>
+    select
+      o.pretty_name,
+      m.content_type
+    from
+      acs_object_types o, cr_folder_type_map m
+    where
+      m.folder_id = :folder_id
+    and
+      m.content_type = o.object_type
+    and
+      content_item.is_subclass(o.object_type, 'content_revision') = 't'
+    order by
+      decode(o.object_type, 'content_revision', '----', o.pretty_name)
+	</querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/tcl/cms-folder-procs-postgresql.xql	3 Jul 2001 16:37:55 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="get_name_type">
+	<querytext>
+    select
+      o.pretty_name,
+      m.content_type
+    from
+      acs_object_types o, cr_folder_type_map m
+    where
+      m.folder_id = :folder_id
+    and
+      m.content_type = o.object_type
+    and
+      content_item__is_subclass(o.object_type, 'content_revision') = 't'
+    order by
+      case when o.object_type = 'content_revision' then '----' else o.pretty_name end
+	</querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/cms/tcl/cms-folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/cms-folder-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/tcl/cms-folder-procs.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/cms/tcl/cms-folder-procs.tcl	3 Jul 2001 16:37:55 -0000	1.2
@@ -40,11 +40,12 @@
 #
 # @see proc cms_folder::flush_registered_types
 
-proc cms_folder::get_registered_types {
+ad_proc cms_folder::get_registered_types {
   folder_id {datasource multilist} {name registered_types}
 } {
 
-  set sql "
+  set code [list \
+    template::query get_name_type $name $datasource "
     select
       o.pretty_name,
       m.content_type
@@ -57,11 +58,7 @@
     and
       content_item.is_subclass(o.object_type, 'content_revision') = 't'
     order by
-      decode(o.object_type, 'content_revision', '----', o.pretty_name)
-  " 
-
-  set code [list \
-    template::query $name $datasource $sql \
+      decode(o.object_type, 'content_revision', '----', o.pretty_name)" \
     -cache "folder_registered_types $folder_id $datasource" -persistent \
     -timeout 3600]