Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/search/www/search.adp	4 Jun 2006 00:45:56 -0000	1.9
+++ openacs-4/packages/search/www/search.adp	21 Oct 2006 07:28:20 -0000	1.10
@@ -1,11 +1,12 @@
 <master>
-<include src="/packages/dotlrn/www/dotlrn-search">
+<if @dotlrn_p@ true><include src="/packages/dotlrn/www/dotlrn-search"></if>
 <if @t@ eq "Search">
   <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
-</if>
-  <if @empty_p@ true>
+  </if>
+<if @empty_p@ true>
     <p class="hint">#search.lt_You_must_specify_some#</p>
-  </if><else>
+</if>
+<else>
 	<if @and_queries_notice_p@ eq 1>
       	  <font color=6f6f6f>
           #search.The#
@@ -25,22 +26,23 @@
       	  </font>
 	</if>
 
-<multiple name="searchresult">
+   <multiple name="searchresult">
 	<if @searchresult.title_summary@ nil>
   		<a href="@searchresult.url_one@">#search.Untitled#</a><br>
 	</if>	
 	<else>
 	  <a href="@searchresult.url_one@">@searchresult.title_summary;noquote@</a><br>
 	</else>
+
 	<if @searchresult.txt_summary@ nil>	
 	</if>
 	<else>	
 	@searchresult.txt_summary;noquote@<br>	
 	</else>
 	<font color=green>@searchresult.url_one@</font><br><br>
-</multiple>
+   </multiple>
 
-<if @count@ eq 0>
+  <if @count@ eq 0>
   Your search - <b>@query@</b> - did not match any content.
   <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
   <br><br>#search.Suggestions#
@@ -52,8 +54,8 @@
       <li>#search.Try_fewer_keywords#
     </if>
   </ul>
-</if>
-<else>
+  </if>
+  <else>
   <table width=100% bgcolor=3366cc border=0 cellpadding=3 cellspacing=0>
     <tr><td>
       <font color=white>
@@ -66,7 +68,7 @@
     </td></tr>
   </table>
   <br clear=all>
-</else>
+  </else>
 
 <if @from_result_page@ lt @to_result_page@>
   <center>
@@ -85,7 +87,17 @@
 </if>
 <if @count@ gt 0>
   <center>
-  <include src="/packages/dotlrn/www/dotlrn-search">
+  <if @dotlrn_p@>
+    <include src="/packages/dotlrn/www/dotlrn-search">
+  </if>
+  <else>
+      <div>
+        <form method="get" action="search">
+          <input type="text" name="q" size="60" maxlength="256" value="@query@" />
+          <input type="submit" value="#search.Search#" />
+        </form>
+      </div>
+  </else>
   </center>
 
   <if @stw@ not nil>
@@ -104,61 +116,11 @@
     <if @nstopwords@ gt 1>
       <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
     </if>
-
-    <multiple name="searchresult">
-      <div class="result">
-        <if @searchresult.title_summary@ nil>
-          <a href="@searchresult.url_one@">#search.Untitled#</a>
-        </if>
-        <else>
-          <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>
-        </if>
-        <div class="url">@searchresult.url_one@</div>
-      </div>
-    </multiple>
-
-    <if @count@ eq 0>
-      <p>#search.lt_No_pages_were_found_c#</p>
-      <p>#search.Suggestions#</p>
-      <ul>
-        <li>#search.lt_Make_sure_all_words_a#</li>
-        <li>#search.lt_Try_different_keyword#</li>
-        <li>#search.lt_Try_more_general_keyw#</li>
-        <if @nquery@ gt 2>
-          <li>#search.Try_fewer_keywords#</li>
-        </if>
-      </ul>
-    </if>
-    <else>
+    
+    <if @debug_p@>
       <p>#search.Searched_for_query#</p>
       <p>#search.Results_count#</p>
-    </else>
-
-    <if @from_result_page@ lt @to_result_page@>
-      <div class="search-pages">
-        #search.Result_page#
-        <if @from_result_page@ lt @current_result_page@>
-          <a href="@url_previous@">#search.Previous#</a>
-        </if>
-        &nbsp;@choice_bar;noquote@&nbsp;
-        <if @current_result_page@ lt @to_result_page@>
-          <a href="@url_next@">#search.Next#</a>
-        </if>
-      </div>
     </if>
-    <if @count@ gt 0>
-      <div>
-        <form method="get" action="search">
-          <input type="text" name="q" size="60" maxlength="256" value="@query@" />
-          <input type="submit" value="#search.Search#" />
-        </form>
-      </div>
 
-      <if @stw@ not nil>
-        <p>#search.lt_Try_your_query_on_stw#</p>
-      </if>
     </if>
   </else>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/search/www/search.tcl	20 Oct 2006 21:04:49 -0000	1.21
+++ openacs-4/packages/search/www/search.tcl	21 Oct 2006 07:28:20 -0000	1.22
@@ -24,6 +24,10 @@
 set context results
 set context_base_url $package_url
 
+# Do we want debugging information at the end of the page
+set debug_p 0
+
+set dotlrn_p [apm_package_installed_p "dotlrn"]
 set user_id [ad_conn user_id]
 set driver [ad_parameter -package_id $package_id FtsEngineDriver]
 if {[callback::impl_exists -impl $driver -callback search::driver_info]} {
@@ -33,14 +37,17 @@
     array set info [acs_sc_call FtsEngineDriver info [list] $driver]
 }
 
-#set dotlrn_package_id [dotlrn::get_package_id]
-#set is_guest_p [search::is_guest_p]
+if {$dotlrn_p} {
+    set dotlrn_package_id [dotlrn::get_package_id]
+    set is_guest_p [search::is_guest_p]
 
-# Ugly .LRNism: guests must not search for people. Here's the security
-# check that makes sure they cannot fiddle around with the URL
-#if {$is_guest_p && [string equal $object_type "phb_person"]} {
-#    ad_return_error "Security Breakin!" "Security Alert. This incident has been logged."
-#}
+    # Ugly .LRNism: guests must not search for people. Here's the security
+    # check that makes sure they cannot fiddle around with the URL
+    if {$is_guest_p && [string equal $object_type "phb_person"]} {
+	ad_return_error "Security Breakin!" "Security Alert. This incident has been logged."
+    }
+}
+
 if { [array get info] == "" } {
     ReturnHeaders
     ns_write "[_ search.lt_FtsEngineDriver_not_a]"
@@ -170,7 +177,7 @@
 	array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
 	set url_one [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
     }
-    search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type)
+    search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type) $object_id
     if {[callback::impl_exists -impl $driver -callback search::summary]} {
 	set title_summary [lindex [callback -impl $driver search::summary -query $q -text $datasource(title)] 0]
 	set txt_summary [lindex [callback -impl $driver search::summary -query $q -text $txt] 0]