Index: openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	12 Jun 2002 15:24:02 -0000	1.4
+++ openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	19 Jun 2002 15:11:46 -0000	1.5
@@ -93,7 +93,7 @@
            from forums_messages where message_id= p_message_id;
 
            select message_id into v_message_id from forums_messages where forum_id= v_forum_id
-           and tree_sortkey= tree__ancestor_key(v_sortkey, 1);
+           and tree_sortkey= tree_ancestor_key(v_sortkey, 1);
 
            return v_message_id;
 END;
@@ -111,7 +111,7 @@
            from forums_messages where message_id= p_message_id;
 
            update forums_messages set open_p=''t''
-           where tree_sortkey between tree__left(v_sortkey) and tree__right(v_sortkey)
+           where tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
            and forum_id = v_forum_id;
 
            update forums_messages set open_p=''t''
@@ -133,7 +133,7 @@
            from forums_messages where message_id= p_message_id;
 
            update forums_messages set open_p=''f''
-           where tree_sortkey between tree__left(v_sortkey) and tree__right(v_sortkey)
+           where tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
            and forum_id = v_forum_id;
 
            update forums_messages set open_p=''f''
@@ -178,8 +178,8 @@
            FOR v_message in
            (select * from forums_messages
            where forum_id = v_forum_id and 
-           tree_sortkey between tree__left(v_sortkey) 
-           and tree__right(v_sortkey) order by tree_sortkey desc)
+           tree_sortkey between tree_left(v_sortkey) 
+           and tree_right(v_sortkey) order by tree_sortkey desc)
            LOOP
                 perform forums_message__delete(v_message.message_id);
            END LOOP;
Index: openacs-4/packages/forums/www/forum-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/forum-view-postgresql.xql	3 Jun 2002 16:39:56 -0000	1.2
+++ openacs-4/packages/forums/www/forum-view-postgresql.xql	19 Jun 2002 15:11:46 -0000	1.3
@@ -13,7 +13,7 @@
                    (select count(fm1.*)
                     from forums_messages_approved fm1
                     where fm1.forum_id = :forum_id
-                    and fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
+                    and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages_approved fm,
                  acs_objects
@@ -35,7 +35,7 @@
                    (select count(fm1.*)
                     from forums_messages fm1
                     where fm1.forum_id = :forum_id
-                    and fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
+                    and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages fm,
                  acs_objects
Index: openacs-4/packages/forums/www/index-postresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/index-postresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/index-postresql.xql	3 Jun 2002 04:39:05 -0000	1.1
+++ openacs-4/packages/forums/www/index-postresql.xql	19 Jun 2002 15:11:46 -0000	1.2
@@ -9,7 +9,7 @@
                    (select count(*)
                     from forums_messages
                     where forums_messages.forum_id = forums_forums_enabled.forum_id
-                    and 1 = tree__tree_level(forums_messages.tree_sortkey)) as n_threads,
+                    and 1 = tree_level(forums_messages.tree_sortkey)) as n_threads,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_forums_enabled,
                  acs_objects
Index: openacs-4/packages/forums/www/message-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/message-view-postgresql.xql	3 Jun 2002 04:39:05 -0000	1.2
+++ openacs-4/packages/forums/www/message-view-postgresql.xql	19 Jun 2002 15:11:46 -0000	1.3
@@ -10,12 +10,12 @@
                    content,
                    person__name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree__tree_level(tree_sortkey) as tree_level,
+                   tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
             from forums_messages_approved
             where forum_id = :forum_id
-            and tree_sortkey between tree__left(:tree_sortkey) and tree__right(:tree_sortkey)
+            and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order by tree_sortkey
         </querytext>
     </fullquery>
@@ -27,12 +27,12 @@
                    content,
                    person__name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree__tree_level(tree_sortkey) as tree_level,
+                   tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
             from forums_messages_approved
             where forum_id = :forum_id
-            and tree_sortkey between tree__left(:tree_sortkey) and tree__right(:tree_sortkey)
+            and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order by posting_date, tree_sortkey
         </querytext>
     </fullquery>
@@ -44,12 +44,12 @@
                    content,
                    person__name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree__tree_level(tree_sortkey) as tree_level,
+                   tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
             from forums_messages
             where forum_id = :forum_id
-            and tree_sortkey between tree__left(:tree_sortkey) and tree__right(:tree_sortkey)
+            and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order by tree_sortkey
         </querytext>
     </fullquery>
@@ -61,12 +61,12 @@
                    content,
                    person__name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree__tree_level(tree_sortkey) as tree_level,
+                   tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
             from forums_messages
             where forum_id = :forum_id
-            and tree_sortkey between tree__left(:tree_sortkey) and tree__right(:tree_sortkey)
+            and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
             order by posting_date, tree_sortkey
         </querytext>
     </fullquery>