@@ -7,7 +7,7 @@

   my $word_count_h = {};

   my $word = param('word');

   my $word_length = length $word;

-  my $word_q = quotemeta($word);

+  my $word_q = quotemeta($word) if defined $word;

   if ($word_length) {

     $show_word_count = 1;

     for (my $i = 0; $i < 66; $i++) {

@@ -48,7 +48,23 @@

         return $after;

       };

       $content =~ s#($word_q)#$replace_cb->($1)#ge;

-      $max_search_pos = $i;

+      $max_search_pos = $i - 1;

+    }

+  }

+  

+  # 前と次の見つかった書籍

+  my $next_book_id;

+  my $prev_book_id;

+  my $found_books = [];

+  for my $book (@$books) {

+    if (!$word_length || $word_count_h->{$book->{id}} > 0) {

+      push @$found_books, $book;

+    }

+  }

+  for (my $i = 0; $i < @$found_books; $i++) {

+    if ($book_id eq $found_books->[$i]{id}) {

+      $prev_book_id = $found_books->[$i - 1]{id} if $i > 0;

+      $next_book_id = $found_books->[$i + 1]{id} if $i < @$found_books;

     }

   }

 %>

@@ -59,18 +75,40 @@

 %= javascript begin

   $(document).ready(function () {

+    var fragment = location.hash;

+    var current_pos;

+    if (fragment) {

+      var ret = fragment.match(/word-(\d)/);

+      current_pos = ret[1] - 0;

+    }

+    else {

+      current_pos = 1;

+    }

+    $("#word-pos").text(current_pos);

+    

     $("#up-arrow").on('click', function () {

       var current_pos = $('#word-pos').text();

       var prev_pos = current_pos - 1;

-      $('#word-pos').text(prev_pos);

-      location.href = '#word-' + prev_pos;

+      

+      if (prev_pos < 1) {

+        location.href = "<%= url_for('/')->query(word => $word, 'book-id' => $prev_book_id)->fragment("word-$word_count_h->{$prev_book_id}") %>";

+      } else {

+        location.href = '#word-' + prev_pos;

+        $('#word-pos').text(prev_pos);

+      }

     });

     $("#down-arrow").on('click', function () {

       var current_pos = $('#word-pos').text();

       var next_pos = current_pos - 0 + 1;

-      $('#word-pos').text(next_pos);

-      location.href = '#word-' + next_pos;

+      

+      if (next_pos > <%= $max_search_pos %>) {

+        location.href = "<%= url_for('/')->query(word => $word, 'book-id' => $next_book_id)->fragment('word-1') %>";

+      }

+      else {

+        location.href = '#word-' + next_pos;

+        $('#word-pos').text(next_pos);

+      }

     });

   });

 % end

@@ -97,7 +135,7 @@

                 <span>

                   <a id="up-arrow" href="javascript:void()">▲</a>

                   <div id="word-pos" style="display:inline-block;border:1px solid #DDDDDD;padding:2px 5px;width:35px;text-align:center">

-                    <%= $book_id ? 1 : '-' %>

+                    <%= $book_id ? '　' : '-' %>

                   </div>

                   <a id="down-arrow" href="javascript:void()">▼</a>

                 </span>

@@ -118,14 +156,15 @@

                 % }

               </td>

             </tr>

+          % my $prev_book_id;

           % for my $book (@$books) {

             <tr>

               % if (!$word_length || $word_count_h->{$book->{id}} > 0) {

-                <td style="<%= $book_id eq $book->{id} ? 'background:#DDDDDD' : '' %>">

+                <td style="<%= ($book_id // '') eq $book->{id} ? 'background:#DDDDDD' : '' %>">

                   % my $book_url_query = {'book-id' => $book->{id}};

                   % $book_url_query->{word} = $word if $word_length;

                   % my $book_url = url_for->query($book_url_query);

-                  % $book_url->fragment('#word-1') if $word_length;

+                  % $book_url->fragment('word-1') if $word_length;

                   <a class="book" id="<%= "book-$book->{id}" %>" href="<%= $book_url %>">

                     <%= $book->{short_name} %>

                   </a>

@@ -133,6 +172,11 @@

                 <td style="text-align:right">

                   <%= $word_count_h->{$book->{id}} %>

                 </td>

+                

+                % if ($prev_book_id && $book_id) {

+                  $next_book_list->{$prev_book_id} = $book_id;

+                  $prev_book_list->{$book_id} = $prev_book_id;

+                % }

               % }

             </tr>

           % }