Index: openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql 24 Sep 2001 23:45:12 -0000 1.3
+++ openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql 1 Dec 2001 22:25:53 -0000 1.4
@@ -502,16 +502,15 @@
image_p integer;
v_search_key varchar;
begin
- select tree_sortkey || ''%'' into v_search_key
+ select into v_search_key
from acs_messages
where message_id = thread_id;
for child_val in
select object_id as child_id, object_type
- from acs_objects
- where context_id in (select message_id
- from acs_messages
- where tree_sortkey like v_search_key)
+ from acs_objects o, acs_messages m
+ where o.context_id = m.message_id
+ and m.tree_sortkey between v_search_key and tree_right(v_search_key)
loop
if child_val.object_type = ''acs_message'' then
perform acs_message__delete(child_val.child_id);
@@ -530,7 +529,7 @@
for message_val in
select message_id
from acs_messages
- where tree_sortkey like v_search_key
+ where tree_sortkey between v_search_key and tree_right(v_search_key)
loop
perform acs_message__delete(message_val.message_id);
end loop;
Index: openacs-4/contrib/obsolete-packages/bboard/tcl/bboard-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/tcl/bboard-procs-postgresql.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/contrib/obsolete-packages/bboard/tcl/bboard-procs-postgresql.xql 30 Nov 2001 00:50:22 -0000 1.7
+++ openacs-4/contrib/obsolete-packages/bboard/tcl/bboard-procs-postgresql.xql 1 Dec 2001 22:25:53 -0000 1.8
@@ -221,15 +221,12 @@
- select count(*) as subscribed_p from bboard_thread_subscribers
- where subscriber_id = :user_id
- and thread_id in
- (select message_id
- from acs_messages b
- where tree_sortkey like
- (select tree_sortkey
- from acs_messages
- where message_id = :message_id) || '%')
+ select count(*) as subscribed_p
+ from bboard_thread_subscribers bs, acs_messages m, acs_messages m2
+ where bs.subscriber_id = :user_id
+ and bs.thread_id = m.message_id
+ m2.message_id = :message_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey)
@@ -414,13 +411,12 @@
select subscriber_id as recipient_id, thread_id as grouping_id,
now() as wait_until
- from bboard_thread_subscribers s
- where s.thread_id in
- (select message_id from acs_messages
- where tree_sortkey like
- (select substring(tree_sortkey from 0 for 4) || '%'
- from acs_messages
- where message_id = :message_id))
+ from bboard_thread_subscribers s, acs_messages m, acs_messages m2
+ where s.thread_id = m.message_id
+ and m2.message_id = :message_id
+ and m.tree_sortkey between
+ substr(m2.tree_sortkey, 1, position('/' in substr(m2.tree_sortkey, 2)))
+ and tree_right(substr(m2.tree_sortkey, 1, position('/' in substr(m2.tree_sortkey, 2))))
and exists (select 1
from all_object_party_privilege_map map
where map.object_id = :message_id and
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-oracle.xql 22 Aug 2001 21:01:35 -0000 1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-oracle.xql 1 Dec 2001 22:25:53 -0000 1.4
@@ -37,9 +37,14 @@
- select c.category_id, short_name, count(m.message_id) as message_count
+ select c.category_id, c.short_name,
+ count(m.message_id) as message_count
from bboard_categories c,
- bboard_category_message_map m
+ (select c.category_id, c.message_id
+ from bboard_category_message_map c,
+ bboard_forum_message_map f
+ where c.message_id = f.message_id
+ and f.forum_id = :forum_id) m
where c.forum_id = :forum_id
and m.category_id(+) = c.category_id
and (m.message_id is null
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-postgresql.xql 29 Jun 2001 20:37:18 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-postgresql.xql 1 Dec 2001 22:25:58 -0000 1.2
@@ -39,18 +39,15 @@
-
- select c.category_id, short_name, count(m.message_id) as message_count
- from bboard_categories c left outer join
- bboard_category_message_map m
- on c.category_id = m.category_id
- where c.forum_id = :forum_id
- and (m.message_id is null
- or m.message_id in (select f.message_id
- from bboard_forum_message_map f
- where f.forum_id = :forum_id))
- group by c.category_id, short_name
+ select short_name, count(message_id) as message_count, category_id
+ from bboard_forum_message_map f join
+ (bboard_categories c left outer join bboard_category_message_map m using (category_id))
+ using (message_id)
+ where f.forum_id = '9758'
+ group by category_id, short_name
+ order by category_id;
+
@@ -79,22 +76,14 @@
- select c.category_id, c.short_name,
- count(m.message_id) as message_count
- from bboard_categories c left outer join
- (select c.category_id, c.message_id
- from bboard_category_message_map c,
- bboard_forum_message_map f
- where c.message_id = f.message_id
- and f.status = 'approved'
- and f.forum_id = :forum_id) m
- on c.category_id = m.category_id
- where c.forum_id = :forum_id
- and (m.message_id is null
- or m.message_id in (select f.message_id
- from bboard_forum_message_map f
- where f.forum_id = :forum_id))
- group by c.category_id, short_name
+ select short_name, count(message_id) as message_count, category_id
+ from bboard_forum_message_map f join
+ (bboard_categories c left outer join bboard_category_message_map m using (category_id))
+ using (message_id)
+ where f.forum_id = '9758'
+ and f.status = 'approved'
+ group by category_id, short_name
+ order by category_id;
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/forum.xql 29 Jun 2001 20:37:18 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum.xql 1 Dec 2001 22:25:58 -0000 1.2
@@ -5,9 +5,11 @@
select count(*) as uncategorized_count
- from bboard_messages_by_category b
- where category_id is null
- and forum_id = :forum_id
+ from bboard_forum_message_map msg
+ where forum_id = :forum_id
+ and not exists (select 1
+ from bboard_category_message_map cat
+ where msg.message_id = cat.message_id)
@@ -17,10 +19,13 @@
select count(*) as uncategorized_count
- from bboard_messages_by_category b
- where category_id is null
- and forum_id = :forum_id
-
+ from bboard_forum_message_map msg
+ where forum_id = :forum_id
+ and status = 'approved'
+ and not exists (select 1
+ from bboard_category_message_map cat
+ where msg.message_id = cat.message_id)
+
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-delete-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-delete-2-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-delete-2-postgresql.xql 2 Jul 2001 13:09:24 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-delete-2-postgresql.xql 1 Dec 2001 22:25:58 -0000 1.3
@@ -6,14 +6,9 @@
- delete from bboard_forum_message_map
- where message_id in
- (select message_id
- from acs_messages m
- where m.tree_sortkey like
- (select tree_sortkey
- from acs_messages am
- where am.message_id = :message_id) || '%')
+ delete from bboard_forum_message_map map, acs_messages m, acs_messages m2
+ where map.message_id = m.message_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey)
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-move-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-move-2-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-move-2-postgresql.xql 29 Jun 2001 20:37:18 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-move-2-postgresql.xql 1 Dec 2001 22:25:58 -0000 1.2
@@ -5,19 +5,16 @@
- FIX ME CONNECT BY
update acs_objects
set context_id = :dest_forum_id
where context_id = :forum_id
and object_type = 'acs_message'
and object_id in
(select message_id
- from acs_messages m
- where tree_sortkey like
- (select tree_sortkey || '%'
- from acs_messages m
- where message_id = :message_id))
+ from acs_messages m, acs_messages m2
+ where m2.message_id = :message_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey))
@@ -31,11 +28,9 @@
where forum_id = :forum_id
and message_id in
(select message_id
- from acs_messages m
- where tree_sortkey like
- (select tree_sortkey || '%'
- from acs_messages m
- where message_id = :message_id))
+ from acs_messages m, acs_messages m2
+ where message_id = :message_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey))
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-postgresql.xql 29 Jun 2001 20:37:18 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-postgresql.xql 1 Dec 2001 22:25:58 -0000 1.2
@@ -42,14 +42,12 @@
tree_level(m.tree_sortkey) - 1 as thread_depth,
acs_permission__permission_p(m.message_id, :user_id,
'bboard_write_message') as write_p
- from acs_messages_all m, persons p
- where m.tree_sortkey like (select tree_sortkey
- from acs_messages am
- where am.message_id = :message_id) || '/%'
+ from acs_messages_all m, acs_messages m2, persons p, bboard_forum_message_map bfmm
+ where m2.message_id = :message_id
+ and bfmm.forum_id = :forum_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey)
and p.person_id = m.sender
- and m.message_id in (select bfmm.message_id
- from bboard_forum_message_map bfmm
- where bfmm.forum_id = :forum_id)
+ and m.message_id = bfmm.message_id
order by m.sent_date
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-threaded-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-threaded-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-threaded-postgresql.xql 29 Jun 2001 20:37:18 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-threaded-postgresql.xql 1 Dec 2001 22:25:58 -0000 1.2
@@ -27,14 +27,12 @@
tree_level(m.tree_sortkey) - 1 as thread_depth,
acs_permission__permission_p(m.message_id, :user_id,
'bboard_write_message') as write_p
- from acs_messages_all m, persons p
- where m.tree_sortkey like (select tree_sortkey
- from acs_messages am
- where am.message_id = :message_id) || '/%'
+ from acs_messages_all m, persons p, acs_messages m2, bboard_forum_message_map bfmm
+ where m2.message_id = :message_id
+ and bfmm.forum_id = :forum_id
+ and m.tree_sortkey between m2.tree_sortkey and tree_right(m2.tree_sortkey)
and p.person_id = m.sender
- and m.message_id in (select bfmm.message_id
- from bboard_forum_message_map bfmm
- where bfmm.forum_id = :forum_id)
+ and m.message_id = bfmm.message_id
order by m.sent_date