Index: openacs-4/packages/cms/cms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/cms.info 12 Aug 2001 15:39:58 -0000 1.2
+++ openacs-4/packages/cms/cms.info 17 Aug 2001 02:53:47 -0000 1.3
@@ -71,9 +71,7 @@
-
-
@@ -83,8 +81,6 @@
-
-
@@ -99,6 +95,8 @@
+
+
@@ -115,14 +113,15 @@
+
-
-
+
+
@@ -196,297 +195,299 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -607,233 +608,233 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
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 -r1.9 -r1.10
--- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 14 Aug 2001 18:11:30 -0000 1.9
+++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 17 Aug 2001 02:53:47 -0000 1.10
@@ -343,7 +343,7 @@
-
, now()
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 -r1.3 -r1.4
--- openacs-4/packages/cms/tcl/module-procs-postgresql.xql 14 Aug 2001 18:11:30 -0000 1.3
+++ openacs-4/packages/cms/tcl/module-procs-postgresql.xql 17 Aug 2001 02:53:47 -0000 1.4
@@ -11,12 +11,12 @@
r.name,
r.item_id,
'' as children,
- coalesce((select 't' where exists
+ coalesce((select 't'::text 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
+ and f_child.folder_id = r_child.resolved_id)), 'f'::text) as expandable,
+ r.is_symlink as symlink,
+ 0 as update_time
from
cr_folders f, cr_resolved_items r
where
@@ -29,10 +29,10 @@
-
+
- select content_template__get_root_folder(null)
+ select content_template__get_root_folder()
@@ -130,7 +130,33 @@
+
+
+ select
+ :module_name as mount_point,
+ content_keyword__get_heading(keyword_id) as name,
+ keyword_id,
+ '' as children,
+ coalesce( (select 't'::text from dual
+ where exists (
+ 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,
+ 'f' as symlink,
+ 0 as update_time
+ from
+ cr_keywords k
+ where
+ $where_clause
+ and
+ content_keyword__is_leaf(keyword_id) = 'f'
+ order by
+ name
+
+
+
@@ -165,4 +191,30 @@
+
+
+
+ select
+ :module_name as mount_point,
+ g.group_name as name,
+ g.group_id, '' as children,
+ coalesce(
+ (select 't'::text from dual
+ where exists (
+ select 1 from group_component_map m2
+ where m2.group_id = g.group_id)),
+ 'f'::text
+ ) as expandable,
+ 'f' as symlink,
+ 0 as update_time
+ from
+ groups g $map_table
+ where
+ $where_clause
+ order by
+ name
+
+
+
+