Index: openacs-4/packages/news/tcl/news-callback-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/Attic/news-callback-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/news/tcl/news-callback-procs-postgresql.xql	13 Jun 2005 14:52:43 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="callback::search::url::impl::news.select_news_package_url">
+        <querytext>
+            select site_node__url(min(node_id))
+            from site_nodes
+            where object_id = :package_id
+        </querytext>
+    </fullquery>
+</queryset>
Index: openacs-4/packages/news/tcl/news-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-callback-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/news/tcl/news-callback-procs.tcl	13 Jun 2005 14:52:43 -0000	1.1
@@ -0,0 +1,106 @@
+ad_library {
+    Callbacks for search package.
+
+    @author Dirk Gomez <openacs@dirkgomez.de>
+    @creation-date 2005-06-12
+    @cvs-id $Id: news-callback-procs.tcl,v 1.1 2005/06/13 14:52:43 dirkg Exp $
+}
+
+##################
+# Search callbacks
+##################
+
+
+ad_proc -public -callback search::datasource -impl news {} {
+
+    @author openacs@dirkgomez.de
+    @creation_date 2005-06-13
+
+    returns a datasource for the search package
+    this is the content that will be indexed by the full text
+    search engine.
+
+} {
+    # Dirk Gomez: This needs to be refactored urgently, best when
+    # somebody touches the news package anyway.  I copied this
+    # straight from packages/news/lib/item.tcl. This page should be
+    # put into a proc and then the search callback needs to be
+    # refactored to make use of the new proc.
+
+    set item_id $object_id
+
+    set item_exist_p [db_0or1row one_item "
+      select item_id,
+       live_revision,
+       publish_title,
+       publish_lead,
+       html_p,
+       publish_date,
+       creation_user,
+       item_creator,
+       publish_body
+         from   news_items_live_or_submitted
+         where  item_id = :item_id"]
+        
+    if { $item_exist_p } {
+	
+	# workaround to get blobs with >4000 chars into a var, content.blob_to_string fails! 
+	# when this'll work, you get publish_body by selecting 'publish_body' directly from above view
+	#
+	# RAL: publish_body is already snagged in the 1st query above for postgres.
+	#
+	set get_content [db_map get_content]
+	if {![string match "" $get_content]} {
+	    set publish_body [db_string get_content "select  content
+	      from    cr_revisions
+	      where   revision_id = :live_revision"]
+	}
+	
+	# text-only body
+	if {[info exists html_p] && [string equal $html_p "f"]} {
+	    set publish_body [ad_text_to_html -- $publish_body]
+	}
+	
+	if { [ad_parameter SolicitCommentsP "news" 0]} {
+	    set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 \
+			      $item_id "[ad_conn package_url]item?item_id=$item_id"]
+	} else {
+	    set comments ""
+	}
+	
+	# This is new, refactor everything above (Dirk Gomez)
+	set combined_content "$publish_title\n"
+	append combined_content "$publish_body\n"
+	append combined_content "$comments\n"
+	
+    } else {
+	set combined_content ""
+	set publish_title ""
+    }
+
+    return [list object_id $object_id \
+                title $publish_title \
+                content $combined_content \
+                keywords {} \
+                storage_type text \
+                mime text/plain ]
+}
+
+ad_proc -public -callback search::url -impl news {} {
+
+    @author openacs@dirkgomez.de
+    @creation_date 2005-06-13
+
+    returns a url for a calendar item to the search package
+
+} {
+    db_1row get {
+        select
+        package_id
+        from news_items_live_or_submitted
+        where item_id = :object_id
+        or item_id = (select item_id from cr_revisions where revision_id = :object_id)}
+
+    return "[ad_url][db_string select_news_package_url {}]item?item_id=$object_id"
+}
+