@@ -271,11 +271,16 @@ Note that your database is never changed by anything Ultrasphinx does. end # Returns the last available page number in the result set. - def page_count + def total_pages require_run (total_entries / per_page.to_f).ceil end - + + # to keep backward compatibility with previous version + def page_count + total_pages + end + # Returns the previous page number. def previous_page current_page > 1 ? (current_page - 1) : nil @@ -283,7 +288,7 @@ Note that your database is never changed by anything Ultrasphinx does. # Returns the next page number. def next_page - current_page < page_count ? (current_page + 1) : nil + current_page < total_pages ? (current_page + 1) : nil end # Returns the global index position of the first result on this page. lib/ultrasphinx/search.rb @@ -76,7 +76,7 @@ class SearchTest < Test::Unit::TestCase assert_equal @page - 1, @s.previous_page assert_equal @page + 1, @s.next_page assert_equal @per_page * (@page - 1), @s.offset - assert @s.page_count >= @s.total_entries / @per_page.to_f + assert @s.total_pages >= @s.total_entries / @per_page.to_f end def test_empty_query test/integration/search_test.rb 79378a16423571b9d229e9b30d7de46efec5c5e2 DrMark DrMark drmark@gmail.com http://github.com/DrMark/ultrasphinx/commit/cbe4ef9b00c59e3670e60965595a7c9aa164f914 cbe4ef9b00c59e3670e60965595a7c9aa164f914 2008-05-27T20:28:15-07:00 2008-05-27T20:28:15-07:00 updating the code to work with the latest will_paginate a5853fb6bb3734a9159977c0240ceefab035bbd5 DrMark DrMark drmark@gmail.com