@@ -1,37 +1,14 @@

 <%

   my $dbi = app->dbi;

+

+  my $books = $dbi->model('book')->select(['id', 'short_name'])->all;

+

   my $op = param('op') // '';

   my $book_id = param('book-id');

-  my $current_book_id;

-  

-  my $show_word_count;

   my $word_count_h = {};

   my $word = param('word');

   my $word_length = length $word;

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

-  if ($word_length) {

-    $show_word_count = 1;

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

-      my $num = sprintf "%02d", $i + 1;

-      

-      my $content = $dbi->select(

-        'content_no_tag',

-        table => 'book',

-        where => {id => $num}

-      )->value;

-      my $content_length = length $content;

-      $content =~ s/$word_q//g;

-      my $content_length_no_word = length $content;

-      

-      # 文字の個数

-      my $word_count = ($content_length - $content_length_no_word) / $word_length;

-      $word_count_h->{$num} = $word_count;

-    }

-  }

-  

-  my $books = $dbi->model('book')->select(['id', 'short_name'])->all;

-  my $max_search_pos = $word_count_h->{$book_id} // 0;

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

   my $next_book_id;

@@ -55,6 +32,9 @@

 %= javascript begin

   $(document).ready(function () {

+  

+    var current_word;

+    var current_book_id;

     var fragment = location.hash;

     var current_pos;

@@ -84,7 +64,7 @@

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

         var next_pos = current_pos - 0 + 1;

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

+        if (next_pos > 10) {

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

         }

         else {

@@ -94,6 +74,7 @@

       });

     % }

+    // 書をクリック

     $('.book').on('click', function () {

       var book_id_str = $(this).attr('id');

       var ret = book_id_str.match(/book-(\d+)/);

@@ -125,6 +106,33 @@

         current_book_id = book_id;

       });

     });

+    

+    // 検索をクリック

+    $('#search').on('click', function () {

+      var word = $(this).closest('div').find('[name=word]').val();

+      

+      if (word) {

+        var word_count_h;

+        $.get('/api/word-count/' + word, function (result) {

+          var word_count_h = result.word_count;

+          

+          $('#books tr').each(function () {

+            var book_id_str = $(this).attr('id');

+            if (book_id_str) {

+              var book_id = (book_id_str.match(/book-(\d+)/))[1];

+              if (word_count_h[book_id] === 0) {

+                $(this).css('display', 'none');

+              }

+              $(this).find('.word-count').text(word_count_h[book_id]);

+            }

+          });

+        });

+        

+        current_word = word;

+      }

+      

+      return false;

+    });

   });

 % end

@@ -135,10 +143,10 @@

   </div>

   <div id="boxB">

-      <form style="margin-bottom:5px" action="<%= url_for('current') %>" method="get">

-        <%= text_field 'word' , style => "width:160px"%>

-        <input type="submit" value="検索" style="width:50px;padding:2px;">

-      </form>

+      <div style="margin-bottom:5px">

+        <%= text_field 'word' , style => "width:160px" %>

+        <button id="search" style="width:50px;padding:2px;">検索</button>

+      </div>

       <div style="margin-bottom:10px;">

         <table style="border-collapse: collapse;width:100%;color:#333333">

           <tr>

@@ -160,7 +168,7 @@

         </table>

       </div>

       <div style="border:1px solid gray;width:218px;height:400px;overflow:auto;padding:5px">

-        <table style="border-collapse: collapse;width:100%;color:#333333">

+        <table id="books" style="border-collapse: collapse;width:100%;color:#333333">

             <tr style="border-bottom:1px solid #EEEEEE">

               <td>

                 書

@@ -173,7 +181,7 @@

             </tr>

           % my $prev_book_id;

           % for my $book (@$books) {

-            <tr>

+            <tr id="<%= "book-$book->{id}" %>">

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

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

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

@@ -184,8 +192,7 @@

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

                   </a>

                 </td>

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

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

+                <td class="word-count" style="text-align:right">

                 </td>

                 % if ($prev_book_id && $book_id) {