Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/search/search.info	27 Nov 2007 22:27:59 -0000	1.29
+++ openacs-4/packages/search/search.info	5 Jan 2008 17:44:10 -0000	1.30
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.4.0d1" url="http://openacs.org/repository/download/apm/search-5.4.0d1.apm">
+    <version name="5.4.0d2" url="http://openacs.org/repository/download/apm/search-5.4.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2007-07-18</release-date>
         <maturity>3</maturity>
@@ -17,13 +17,14 @@
         <license url="http://www.gnu.org/copyleft/gpl.html">GPL version 2</license>
         <description format="text/html">Site wide search implemented with service contracts, currently supports postgres via the tsearch2 driver (OpenFTS still support but deprecated).</description>
 
-        <provides url="search" version="5.4.0d1"/>
+        <provides url="search" version="5.4.0d2"/>
         <requires url="acs-service-contract" version="5.3.2"/>
 
         <callbacks>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FtsEngineDriver"  default="tsearch2-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="PagesPerGroup"  default="10" description="Number of pages in a page group"/>
             <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="Interval in seconds for the search indexer to sweep for new or updated items."/>
             <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)"/>
Index: openacs-4/packages/search/lib/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/navbar.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/lib/navbar.adp	5 Jan 2008 17:44:10 -0000	1.1
@@ -0,0 +1,38 @@
+<if @results_paginator:rowcount@ gt 1>
+  <div id="results-pages" class="@paginator_class@">
+    <ul class="compact list-paginator">
+      <if @url_previous_group@ nil>
+        <li>&lt;&lt;</li>
+      </if>
+      <else>
+        <li><a href="@url_previous_group@">&lt;&lt;</a></li>
+      </else>
+      <if @url_previous@ nil>
+        <li>&lt;</li>
+      </if>
+      <else>
+        <li><a href="@url_previous@">&lt;</a></li>
+      </else>
+      <multiple name="results_paginator">
+        <if @results_paginator.current_p@>
+          <li class="current">@results_paginator.item@</li>
+        </if>
+        <else>
+          <li><a href="@results_paginator.link@">@results_paginator.item@</a></li>
+        </else>
+      </multiple>
+      <if @url_next@ nil>
+       <li>&gt;</li>
+      </if>
+      <else>
+        <li><a href="@url_next@">&gt;</a></li>
+      </else>
+      <if @url_next_group@ nil>
+        <li>&gt;&gt;</li>
+      </if>
+      <else>
+        <li><a href="@url_next_group@">&gt;&gt;</a></li>
+      </else>
+    </ul>
+  </div>
+</if>
Index: openacs-4/packages/search/lib/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/navbar.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/lib/navbar.tcl	5 Jan 2008 17:44:10 -0000	1.1
@@ -0,0 +1,50 @@
+set package_id [ad_conn package_id]
+
+set limit [ad_parameter -package_id $package_id LimitDefault]
+set pages_per_group [ad_parameter -package_id $package_id PagesPerGroup]
+
+set current_result_page [expr {$low / $limit}]
+set from_result_page [expr {($current_result_page / $pages_per_group) * $pages_per_group}]
+set last_result_page [expr {($count + $limit - 1)/ $limit - 1}]
+set to_result_page [expr {($last_result_page < $pages_per_group + $from_result_page - 1 ? $last_result_page : $pages_per_group + $from_result_page - 1)} ]
+set current_page_group [expr { int($current_result_page / $pages_per_group) }]
+set last_page_group [expr { int($last_result_page / $pages_per_group) }]
+set first_page_in_group [expr { $current_page_group * $pages_per_group }]
+set last_page_in_group [expr { ($current_page_group + 1) * $pages_per_group - 1 }]
+
+if { $current_page_group >= 1 } {
+    set offset [expr {($current_page_group - 1) * $pages_per_group * $limit}]
+    set url_previous_group [export_vars -base search {{q $urlencoded_query} search_package_id offset num}]
+} else {
+    set url_previous_group ""
+}
+
+if { $current_page_group < $last_page_group } {
+    set offset [expr {($current_page_group + 1) * $pages_per_group * $limit}]
+    set url_next_group [export_vars -base search {{q $urlencoded_query} search_package_id offset num}]
+} else {
+    set url_next_group ""
+}
+
+if { $current_result_page > 1 } { 
+    set offset [expr ($current_result_page - 1) * $limit]
+    set url_previous [export_vars -base search {{q $urlencoded_query} search_package_id offset num}]
+} else {
+    set url_previous ""
+}
+
+if { $current_result_page < $last_result_page } { 
+    set offset [expr {$current_result_page * $limit + $limit}]
+    set url_next [export_vars -base search {{q $urlencoded_query} search_package_id offset num}]
+} else {
+    set url_next ""
+}
+
+template::multirow create results_paginator item link current_p
+for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
+    set link "search?q=${urlencoded_query}&search_package_id=$search_package_id"
+    if { $__i > 1 } { append link "&offset=[expr {$__i * $limit}]" }
+    if { $num > 0 } { append link "&num=$num" }
+
+    template::multirow append results_paginator [expr {$__i + 1}] $link [expr {$__i == $current_result_page}]
+}
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/search/www/search.adp	27 Nov 2007 22:16:26 -0000	1.13
+++ openacs-4/packages/search/www/search.adp	5 Jan 2008 17:44:10 -0000	1.14
@@ -62,62 +62,41 @@
         </div>
   </else>
 
+  <include src="/packages/search/lib/navbar" &="urlencoded_query"
+    paginator_class="list-paginator-bottom" count="@result.count@" &="low" &="high"
+    &="offset" &="num" &="search_package_id">
 
-        <if @results_paginator:rowcount@ gt 1>
-          <div id="results-pages" class="list-paginator-bottom">
-
-          <ul class="compact list-paginator">
-            <li>#search.Result_page#</li>
-            <if @from_result_page@ lt @current_result_page@>
-              <li><a href="@url_previous@">#search.Previous#</a></li>
-            </if>
-
-            <multiple name="results_paginator">
-              <if @current_result_page@ eq @results_paginator.item@>
-                <li class="current">@results_paginator.item@</li>
-              </if>
-              <else>
-                <li><a href="@results_paginator.link@">@results_paginator.item@</a></li>
-              </else>
-            </multiple>
-            <if @current_result_page@ lt @to_result_page@>
-              <li><a href="@url_next@">#search.Next#</a></li>
-            </if>
-          </ul>
-        </div>
-      </if>
-
 <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>
+<if @stw@ not nil>
+<p style="text-align:center;font-size=-1">#search.lt_Try_your_query_on_stw#</p>
 </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>
-    </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 @debug_p@>
-      <p>#search.Searched_for_query#</p>
-      <p>#search.Results_count#</p>
-    </if>
+<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 @debug_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.30 -r1.31
--- openacs-4/packages/search/www/search.tcl	27 Nov 2007 22:16:26 -0000	1.30
+++ openacs-4/packages/search/www/search.tcl	5 Jan 2008 17:44:10 -0000	1.31
@@ -182,35 +182,6 @@
     template::multirow append searchresult $title_summary $txt_summary $url_one
 }
 
-
-set from_result_page 1
-set current_result_page [expr ($low / $limit) + 1]
-set to_result_page [expr {ceil(double($result(count)) / double($limit))}]
-
-set url_previous ""
-set url_next ""
-append url_previous "search?q=${urlencoded_query}&search_package_id=$search_package_id"
-append url_next "search?q=${urlencoded_query}&search_package_id=$search_package_id"
-if { [expr {$current_result_page - 1}] > $from_result_page } { 
-    append url_previous "&offset=[expr ($current_result_page - 2) * $limit]"
-}
-if { $current_result_page < $to_result_page } { 
-    append url_next "&offset=[expr {$current_result_page * $limit}]"
-}
-if { $num > 0 } {
-    append url_previous "&num=$num"
-    append url_next "&num=$num"
-}
-
-template::multirow create results_paginator item link
-for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
-    set link "search?q=${urlencoded_query}&search_package_id=$search_package_id"
-    if { $__i > 1 } { append link "&offset=[expr ($__i - 1) * $limit]" }
-    if { $num > 0 } { append link "&num=$num" }
-
-    template::multirow append results_paginator $__i $link
-}
-
 set search_the_web [ad_parameter -package_id $package_id SearchTheWeb]
 if {[llength $search_the_web]} {
     set stw ""