Index: openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.tcl 4 Mar 2009 16:24:20 -0000 1.3 +++ openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.tcl 24 Sep 2011 00:59:54 -0000 1.4 @@ -17,9 +17,13 @@ search engine. } { + set element_id [content_includelet_utilities::get_element_id -object_id $object_id] + set page_id [layout::element::get_column_value -element_id $element_id -column page_id] + set title [layout::page::get_column_value -page_id $page_id -column name] + db_1row datasource { } return [list object_id $object_id \ - title "" \ + title $title \ content $data \ relevant_date $publish_date \ storage_type text \ @@ -36,7 +40,7 @@ } { db_1row node_id {} - db_1row element_id {} + set element_id [content_includelet_utilities::get_element_id -object_id $object_id] set page_id [layout::element::get_column_value -element_id $element_id -column page_id] array set page [layout::page::get -page_id $page_id] set base [site_node::get_element -node_id $node_id -element url] Index: openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.xql 4 Mar 2009 13:44:47 -0000 1.2 +++ openacs-4/packages/content-includelet/tcl/content-includelet-callback-procs.xql 24 Sep 2011 00:59:54 -0000 1.3 @@ -21,14 +21,4 @@ - - - select p.element_id - from layout_element_parameters p, cr_revisions r - where r.revision_id = :object_id - and p.key like '%_id' - and p.value::integer = r.item_id - - - Index: openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.tcl 30 Aug 2008 00:31:48 -0000 1.4 +++ openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.tcl 24 Sep 2011 00:59:54 -0000 1.5 @@ -9,6 +9,12 @@ namespace eval content_includelet_utilities {} +ad_proc content_includelet_utilities::get_element_id { + -object_id:required +} { + return [db_string element_id {}] +} + ad_proc content_includelet_utilities::configure_content_id { element_id {parameter content_id} Index: openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.xql 21 Aug 2008 01:24:40 -0000 1.1 +++ openacs-4/packages/content-includelet/tcl/content-includelet-utility-procs.xql 24 Sep 2011 00:59:54 -0000 1.2 @@ -2,6 +2,16 @@ + + + select p.element_id + from layout_element_parameters p, cr_revisions r + where r.revision_id = :object_id + and p.key like '%_id' + and p.value::integer = r.item_id + + + select item_id