Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/forums/forums.info	30 Sep 2003 05:19:19 -0000	1.18
+++ openacs-4/packages/forums/forums.info	3 Oct 2003 11:37:06 -0000	1.19
@@ -6,25 +6,24 @@
     <pretty-plural>Forums</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
-
-    <version name="1.0d1" url="http://openacs.org/repository/download/apm/forums-1.0d1.apm">
-    <database-support>
-        <database>oracle</database>
-        <database>postgresql</database>
-    </database-support>
+    
+    <version name="1.0d2" url="http://openacs.org/repository/download/apm/forums-1.0d2.apm">
         <owner url="mailto:ben@openforce.net">Ben Adida</owner>
         <summary>Online discussion boards with many configuration options.</summary>
+        <release-date>2003-10-03</release-date>
         <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is the new scalable datamodel. This package 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 automatic posting of incoming email.</description>
 
-        <provides url="forums" version="1.0d1"/>
+        <provides url="forums" version="1.0d2"/>
         <requires url="acs-mail-lite" version="0.1d"/>
         <requires url="notifications" version="4.6.2"/>
 
+        <callbacks>
+        </callbacks>
         <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayEmoticonsAsImagesP"  default="0" description="Automatically convert smileys like :-) and similar constructs to images when displaying messages in the browser."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_bgcolor"  default="#eeeeee" description="This is the color of the first message / table row"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="table_border_color"  default="#dddddd" description="The color of the table borders and between the cells, try #ffffff for a cool look"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_other_bgcolor"  default="#d9e4f9" description="The bgcolor for the other table rows"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_bgcolor"  default="#eeeeee" description="This is the color of the first message / table row"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayEmoticonsAsImagesP"  default="0" description="Automatically convert smileys like :-) and similar constructs to images when displaying messages in the browser."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/forums/sql/oracle/forums-search-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-search-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/sql/oracle/forums-search-create.sql	9 Aug 2002 20:51:49 -0000	1.5
+++ openacs-4/packages/forums/sql/oracle/forums-search-create.sql	3 Oct 2003 11:37:06 -0000	1.6
@@ -17,7 +17,7 @@
 --
 -- Support for searching of forum messages
 --
--- @author <a href="mailto:yon@openforce.net">yon@openforce.net</a>
+-- @author yon@openforce.net
 -- @creation-date 2002-07-01
 -- @version $Id$
 --
Index: openacs-4/packages/forums/www/search-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/search-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/search-oracle.xql	4 Dec 2002 09:46:40 -0000	1.3
+++ openacs-4/packages/forums/www/search-oracle.xql	3 Oct 2003 11:37:07 -0000	1.4
@@ -8,6 +8,41 @@
             select forums_messages.*,
                    person.name(forums_messages.user_id) as user_name,
                    to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
+                   100 as the_score
+            from   forums_messages,
+                   forums_forums
+            where  forums_messages.forum_id = forums_forums.forum_id
+            and    forums_forums.package_id = :package_id
+            and    forums_messages.state = 'approved'
+            and    upper(forums_messages.subject || ' ' || dbms_lob.substr(forums_messages.content) || ' ' || person.name(forums_messages.user_id))
+                       like '%' || upper(:search_text) || '%'
+            order  by forums_messages.posting_date desc
+        </querytext>
+    </fullquery>
+
+    <fullquery name="search_one_forum">
+        <querytext>
+            select forums_messages.*,
+                   person.name(forums_messages.user_id) as user_name,
+                   to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
+                   100 as the_score
+            from   forums_messages,
+                   forums_forums
+            where  forums_forums.forum_id = :forum_id
+            and    forums_forums.package_id = :package_id
+            and    forums_messages.forum_id = forums_forums.forum_id
+            and    forums_messages.state = 'approved'
+            and    upper(forums_messages.subject || ' ' || dbms_lob.substr(forums_messages.content) || ' ' || person.name(forums_messages.user_id))
+                       like '%' || upper(:search_text) || '%'
+            order  by forums_messages.posting_date desc
+        </querytext>
+    </fullquery>
+
+    <fullquery name="search_all_forums_intermedia">
+        <querytext>
+            select forums_messages.*,
+                   person.name(forums_messages.user_id) as user_name,
+                   to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    score(1) as the_score
             from forums_messages,
                  forums_forums
@@ -20,7 +55,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="search_one_forum">
+    <fullquery name="search_one_forum_intermedia">
         <querytext>
             select forums_messages.*,
                    person.name(forums_messages.user_id) as user_name,
Index: openacs-4/packages/forums/www/search-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/search-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/search-postgresql.xql	3 Oct 2003 10:33:26 -0000	1.5
+++ openacs-4/packages/forums/www/search-postgresql.xql	3 Oct 2003 11:37:07 -0000	1.6
@@ -9,15 +9,14 @@
                    person__name(forums_messages.user_id) as user_name,
                    to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    100 as the_score
-            from forums_messages,
-                 forums_forums
-            where forums_messages.forum_id = forums_forums.forum_id
-            and forums_forums.package_id = :package_id
-            and forums_messages.state = 'approved'
-            and upper(forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id))
-                like '%' || upper(:search_text) || '%'
-            order by the_score desc,
-                     forums_messages.posting_date desc
+            from   forums_messages,
+                   forums_forums
+            where  forums_messages.forum_id = forums_forums.forum_id
+            and    forums_forums.package_id = :package_id
+            and    forums_messages.state = 'approved'
+            and    upper(forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id))
+                       like '%' || upper(:search_text) || '%'
+            order  by forums_messages.posting_date desc
         </querytext>
     </fullquery>
 
@@ -27,16 +26,15 @@
                    person__name(forums_messages.user_id) as user_name,
                    to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    100 as the_score
-            from forums_messages,
-                 forums_forums
-            where forums_forums.forum_id = :forum_id
-            and forums_forums.package_id = :package_id
-            and forums_messages.forum_id = forums_forums.forum_id
-            and forums_messages.state = 'approved'
-            and upper(forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id))
-                like '%' || upper(:search_text) || '%'
-            order by the_score desc,
-                     forums_messages.posting_date desc
+            from   forums_messages,
+                   forums_forums
+            where  forums_forums.forum_id = :forum_id
+            and    forums_forums.package_id = :package_id
+            and    forums_messages.forum_id = forums_forums.forum_id
+            and    forums_messages.state = 'approved'
+            and    upper(forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id))
+                       like '%' || upper(:search_text) || '%'
+            order  by forums_messages.posting_date desc
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/forums/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/search.adp	22 May 2003 14:56:35 -0000	1.5
+++ openacs-4/packages/forums/www/search.adp	3 Oct 2003 11:37:07 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Search_Forums#</property>
-<property name="context">@context;noquote@</property>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
 <center>
 
Index: openacs-4/packages/forums/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/forums/www/search.tcl	20 Jun 2003 15:24:24 -0000	1.11
+++ openacs-4/packages/forums/www/search.tcl	3 Oct 2003 11:37:07 -0000	1.12
@@ -45,9 +45,9 @@
     set messages:rowcount 0
 }
 
-set context [list [_ forums.Search_1]]
+set page_title [_ forums.Search_Forums]
+set context [list $page_title]
 
-ad_return_template