Index: openacs-4/packages/forums/lib/search/search-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk-oracle.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/forums/lib/search/search-chunk-oracle.xql 27 Jan 2018 17:01:38 -0000 1.4
+++ openacs-4/packages/forums/lib/search/search-chunk-oracle.xql 15 Jun 2018 20:55:28 -0000 1.5
@@ -6,36 +6,18 @@
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 (:forum_id is null or forums_forums.forum_id = :forum_id)
+ and forums_messages.state = 'approved'
and upper(forums_messages.subject || ' ' || dbms_lob.substr(forums_messages.content,2500) || ' ' || person.name(forums_messages.user_id))
like upper(:search_pattern)
order by forums_messages.posting_date desc
-
-
- 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,3500) || ' ' || person.name(forums_messages.user_id))
- like upper(:search_pattern)
- order by forums_messages.posting_date desc
-
-
-