Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/search/search.info	13 Jan 2005 13:58:41 -0000	1.20
+++ openacs-4/packages/search/search.info	2 Feb 2005 21:18:02 -0000	1.21
@@ -26,7 +26,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FtsEngineDriver"  default="openfts-driver" description="Which search engine driver to use? You should enter the name of the related binding (e.g. openfts-driver, swish-driver,...)"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="LimitDefault"  default="10" description="Default limit value"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SearchIndexerInterval"  default="30" description="SearchIndexerInterval"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SearchTheWeb"  default="http://av.com/sites/search/web?q=%s AltaVista http://search.excite.com/search.gw?s=%s Excite http://www.google.com/search?q=%s Google http://hotbot.com/?MT=%s HotBot http://lycos.com/cgi-bin/pursuit?query=%s Lycos http://search.yahoo.com/search?p=%s Yahoo!" description="Search the Web (e.g. Google)"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SearchTheWeb"  default="http://av.com/sites/search/web?q=%s AltaVista http://msxml.excite.com/info.xcite/search/web/%s Excite http://www.google.com/search?q=%s Google http://hotbot.com/?MT=%s HotBot http://search.yahoo.com/search?p=%s Yahoo!" description="Search the Web (e.g. Google)"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Symbol2Interval"  default="m3 {3 month ago} m6 {6 month ago} y1 {1 year ago}" description="Translate symbol to date interval."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="Syndicate"  default="0" description="Should syndication data be stored when indexing for search."/>
         </parameters>
Index: openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	1 Feb 2005 21:06:49 -0000	1.2
+++ openacs-4/packages/search/catalog/search.en_US.ISO-8859-1.xml	2 Feb 2005 21:18:03 -0000	1.3
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="search" package_version="5.1.3" locale="en_US" charset="ISO-8859-1">
 
-  <msg key="________Search_took">.
-        Search took</msg>
   <msg key="Advanced_Search">Advanced Search</msg>
   <msg key="advanced_search">&quot;advanced search&quot;</msg>
+  <msg key="and_not_needed">The &quot;&lt;b&gt;AND&lt;/b&gt;&quot; operator is unnecessary -- we include all search terms by default.</msg>
   <msg key="anytime">anytime</msg>
   <msg key="Date_Range">Date Range</msg>
   <msg key="details">details</msg>
   <msg key="Feeling_Lucky">Feeling Lucky</msg>
   <msg key="lt_bstopwordsb_is_a_very">&quot;&lt;b&gt;%stopwords%&lt;/b&gt;&quot; is a very common word and was not included in your search.</msg>
   <msg key="lt_FtsEngineDriver_not_a">FtsEngineDriver not available!</msg>
   <msg key="lt_Make_sure_all_words_a">Make sure all words are spelled correctly.</msg>
-  <msg key="lt_No_pages_were_found_c">No pages were found containing &quot;</msg>
-  <msg key="lt_The_following_words_a">The following words are very common and were not included in your search:</msg>
-  <msg key="lt_Tip_In_most_browsers_">Tip: In most browsers you can just hit the return key instead of clicking on the search button.</msg>
+  <msg key="lt_No_pages_were_found_c">No pages were found containing &quot;&lt;b>%query%&lt;/b>&quot;.</msg>
+  <msg key="lt_The_following_words_a">The following words are very common and were not included in your search: &lt;strong&gt;%stopwords;noquote%&lt;/strong&gt;.</msg>
   <msg key="lt_Try_different_keyword">Try different keywords.</msg>
   <msg key="lt_Try_more_general_keyw">Try more general keywords.</msg>
   <msg key="lt_Try_your_query_on_stw">Try your query on: %stw;noquote%</msg>
   <msg key="lt_You_must_specify_some">You must specify some keywords</msg>
-  <msg key="nbspDisplay">&amp;nbsp;Display</msg>
+  <msg key="Display">Display</msg>
   <msg key="Next">Next</msg>
+  <msg key="no_driver_contact_webmaster">Search is not currently configured.  Please contact the webmaster to enable it.</msg>
   <msg key="of_about">of about</msg>
   <msg key="past_3_months">past 3 months</msg>
   <msg key="past_6_months">past 6 months</msg>
   <msg key="past_year">past year</msg>
   <msg key="Previous">Previous</msg>
   <msg key="Result_page">Result page:</msg>
-  <msg key="Results">Results</msg>
+  <msg key="Results_count">Results &lt;b&gt;%low% - %high%&lt;/b&gt; of about &lt;b&gt;%count%&lt;/b&gt;. Search took %elapsed% seconds.</msg>
   <msg key="results">results</msg>
   <msg key="Search">Search</msg>
-  <msg key="Searched_for_query">Searched for: %query%</msg>
+  <msg key="Searched_for_query">Searched for: &lt;b&gt;%query%&lt;/b&gt;</msg>
   <msg key="seconds">seconds.</msg>
   <msg key="selected">selected</msg>
   <msg key="Suggestions">Suggestions:</msg>
-  <msg key="The">&quot;&lt;b&gt;AND&lt;/b&gt;&quot; operator is unnecessary -- we include all search terms by default.</msg>
+  <msg key="Tip_In_most_browsers_return">Tip: In most browsers you can just hit the return key instead of clicking on the search button.</msg>
   <msg key="Try_fewer_keywords">Try fewer keywords.</msg>
   <msg key="Untitled">Untitled</msg>
 </message_catalog>
Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/search/tcl/search-procs.tcl	27 Jul 2004 10:49:10 -0000	1.15
+++ openacs-4/packages/search/tcl/search-procs.tcl	2 Feb 2005 21:18:03 -0000	1.16
@@ -65,6 +65,7 @@
     if {[empty_string_p $driver]
         || ! [acs_sc_binding_exists_p FtsEngineDriver $driver]} {
         # Nothing to do if no driver
+        ns_log Debug "search::indexer: driver=$driver binding exists? [acs_sc_binding_exists_p FtsEngineDriver $driver]"
         return
     }
 
@@ -77,8 +78,8 @@
                     set object_type [acs_object_type $object_id]
                     if {[acs_sc_binding_exists_p FtsContentProvider $object_type]} {
                         array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
-                        if {$syndicate} { 
-                            search::syndicate -array datasource
+                        if {$syndicate} {
+                            search::syndicate -datasource datasource
                         }
                         search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type)
                         acs_sc_call FtsEngineDriver index [list $datasource(object_id) $txt $datasource(title) $datasource(keywords)] $driver
Index: openacs-4/packages/search/www/advanced-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/search/www/advanced-search.adp	13 Jan 2005 13:58:41 -0000	1.3
+++ openacs-4/packages/search/www/advanced-search.adp	2 Feb 2005 21:18:03 -0000	1.4
@@ -1,25 +1,24 @@
 <master>
-<property name="title">#search.Advanced_Search#</property>
-<property name="context">"advanced search"</property>
+  <property name="title">#search.Advanced_Search#</property>
+  <property name="context">"advanced search"</property>
 
-<form method=GET action=search>
-<input type=text name=q size=41 maxlength=256 value="@q@">
-<input type=submit value="Search" name=t>
-<br>
-#search.Date_Range#
-<select name=dfs>
-  <option value=all> #search.anytime#
-  <option value=m3> #search.past_3_months#
-  <option value=m6> #search.past_6_months#
-  <option value=y1> #search.past_year#
-</select>
-#search.nbspDisplay#
-<select name=num>
- <option value=10 <if @num@ eq 10>#search.selected#</if>>10 #search.results#
- <option value=20 <if @num@ eq 20>#search.selected#</if>>20 #search.results#
- <option value=30 <if @num@ eq 30>#search.selected#</if>>30 #search.results#
- <option value=50 <if @num@ eq 50>#search.selected#</if>>50 #search.results#
- <option value=100 <if @num@ eq 100>#search.selected#</if>>100 #search.results#
-</select>
-</form>
+  <form method="get" action="search">
+    <input type="text" name="q" size="41" maxlength="256" value="@q@"/>
+    <input type="submit" value="Search" name="t" />
+    #search.Date_Range#
+    <select name="dfs">
+      <option value="all"> #search.anytime#</option>
+      <option value="m3"> #search.past_3_months#</option>
+      <option value="m6"> #search.past_6_months#</option>
+      <option value="y1"> #search.past_year#</option>
+    </select>
+    #search.Display#
+    <select name="num">
+      <option value="10" <if @num@ eq 10>selected="selected"</if>>10 #search.results#</option>
+      <option value="20" <if @num@ eq 20>selected="selected"</if>>20 #search.results#</option>
+      <option value="30" <if @num@ eq 30>selected="selected"</if>>30 #search.results#</option>
+      <option value="50" <if @num@ eq 50>selected="selected"</if>>50 #search.results#</option>
+      <option value="100" <if @num@ eq 100>selected="selected"</if>>100 #search.results#</option>
+    </select>
+  </form>
 
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/search/www/index.adp	13 Jan 2005 13:58:41 -0000	1.4
+++ openacs-4/packages/search/www/index.adp	2 Feb 2005 21:18:03 -0000	1.5
@@ -1,16 +1,15 @@
 <master>
-<property name="title">#search.Search#</property>
-<property name="context">#search.Search#</property>
+  <property name="title">#search.Search#</property>
+  <property name="context">#search.Search#</property>
 
-<center>
-<form method=GET action=search>
-  <small>
-  <a href=advanced-search>#search.Advanced_Search#</a>
-  <br>
-  <input type=text name=q size=80 maxlength=256>
-  <br>
-  <input type=submit value="#search.Search#" name=t>
-  <input type=submit value="#search.Feeling_Lucky#" name=t>
-  </small>
-</form>
-</center>
+  <if @driver_p@ true> 
+    <form method="GET" action="search">
+      <input type="text" name="q" size="80" maxlength="256" />
+      <input type="submit" value="#search.Search#" name="t" />
+      <!--<input type="submit" value="#search.Feeling_Lucky#" name="t" />-->
+    </form>
+    <a href="advanced-search">#search.Advanced_Search#</a>
+  </if>
+  <else>
+    #search.no_driver_contact_webmaster#
+  </else>
Index: openacs-4/packages/search/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/search/www/index.tcl	20 Sep 2002 21:11:47 -0000	1.2
+++ openacs-4/packages/search/www/index.tcl	2 Feb 2005 21:18:03 -0000	1.3
@@ -1,2 +1,14 @@
-# Nothing to see here...
-ad_return_template
\ No newline at end of file
+ad_page_contract {
+    @author Jeff Davis <davis@xarg.net>
+    @creation-date 2005-02-01
+    @cvs-id $Id$
+} {}
+
+set driver [ad_parameter -package_id [ad_conn package_id] FtsEngineDriver]
+array set info [acs_sc_call FtsEngineDriver info [list] $driver]
+if { [array get info] == "" } {
+    # no driver present  need a warning.
+    set driver_p 0
+} else {
+    set driver_p 1
+}
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/search/www/search.adp	13 Jan 2005 13:58:41 -0000	1.4
+++ openacs-4/packages/search/www/search.adp	2 Feb 2005 21:18:03 -0000	1.5
@@ -1,115 +1,94 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context;noquote@</property>
-<form method=GET action=search>
-  <small>
-    <a href=@url_advanced_search@>#search.Advanced_Search#</a>
-    <br>
-    <input type=text name=q size=31 maxlength=256 value="@query@">
-    <input type=submit value="#search.Search#" name=t>
-    <input type=submit value="#search.Feeling_Lucky#" name=t>
-  </small>
-</form>
-<if @t@ eq "Search">
-  <i>#search.lt_Tip_In_most_browsers_#</i><br><br>
-</if>
+  <property name="title">@page_title@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="header_stuff">
+<style type="text/css">
+.hint {
+      font-style: italic;
+}
+.url {
+      color: green;
+}
+.result {
+      border-bottom: 1px solid black;
+      padding: 1em;
+}
+</style>
+</property>
 
-	<if @and_queries_notice_p@ eq 1>
-      	  <font color=6f6f6f>
-          #search.The#
-          [<a href=help/basics#and>#search.details#</a>]<br>
-        </font>
-	</if>
-	<if @nstopwords@ eq 1>
-        <font color=6f6f6f>
-          #search.lt_bstopwordsb_is_a_very#
-          [<a href=help/basics#stopwords>#search.details#</a>]<br>
-        </font>
-	</if>
-	<if @nstopwords@ gt 1>
-      	  <font color=6f6f6f>
-          #search.lt_The_following_words_a# <b>@stopwords@</b>.
-          [<a href=help/basics#stopwords>#search.details#</a>]<br>
-      	  </font>
-	</if>
+  <form method="get" action="search">
+    <input type="text" name="q" size="60" maxlength="256" value="@query@" />
+    <input type="submit" value="#search.Search#" name="t" />
+    <!--<input type=submit value="#search.Feeling_Lucky#" name="t" />-->
+  </form>
+  <p><a href="@url_advanced_search@">#search.Advanced_Search#</a></p>
+  <if @t@ eq "Search">
+    <p class="hint">#search.Tip_In_most_browsers_return#</p>
+  </if>
 
-<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>
+  <if @and_queries_notice_p@ eq 1>
+    <p class="hint">#search.and_not_needed# [<a href="help/basics#and">#search.details#</a>]</p>
+  </if>
+  <if @nstopwords@ eq 1>
+    <p class="hint">#search.lt_bstopwordsb_is_a_very# [<a href="help/basics#stopwords">#search.details#</a>]</p>
+  </if>
+  <if @nstopwords@ gt 1>
+    <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
+  </if>
 
-<if @count@ eq 0>
-  Your search - <b>@query@</b> - did not match any documents.
-  <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
-  <br><br>#search.Suggestions#
-  <ul>
-    <li>#search.lt_Make_sure_all_words_a#
-    <li>#search.lt_Try_different_keyword#
-    <li>#search.lt_Try_more_general_keyw#
-    <if @nquery@ gt 2>
-      <li>#search.Try_fewer_keywords#
-    </if>
-  </ul>
-</if>
-<else>
-  <table width=100% bgcolor=3366cc border=0 cellpadding=3 cellspacing=0>
-    <tr><td>
-      <font color=white>
-        #search.Searched_for_query#
-      </font>
-    </td><td align=right>
-      <font color=white>
-        #search.Results# <b>@low@-@high@</b> #search.of_about# <b>@count@</b>#search.________Search_took# <b>@elapsed@</b> #search.seconds# 
-      </font>     
-    </td></tr>
-  </table>
-  <br clear=all>
-</else>
+  <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></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 @from_result_page@ lt @to_result_page@>
-  <center>
+  <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>
+    <p>#search.Searched_for_query#</p>
+    <p>#search.Results_count#</p>
+  </else>
 
-    <small>#search.Result_page#</small>
+  <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 @from_result_page@ lt @current_result_page@>
-      <small><a href=@url_previous@><font color=0000cc><b>#search.Previous#</b></font></a></small>
+    <if @stw@ not nil>
+      <p>#search.lt_Try_your_query_on_stw#</p>
     </if>
-    &nbsp;@choice_bar;noquote@&nbsp;
-    
-    <if @current_result_page@ lt @to_result_page@>
-	<small><a href=@url_next@><font color=0000cc><b>#search.Next#</b></font></a></small>
-    </if>
-  </center>
-</if>
-<if @count@ gt 0>
-  <center>
-    <table border=0 cellpadding=3 cellspacing=0>
-      <tr><td nowrap>
-        <form method=GET action=search>
-          <center>
-            <small>
-              <input type=text name=q size=31 maxlength=256 value="@query@">
-              <input type=submit value=Search>
-            </small>
-          </center>
-        </form>
-      </td></tr>
-    </table>
-  </center>
-
-  <if @stw@ not nil>
-    <center>
-      <font size=-1>#search.lt_Try_your_query_on_stw#</font></center>
-    </center>
   </if>
-</if>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/search/www/search.tcl	13 Jan 2005 13:58:41 -0000	1.13
+++ openacs-4/packages/search/www/search.tcl	2 Feb 2005 21:18:03 -0000	1.14
@@ -20,7 +20,7 @@
 set package_url [ad_conn package_url]
 set package_url_with_extras $package_url
 
-set context [list]
+set context results
 set context_base_url $package_url
 
 set user_id [ad_conn user_id]
@@ -142,7 +142,7 @@
 if [llength $search_the_web] {
     set stw ""
     foreach {url site} $search_the_web {
-	append stw "<a href=[format $url $urlencoded_query]>$site</a> "
+	append stw "<a href=\"[format $url $urlencoded_query]\">$site</a> "
     }
 }