Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.14.10.1 -r1.14.10.2
--- openacs-4/packages/search/www/search.adp	5 Oct 2013 13:42:36 -0000	1.14.10.1
+++ openacs-4/packages/search/www/search.adp	3 Aug 2014 11:27:39 -0000	1.14.10.2
@@ -1,31 +1,27 @@
 <master>
-<property name="context">Results</property>
+<property name="context">@context@</property>
 <property name="doc(title)">@page_title@</property>
 
-<if @empty_p@ true>
-    <p class="hint">#search.lt_You_must_specify_some#</p>
+<if @and_queries_notice_p@ eq 1>
+  <font color="6f6f6f">
+    #search.The#
+    [<a href=help/basics#and>#search.details#</a>]<br>
+  </font>
 </if>
-<else>
-	<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>
+<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>
 
-  <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#
@@ -34,70 +30,69 @@
     <li>#search.lt_Try_different_keyword#
     <li>#search.lt_Try_more_general_keyw#
     <if @nquery@ gt 2>
-      <li>#search.Try_fewer_keywords#
+      <li>#search.Try_fewer_keywords#</li>
     </if>
   </ul>
-  </if>
-  <else>
-        <div id="search-info">
-          <p class="subtitle">#search.Searched_for_query#</p>
-          <p class="times">
-        #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
-          </p>
-        </div>
-        <div id="search-results">
-          <ol style="counter-reset:item @offset@">
-            <multiple name="searchresult">
-              <li>
-                  <a href="@searchresult.url_one@" class="result-title">
-                    <if @searchresult.title_summary@ nil>#search.Untitled#</if>	
-                    <else>@searchresult.title_summary;noquote@</else>
-                  </a>
-                <if @searchresult.txt_summary@ not nil>	
-                  <div class="result-text">@searchresult.txt_summary;noquote@</div>
-                </if>
-                <div class="result-url">@searchresult.url_one@</div>
-              </li>
-            </multiple>
-          </ol>
-        </div>
-  </else>
+</if>
+<else>
+  <div id="search-info">
+    <p class="subtitle">#search.Searched_for_query#</p>
+    <p class="times">
+      #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
+    </p>
+  </div>
+  <div id="search-results">
+    <ol style="counter-reset:item @offset@">
+      <multiple name="searchresult">
+        <li>
+          <a href="@searchresult.url_one@" class="result-title">
+            <if @searchresult.title_summary@ nil>#search.Untitled#</if>	
+            <else>@searchresult.title_summary;noquote@</else>
+          </a>
+          <if @searchresult.txt_summary@ not nil>	
+            <div class="result-text">@searchresult.txt_summary;noquote@</div>
+          </if>
+          <div class="result-url">@searchresult.url_one@</div>
+        </li>
+      </multiple>
+    </ol>
+  </div>
+</else>
 
-  <include src="/packages/search/lib/navbar" &="urlencoded_query"
+<include src="/packages/search/lib/navbar" &="urlencoded_query"
     paginator_class="list-paginator-bottom" count="@result.count@" &="low" &="high"
     &="offset" &="num" &="search_package_id">
 
 <if @count@ gt 0>
-<div style="text-align:center">
-<form method="get" action="search">
-<div>
-<input type="text" name="q" size="60" maxlength="256" value="@query@">
-<input type="submit" value="#search.Search#">
-</div>
-</form>
-<if @t@ eq "Search">
-<i>#search.lt_Tip_In_most_browsers_#</i>
-</if>
-</div>
+  <div style="text-align:center">
+    <form method="get" action="search">
+      <div>
+	<input type="text" name="q" size="60" maxlength="256" value="@query@">
+	<input type="submit" value="#search.Search#">
+      </div>
+    </form>
+    <if @t@ eq "Search">
+      <i>#search.lt_Tip_In_most_browsers_#</i>
+    </if>
+  </div>
 
-<if @stw@ not nil>
-<p style="text-align:center;font-size=-1">#search.lt_Try_your_query_on_stw#</p>
+  <if @stw@ not nil>
+    <p style="text-align:center;font-size=-1">#search.lt_Try_your_query_on_stw#</p>
+  </if>
 </if>
-</if>
-</else>
 
 <if @and_queries_notice_p@ eq 1>
-<p class="hint">#search.and_not_needed# [<a href="help/basics#and">#search.details#</a>]</p>
+  <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>
+  <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>
+  <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
 </if>
 
 <if @debug_p@>
-<p>#search.Searched_for_query#</p>
-<p>#search.Results_count#</p>
+  <p>#search.Searched_for_query#</p>
+  <p>#search.Results_count#</p>
 </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.37.2.5 -r1.37.2.6
--- openacs-4/packages/search/www/search.tcl	2 Aug 2014 10:45:43 -0000	1.37.2.5
+++ openacs-4/packages/search/www/search.tcl	3 Aug 2014 11:27:39 -0000	1.37.2.6
@@ -5,11 +5,11 @@
 } {
     q:trim
     {t:trim ""}
-    {offset:integer 0}
-    {num:integer 0}
+    {offset:naturalnum 0}
+    {num:naturalnum 0}
     {dfs:trim ""}
     {dts:trim ""}
-    {search_package_id ""}
+    {search_package_id:naturalnum ""}
     {scope ""}
     {object_type ""}
 } -validate {
@@ -27,7 +27,7 @@
 set package_url [ad_conn package_url]
 set package_url_with_extras $package_url
 
-set context results
+set context Results
 set context_base_url $package_url
 
 # Do we want debugging information at the end of the page
@@ -47,19 +47,6 @@
     ad_script_abort
 }
 
-if {[string trim $q] eq ""} {
-    set query {}
-    set empty_p 1
-    set url_advanced_search "advanced-search"
-    ad_return_template
-    # FIXME DAVEB I don't understand why I can't call ad_script_abort here instead of return....
-    # if I call ad_script_abort the adp is never rendered
-    return
-} else { 
-    set empty_p 0
-}
-
-
 if { $num <= 0} {
     set limit [parameter::get -package_id $package_id -parameter LimitDefault]
 } else {
@@ -116,7 +103,7 @@
 if {[callback::impl_exists -impl $driver -callback search::search]} {
     # DAVEB TODO Add subsite to the callback def?
     # FIXME do this in the intermedia driver!
-#    set final_query_string [db_string final_query_select "select site_wide_search.im_convert(:q) from dual"]
+    #    set final_query_string [db_string final_query_select "select site_wide_search.im_convert(:q) from dual"]
 
     array set result [lindex [callback -impl $driver search::search -query $q -offset $offset -limit $limit \
 				  -user_id $user_id -df $df \