Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/search/www/search.adp	10 Mar 2005 01:42:14 -0000	1.7
+++ openacs-4/packages/search/www/search.adp	23 May 2005 16:57:04 -0000	1.7.2.1
@@ -49,7 +49,7 @@
           <a href="@searchresult.url_one@">#search.Untitled#</a>
         </if>
         <else>
-          <div class="title"><a href="@searchresult.url_one@">@searchresult.title_summary;noquote@</a></div>
+          <div class="title"><a href="@searchresult.url_one@">@searchresult.title_summary;noquote@</a><!-- @searchresult.object_id@ --> </div>
         </else>
         <if @searchresult.txt_summary@ not nil>	
           <div class="search-match">@searchresult.txt_summary;noquote@</div>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/search/www/search.tcl	27 Mar 2005 16:04:31 -0000	1.17
+++ openacs-4/packages/search/www/search.tcl	23 May 2005 16:57:04 -0000	1.17.2.1
@@ -76,7 +76,7 @@
 if {[ad_parameter -package_id $package_id SubsiteSearchP -default 1]
     && [subsite::main_site_id] != [ad_conn subsite_id]} {
     # We are in a subsite and SubsiteSearchP is true
-    lappend params [subsite::util::packages -node_id [ad_conn node_id]]
+    lappend params [concat [ad_conn subsite_id] [subsite::util::packages -node_id [ad_conn node_id]]]
 } else { 
     lappend params {}    
 }
@@ -115,7 +115,7 @@
 set nstopwords [llength $result(stopwords)] 
 set count $result(count)
 
-template::multirow create searchresult title_summary txt_summary url_one
+template::multirow create searchresult title_summary txt_summary url_one object_id
 
 for { set __i 0 } { $__i < [expr $high - $low +1] } { incr __i } {
 
@@ -127,7 +127,7 @@
     set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
     set url_one [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
 
-    template::multirow append searchresult $title_summary $txt_summary $url_one
+    template::multirow append searchresult $title_summary $txt_summary $url_one $object_id
 }