Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.25.2.2 -r1.25.2.3 --- openacs-4/packages/forums/forums.info 3 Jul 2004 22:48:05 -0000 1.25.2.2 +++ openacs-4/packages/forums/forums.info 6 Jul 2004 15:54:52 -0000 1.25.2.3 @@ -7,16 +7,16 @@ f f - + OpenACS Online discussion forums. 2003-11-10 OpenACS This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email. - + - + Index: openacs-4/packages/forums/sql/postgresql/forums-messages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-messages-create.sql,v diff -u -r1.9.4.3 -r1.9.4.4 --- openacs-4/packages/forums/sql/postgresql/forums-messages-create.sql 2 Jul 2004 18:20:02 -0000 1.9.4.3 +++ openacs-4/packages/forums/sql/postgresql/forums-messages-create.sql 6 Jul 2004 15:54:52 -0000 1.9.4.4 @@ -58,19 +58,19 @@ create index forums_messages_parent_id_idx on forums_messages(parent_id); create index forum_messages_date_idx on forums_messages (forum_id, posting_date); -create view forums_messages_approved +create or replace view forums_messages_approved as select * from forums_messages where state = 'approved'; -create view forums_messages_pending +create or replace view forums_messages_pending as select * from forums_messages where state= 'pending'; -create function inline_0 () +create or replace function inline_0 () returns integer as ' begin perform acs_object_type__create_type( Index: openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0d4-1.0.1d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0d4-1.0.1d2.sql,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0d4-1.0.1d2.sql 30 Jun 2004 20:43:10 -0000 1.1.2.3 +++ openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0d4-1.0.1d2.sql 6 Jul 2004 15:54:52 -0000 1.1.2.4 @@ -1,8 +1,6 @@ alter table forums_messages add format varchar(30); alter table forums_messages alter column format set default 'text/plain'; - alter table forums_messages add constraint forums_mess_format_ck check (format in ('text/enhanced', 'text/plain', 'text/fixed-width', 'text/html')); -alter table forums_messages drop column html_p; update forums_messages set format = 'text/html' @@ -11,6 +9,22 @@ set format = 'text/plain' where html_p = 'f'; +alter table forums_messages drop column html_p cascade; + +-- recreate the views +create or replace view forums_messages_approved +as + select * + from forums_messages + where state = 'approved'; + +create or replace view forums_messages_pending +as + select * + from forums_messages + where state= 'pending'; + + -- taken from forums-messages-package-create.sql select define_function_args ('forums_message__new', 'message_id,object_type;forums_message,forum_id,subject,content,format,user_id,posting_date,state,parent_id,creation_date,creation_user,creation_ip,context_id'); Index: openacs-4/packages/forums/tcl/forums-email-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-email-procs.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/forums/tcl/forums-email-procs.tcl 18 Mar 2004 15:55:04 -0000 1.1.2.1 +++ openacs-4/packages/forums/tcl/forums-email-procs.tcl 6 Jul 2004 15:54:52 -0000 1.1.2.2 @@ -29,11 +29,7 @@ append new_body "[_ forums.email_alert_body_header] [_ forums.Forum_1] $message(forum_name) Thread: $message(root_subject)\n\n" - if {$message(html_p)} { - append new_body "[ad_html_to_text -- $message(content)]" - } else { - append new_body $message(content) - } + append new_body [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)] append new_body "\n\n-- \n[ad_url][ad_conn package_url]message-view?[export_vars -anchor $message(message_id) [list [list message_id $message(root_message_id)]]]\n" Index: openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql 1 Sep 2003 22:22:14 -0000 1.1 +++ openacs-4/packages/forums/tcl/forums-sc-procs-postgresql.xql 6 Jul 2004 15:54:52 -0000 1.1.4.1 @@ -25,7 +25,7 @@ - select subject, content, html_p + select subject, content, format from forums_messages where message_id=:message_id or (tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)) and forum_id=:forum_id Index: openacs-4/packages/forums/tcl/forums-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-sc-procs.tcl,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/forums/tcl/forums-sc-procs.tcl 7 Nov 2003 17:43:33 -0000 1.3 +++ openacs-4/packages/forums/tcl/forums-sc-procs.tcl 6 Jul 2004 15:54:52 -0000 1.3.4.1 @@ -61,13 +61,9 @@ # different subject append combined_content "$subject\n\n" } - - if { $html_p } { - append combined_content [ad_html_to_text -showtags -- $content] - } else { - append combined_content $content - } + append combined_content [ad_html_text_convert -from $format -to text/plain -- $content] + # In case this text is not only used for indexing but also for display, beautify it append combined_content "\n\n" } Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.24.2.3 -r1.24.2.4 --- openacs-4/packages/forums/tcl/messages-procs.tcl 25 Jun 2004 15:34:08 -0000 1.24.2.3 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 6 Jul 2004 15:54:52 -0000 1.24.2.4 @@ -69,20 +69,16 @@ {-message_id:required} } { # Select all the important information - get -message_id $message_id -array message + forum::message::get -message_id $message_id -array message set forum_id $message(forum_id) set url "[ad_url][db_string select_forums_package_url {}]" set attachments [attachments::get_attachments -object_id $message(message_id)] - if {$message(html_p) == "t"} { - set message_html $message(content) - set message_text [ad_html_text_convert -from html -to text $message(content)] - } else { - set message_text $message(content) - set message_html [ad_html_text_convert -from text -to html $message(content)] - } + set message_text [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)] + set message_html [ad_html_text_convert -from $message(format) -to text/html -- $message(content)] + set html_version "" append html_version "Forum: $message(forum_name)
\n" append html_version "Thread: $message(root_subject)
\n"