enju_biblio 0.3.18 → 0.4.0.beta.1

data/app/views/manifestations/index.rss.builder

@@ -4,12 +4,12 @@ xml.rss('version' => "2.0",
         'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: nil, only_path: true))}"
+    xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: manifestations_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     if params[:query].present?

data/app/views/manifestations/index.sru.builder

@@ -0,0 +1,101 @@
+if @sru
+  unless @sru.extra_response_data.empty?
+    @extra_response = true
+    @facets = @sru.extra_response_data[:facets]
+    @dpid = @sru.extra_response_data[:dpid]
+    @webget = @sru.extra_response_data[:webget]
+    @digitalize = @sru.extra_response_data[:digitalize]
+    @porta_type = @sru.extra_response_data[:porta_type]
+    @payment = @sru.extra_response_data[:payment]
+    @ndc = @sru.extra_response_data[:ndc]
+    @date = @sru.extra_response_data[:date]
+  end
+
+  @version = @sru.version
+  @packing = @sru.packing
+  @number_of_records = @manifestations.total_count
+  @next_record_position = @sru.start + @manifestations.limit_value
+end
+
+def search_retrieve_response!(xml)
+  xml.searchRetrieveResponse xmlns: "http://www.loc.gov/zing/srw/" do
+    xml.version @version
+    xml.numberOfRecords @number_of_records
+    extra_response_data!(xml) if @extra_response
+    xml.records do
+      @manifestations.each_with_index do |rec, idx|
+        xml.record do
+          record!(xml, rec, idx + 1)
+        end
+      end
+    end
+    xml.nextRecordPosition @next_record_position
+  end
+end
+
+def extra_response_data!(xml)
+  xml.extraResponseData do
+    xml.facets @facets do
+      lst_tag!(xml, "REPOSITORY_NO", 'dcndl_porta:dpid', @dpid)
+      lst_tag!(xml, "WEBGET_TYPE", 'dcndl_porta:type.Web-get', @webget)
+      lst_tag!(xml, "DIGITALIZE_TYPE", 'dcndl_porta:type.Digitalize', @digitalize)
+      lst_tag!(xml, "PORTA_TYPE", 'dcndl_porta:PORTAType', @porta_type)
+      lst_tag!(xml, "PAYMENT_TYPE", 'dcndl_porta:type.Payment', @payment)
+      lst_tag!(xml, "NDC", 'int', @ndc)
+      lst_tag!(xml, "ISSUED_DATE", 'int', @date)
+    end
+  end
+end
+
+def lst_tag!(xml, lst_name, tag_name, hash)
+  xml.lst name: lst_name do
+    value_sort(hash).each do |item|
+      xml.tag! tag_name, {name: item[0]}, item[1]
+    end
+  end
+end
+
+def record!(xml, rec, position)
+  xml.recordSchema 'info:srw/schema/1/dc-v1.1'
+  xml.recordPacking @packing
+  xml.recordData{|x| x << (/\Axml\Z/io =~ @packing ? get_record(rec) : CGI::escapeHTML(get_record(rec)))}
+  xml.recordPosition position
+end
+
+def get_record(manifestation)
+  xml = Builder::XmlMarkup.new
+  xml.tag! 'srw_dc:dc',
+    'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
+    'xmlns:srw_dc' => "info:srw/schema/1/dc-v1.1",
+    'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
+    'xsi:schemaLocation' => "info:srw/schema/1/dc-v1.1 http://www.loc.gov/standards/sru/dc-schema.xsd" do
+    cache([manifestation, fragment: 'index_sru', role: current_user_role_name, locale: @locale]) do
+      xml.tag! 'dc:title', manifestation.original_title
+      manifestation.creators.readable_by(current_user).each do |agent|
+        xml.tag! 'dc:creator', agent.full_name
+      end
+      manifestation.contributors.each do |agent|
+        xml.tag! 'dc:contributor', agent.full_name
+      end
+      manifestation.publishers.each do |agent|
+        xml.tag! 'dc:publisher', agent.full_name
+      end
+      if defined?(EnjuSubject)
+        manifestation.subjects.each do |subject|
+          xml.tag! "dc:subject", subject.term
+        end
+      end
+      xml.tag! 'dc:description', manifestation.description
+    end
+  end
+end
+
+def value_sort(hash)
+  hash.to_a.sort do |a, b|
+    (b[1] <=> a[1]) * 2 + (a[0] <=> b[0])
+  end
+end
+
+xml = Builder::XmlMarkup.new indent: 2
+xml.instruct! directive_tag=:xml, encoding: 'UTF-8'
+search_retrieve_response!(xml)

data/app/views/manifestations/index.txt.erb

@@ -0,0 +1 @@
+<%= Manifestation.csv_header(current_user_role_name, col_sep: "\t") -%><%= render @manifestations -%>

data/app/views/manifestations/show.html.erb

@@ -27,6 +27,7 @@
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>
+  <%= render 'manifestations/colorbox' %>
   <%- if user_signed_in? -%>
     <div id="call_number_content">
       <%- @manifestation.items.on_shelf.each do |item| -%>

data/app/views/manifestations/show.txt.erb

@@ -0,0 +1 @@
+<%= Manifestation.csv_header(current_user_role_name, col_sep: "\t") -%><%= render @manifestation -%>

data/app/views/medium_of_performances/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= medium_of_performance.name -%></td>
     <td>
-      <%= link_to medium_of_performance.display_name.localize, medium_of_performance -%>
+      <%= link_to medium_of_performance.display_name, medium_of_performance -%>
       <br />
       <%= medium_of_performance.note %>
     </td>

data/app/views/medium_of_performances/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.medium_of_performance.display_name') -%>:</strong>
-  <%= @medium_of_performance.display_name.localize -%>
+  <%= @medium_of_performance.display_name -%>
 </p>
 
 <p>

data/app/views/notifier/manifestation_info.en.text.erb

@@ -8,7 +8,7 @@ ISBN: <%= @manifestation.identifier_contents(:isbn).join(" ") %>
 URL: <%= @manifestation.access_address %>
 Holding:
 <% @manifestation.items.on_shelf.each do |item| -%>
- <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
+ <%= item.shelf_display_name %> <%= item.call_number %> <%= item.item_identifier %>
 <% end -%>
 
 <%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>

data/app/views/notifier/manifestation_info.ja.text.erb

@@ -8,7 +8,7 @@ ISBN: <%= @manifestation.identifier_contents(:isbn).join(" ") %>
 URL: <%= @manifestation.access_address %>
 所蔵場所:
 <% @manifestation.items.on_shelf.each do |item| -%>
- <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
+ <%= item.shelf_display_name %> <%= item.call_number %> <%= item.item_identifier %>
 <% end -%>
 
 <%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>

data/app/views/picture_files/edit.html.erb

@@ -10,10 +10,6 @@
     <%= f.file_field :picture -%>
   </div>
 
-  <div class="field">
-    <%= render 'picture_files/link', picture_file: @picture_file %>
-  </div>
-
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/produce_types/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= produce_type.name -%></td>
     <td>
-      <%= link_to produce_type.display_name.localize, produce_type -%>
+      <%= link_to produce_type.display_name, produce_type -%>
       <br />
       <%= produce_type.note %>
     </td>

data/app/views/produce_types/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.produce_type.display_name') -%>:</strong>
-  <%= @produce_type.display_name.localize -%>
+  <%= @produce_type.display_name -%>
 </p>
 
 <p>

data/app/views/produces/_form.html.erb

@@ -23,7 +23,7 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.produce_type') -%><br />
-    <%= f.select :produce_type_id, @produce_types.map{|p| [p.display_name.localize, p.id]} %>
+    <%= f.select :produce_type_id, @produce_types.map{|p| [p.display_name, p.id]} %>
   </div>
 
   <div class="actions">

data/app/views/realize_types/index.html.erb

@@ -24,7 +24,7 @@
     </td>
     <td><%= realize_type.name -%></td>
     <td>
-      <%= link_to realize_type.display_name.localize, realize_type -%>
+      <%= link_to realize_type.display_name, realize_type -%>
       <br />
       <%= realize_type.note %>
     </td>

data/app/views/realize_types/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.realize_type.display_name') -%>:</strong>
-  <%= @realize_type.display_name.localize -%>
+  <%= @realize_type.display_name -%>
 </p>
 
 <p>

data/app/views/realizes/_form.html.erb

@@ -23,7 +23,7 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.realize_type') -%><br />
-    <%= f.select :realize_type_id, @realize_types.map{|r| [r.display_name.localize, r.id]} %>
+    <%= f.select :realize_type_id, @realize_types.map{|r| [r.display_name, r.id]} %>
   </div>
 
   <div class="actions">

data/app/views/resource_import_files/_results.html.erb

@@ -1,10 +1,4 @@
 <h2><%= t('activerecord.models.resource_import_result') %></h2>
-
-<p>
-  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt)) -%>
-  (<%= link_to 'TSV', resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt) -%>)
-</p>
-
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.resource_import_result.lineno') %></th>

data/app/views/resource_import_files/new.html.erb

@@ -38,8 +38,8 @@
 
   <div class="field">
     <%= f.label :default_shelf_id -%>
-    <%= f.select :library_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
-    <%= f.select :default_shelf_id, @shelves.map{|s| [s.display_name.localize, s.id]} %>
+    <%= f.select :library_id, @libraries.map{|l| [l.display_name, l.id]} %>
+    <%= f.select :default_shelf_id, @shelves.map{|s| [s.display_name, s.id]} %>
     <%= render 'observe_field' %><br />
     <%= t('resource_import_file.default_shelf') %>
   </div>

data/app/views/resource_import_results/index.html.erb

@@ -13,4 +13,15 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li>
+    <% if @resource_import_file %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt)) -%>
+      (<%= link_to 'TSV', resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt) -%>)
+    <% else %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(format: :txt)) -%>
+      (<%= link_to 'TSV', resource_import_results_path(format: :txt) -%>)
+    <% end %>
+    </li>
+  </ul>
 </div>

data/app/views/resource_import_results/index.txt.erb

@@ -0,0 +1,3 @@
+<%- @resource_import_results.each do |resource_import_result| -%>
+<%= resource_import_result.manifestation_id %>	<%= resource_import_result.item_id %>	<%= resource_import_result.body %>
+<%- end -%>

data/app/views/series_statements/_form.html.erb

@@ -24,18 +24,20 @@
     <%= f.label :title_subseries_transcription %><br />
     <%= f.text_field :title_subseries_transcription %>
   </div>
+  <!--
   <div class="field">
-    <%= f.label :creator_string %><br />
-    <%= f.text_field :creator_string %>
+    <%= f.label :numbering %><br />
+    <%= f.text_field :numbering %>
   </div>
   <div class="field">
-    <%= f.label :volume_number_string %><br />
-    <%= f.text_field :volume_number_string %>
+    <%= f.label :numbering_subseries -%><br />
+    <%= f.text_field :numbering_subseries %>
   </div>
   <div class="field">
-    <%= f.label :series_master %><br />
-    <%= f.check_box :series_master %>
+    <%= f.label :series_statement_identifier -%><br />
+    <%= f.text_field :series_statement_identifier, class: 'resource_identifier' %>
   </div>
+  -->
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

data/app/views/series_statements/show.html.erb

@@ -23,18 +23,6 @@
         <% end %>
       </td>
     </tr>
-    <tr>
-      <td><%= t('activerecord.attributes.series_statement.volume_number_string') -%></td>
-      <td><%= @series_statement.volume_number_string %></td>
-    </tr>
-    <tr>
-      <td><%= t('activerecord.attributes.series_statement.creator_string') -%></td>
-      <td><%= @series_statement.creator_string %></td>
-    </tr>
-    <tr>
-      <td><%= t('activerecord.attributes.series_statement.series_master') -%></td>
-      <td><%= localized_boolean(@series_statement.series_master) %></td>
-    </tr>
     <tr>
       <td><%= t('activerecord.attributes.series_statement.note') -%></td>
       <td><%= @series_statement.note %></td>

data/config/locales/translation_en.yml

@@ -43,11 +43,6 @@ en:
       series_statement_merge: Series statement merge
       series_statement_merge_list: Series statement merge list
       periodical: Periodical
-      doi_record: DOI
-      manifestation_custom_property: Manifestation custom property
-      manifestation_custom_value: Manifestation custom value
-      item_custom_property: Item custom property
-      item_custom_value: Item custom value
 
     attributes:
       manifestation:
@@ -80,15 +75,13 @@ en:
         edition: Edition (integer)
         edition_string: Edition
         note: Note
-        memo: Memo
         repository_content: Repository content
         lock_version: Lock version
-        carrier_type: Carrier type
+        carrier_type: Manifestation form
         language: Language
         lccn: LCCN
         issn: ISSN
         subscription_master: Subscription master
-        abstract: Abstract
         description: Description
         creator_string: Creator
         contributor_string: Contributor
@@ -105,23 +98,18 @@ en:
         extent: Extent
         dimensions: Dimensions
         fulltext_content: Fulltext content
-        date_copyrighted: Date copyrighted
       manifestation/subjects:
           term: Subject
       manifestation/classifications:
           category: Classification
       manifestation/identifiers:
           body: Identifier
-      manifestation/manifestation_custom_properties:
-        name: Name
-        value: Value
       item:
         call_number: Call number
         item_identifier: Item identifier
         deleted_at: Deleted at
         include_supplements: Include supplements
         note: Note
-        memo: Memo
         url: URL
         price: Price
         lock_version: Lock version
@@ -133,9 +121,6 @@ en:
         budget_type_id: Budget type
         bookstore_id: Bookstore
         required_role_id: Required role
-      item/item_custom_properties:
-        name: Name
-        value: Value
       agent:
         last_name: Last name
         middle_name: Middle name
@@ -346,18 +331,6 @@ en:
       series_statement_merge_list:
         title: Title
       series_statement_merge:
-      manifestation_custom_property:
-        name: Property name
-        display_name: Display name
-        note: Note
-      manifestation_custom_value:
-        value: Value
-      item_custom_property:
-        name: Property name
-        display_name: Display name
-        note: Note
-      item_custom_value:
-        value: Value
 
   resource_import_file:
     update_relationship: Update relationship

data/config/locales/translation_ja.yml

@@ -43,11 +43,6 @@ ja:
       series_statement_merge_list: シリーズ情報統合リスト
       series_statement_merge: シリーズ情報の統合
       periodical: 逐次刊行物
-      doi_record: DOI
-      manifestation_custom_property: 書誌カスタム項目
-      manifestation_custom_value: 書誌カスタム項目の値
-      item_custom_property: 所蔵カスタム項目
-      item_custom_value: 所蔵カスタム項目の値
 
     attributes:
       manifestation:
@@ -80,7 +75,6 @@ ja:
         edition: 版（数字）
         edition_string: 版
         note: 注記
-        memo: 業務メモ
         repository_content: リポジトリのコンテンツ
         lock_version: ロックバージョン
         carrier_type: 資料の形態
@@ -88,7 +82,6 @@ ja:
         lccn: LCCN
         issn: ISSN
         subscription_master: 購読マスタ
-        abstract: 内容細目
         description: 説明
         creator_string: 著者
         contributor_string: 協力者・編者
@@ -105,23 +98,18 @@ ja:
         extent: ページ数
         dimensions: 大きさ
         fulltext_content: 全文あり
-        date_copyrighted: 著作権発行日
       manifestation/subjects:
-        term: 件名
+          term: 件名
       manifestation/classifications:
-        category: 分類
+          category: 分類
       manifestation/identifiers:
-        body: 識別子
-      manifestation/manifesetation_custom_properties:
-        name: 項目名
-        value: 値
+          body: 識別子
       item:
         call_number: 請求記号
         item_identifier: 所蔵情報ID
         deleted_at: 削除時刻
         include_supplements: 付録を含む
         note: 注記
-        memo: 業務メモ
         url: URL
         price: 購入価格
         lock_version: ロックバージョン
@@ -133,9 +121,6 @@ ja:
         budget_type_id: 予算種別
         bookstore_id: 書店
         required_role_id: 閲覧に必要な権限
-      item/item_custom_properties:
-        name: 項目名
-        value: 値
       agent:
         last_name: 姓
         middle_name: ミドルネーム
@@ -350,18 +335,6 @@ ja:
       series_statement_merge_list:
         title: タイトル
       series_statement_merge:
-      manifestation_custom_property:
-        name: 項目コード
-        display_name: 項目表示名
-        note: 注記
-      manifestation_custom_value:
-        value: 値
-      item_custom_property:
-        name: 項目コード
-        display_name: 項目表示名
-        note: 注記
-      item_custom_value:
-        value: 値
 
   resource_import_file:
     update_relationship: 関連を更新

data/config/routes.rb

@@ -1,6 +1,4 @@
 Rails.application.routes.draw do
-  resources :item_custom_properties
-  resources :manifestation_custom_properties
   resources :resource_export_files
 
   resources :identifier_types

data/db/migrate/20081027150907_create_picture_files.rb

@@ -3,7 +3,9 @@ class CreatePictureFiles < ActiveRecord::Migration[4.2]
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
       t.string :picture_attachable_type
+      t.string :content_type
       t.text :title
+      t.string :thumbnail
       t.integer :position
 
       t.timestamps

data/db/migrate/20160319144230_create_issn_records.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :issn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20160506144040_create_isbn_records.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :isbn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170116134107_create_issn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_record_and_manifestations do |t|
+      t.references :issn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, on_delete: :cascade, null: false
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_record_and_manifestations do |t|
+      t.references :isbn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, null: false, on_delete: :cascade
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190102034126_create_doi_records.rb

@@ -0,0 +1,13 @@
+class CreateDoiRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :doi_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :display_body, null: false
+      t.string :source
+      t.jsonb :response, default: {}, null: false
+      t.references :manifestation, foreign_key: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190311154610_create_periodicals.rb

@@ -0,0 +1,10 @@
+class CreatePeriodicals < ActiveRecord::Migration[5.2]
+  def change
+    create_table :periodicals do |t|
+      t.text :original_title, null: false
+      t.references :frequency, foreign_key: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190312033839_create_periodical_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreatePeriodicalAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :periodical_and_manifestations do |t|
+      t.references :periodical, foreign_key: true, null: false
+      t.references :manifestation, foreign_key: true, null: false
+      t.boolean :periodical_master, default: false, null: false, index: {where: 'periodical_master IS true', unique: true}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb

@@ -0,0 +1,21 @@
+class AddDisplayNameTranslationsToCarrierType < ActiveRecord::Migration[5.2]
+  def change
+    [
+      :agent_relationship_types,
+      :agent_types,
+      :carrier_types,
+      :content_types,
+      :create_types,
+      :form_of_works,
+      :frequencies,
+      :languages,
+      :licenses,
+      :manifestation_relationship_types,
+      :medium_of_performances,
+      :produce_types,
+      :realize_types
+    ].each do |table|
+      add_column table, :display_name_translations, :jsonb, default: {}, null: false
+    end
+  end
+end

data/lib/enju_biblio/openurl.rb

@@ -54,13 +54,9 @@ class Openurl
   # 検索
   def search
     search = Sunspot.new_search(Manifestation)
-    role = Role.default_role
     @query_text = build_query
     query = @query_text
-    search.build do
-      fulltext query
-      with(:required_role_id).less_than_or_equal_to role.id
-    end
+    search.build{ fulltext query }
     search.execute!.results
   end