iqvoc 4.14.5 → 4.15.0

data/README.md

@@ -1,7 +1,7 @@
 # iQvoc
 
 [![Gem Version](https://badge.fury.io/rb/iqvoc.png)](http://badge.fury.io/rb/iqvoc)
-![CI](https://github.com/innoq/iqvoc/workflows/CI/badge.svg?branch=master)
+![CI](https://github.com/innoq/iqvoc/workflows/CI/badge.svg)
 [![Code Climate](https://codeclimate.com/github/innoq/iqvoc.png)](https://codeclimate.com/github/innoq/iqvoc)
 
 iQvoc is a vocabulary management tool that combines easy-to-use human interfaces

data/app/aides/entity_logger.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class EntityLogger
+  def initialize(object)
+    @object = object
+  end
+
+  def info(message)
+    append_log(message)
+  end
+
+  def warn(message)
+    append_log("[WARNING] #{message}")
+  end
+
+  def error(message)
+    append_log("[ERROR] #{message}")
+  end
+
+  private
+
+  def append_log(message)
+    @object.output ||= ""
+    @object.output += "#{Time.now} - #{message}\n"
+    @object.save!(touch: false)
+  end
+end

data/app/aides/maker.rb

@@ -120,7 +120,7 @@ module Maker
     }
     attributes = defaults.merge(attributes)
 
-    klass = Iqvoc::XLLabel rescue Iqvoc::Label # FIXME: breaks encapsulation (hard-coded iqvoc_skosxl dependency)
+    klass = Iqvoc::Xllabel rescue Iqvoc::Label # FIXME: breaks encapsulation (hard-coded iqvoc_skosxl dependency)
     label = klass.base_class.create!(attributes)
 
     inflectionals.each { |inf|

data/app/aides/origin.rb

@@ -25,7 +25,7 @@ class Origin
   def valid?
     valid = true
 
-    if blank_node = initial_value.match(RDFAPI::BLANK_NODE_REGEXP)
+    if blank_node = initial_value.match(RdfApi::BLANK_NODE_REGEXP)
       # blank node validation, should not contain special chars
       valid = false if CGI.escape(blank_node[1]) != blank_node[1]
     else

data/app/aides/{rdfapi.rb → rdf_api.rb}

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class RDFAPI
+class RdfApi
   FIRST_LEVEL_OBJECT_CLASSES  = [Iqvoc::Concept.base_class, Iqvoc::Collection.base_class]
   SECOND_LEVEL_OBJECT_CLASSES = Iqvoc::Concept.labeling_classes.keys +
   Iqvoc::Concept.note_classes +

data/app/aides/skos_importer.rb

@@ -269,7 +269,7 @@ class SkosImporter
   end
 
   def blank_node?(str)
-    str.to_s =~ RDFAPI::BLANK_NODE_REGEXP
+    str.to_s =~ RdfApi::BLANK_NODE_REGEXP
   end
 
   def extract_triple(line)

data/app/assets/javascripts/iqvoc/iqvoc.js

@@ -84,11 +84,12 @@ jQuery(document).ready(function($) {
 
   $('.datepicker').datepicker({
     autoclose: true,
-    todayHighlight: true,
-    todayBtn: 'linked',
     clearBtn: true,
     format: "yyyy-mm-dd",
-    language: locale
+    keyboardNavigation: false,
+    language: locale,
+    todayHighlight: true,
+    todayBtn: 'linked',
   });
 
   //$("tr.highlightable").click(function(ev) {

data/app/assets/javascripts/iqvoc/treeview.js

@@ -96,9 +96,9 @@ import 'jqtree/tree.jquery.js';
               'glance-url': node.glance_url
             });
 
-            var saveButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
-            var copyButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
-            var undoButton = $('<button type="button" class="btn btn-primary btn-xs reset-node-btn"><i class="fa fa-undo"></i> ' + undoLabel + '</button>');
+            var saveButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
+            var copyButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
+            var undoButton = $('<button type="button" class="btn btn-primary btn-sm reset-node-btn"><i class="fa fa-undo"></i> ' + undoLabel + '</button>');
 
             // add icon only to the first element of the collection.
             // the second one could be a nodelist for parents nodes.

data/app/assets/stylesheets/_framework.scss

@@ -1,4 +1,4 @@
 @import 'bootstrap/scss/bootstrap';
 
 @import 'font-awesome/scss/font-awesome';
-@import 'bootstrap-datepicker/dist/css/bootstrap-datepicker3';
+@import 'bootstrap-datepicker/dist/css/bootstrap-datepicker3.standalone';

data/app/controllers/collections/alphabetical_controller.rb

@@ -0,0 +1,75 @@
+# encoding: UTF-8
+
+# Copyright 2011-2025 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Collections::AlphabeticalController < CollectionsController
+  include DatasetInitialization
+
+  def index
+    authorize! :read, Concept::Base
+
+    # only initialize dataset if dataset param is set
+    # prevent obsolet http request when using matches widget
+    datasets = params[:dataset] ? init_datasets : []
+
+    identify_used_first_letters
+
+    if dataset = datasets.detect { |dataset| dataset.name == params[:dataset] }
+      query = params[:prefix].to_s.downcase
+      @search_results = dataset.alphabetical_search(query, I18n.locale) || []
+      @search_results = Kaminari.paginate_array(@search_results).page(params[:page])
+    else
+      # When in single query mode, AR handles ALL includes to be loaded by that
+      # one query. We don't want that! So let's do it manually :-)
+      includes = Iqvoc::Collection.base_class.default_includes
+      if Iqvoc::Collection.note_classes.include?(Note::Skos::Definition)
+        includes << Note::Skos::Definition.name.to_relation_name
+      end
+
+      search_results_size = find_labelings.count
+      search_results = find_labelings.page(params[:page])
+      Iqvoc::Collection.pref_labeling_class.preload(search_results, owner: includes)
+
+      @search_results = search_results.to_a.map { |pl| AlphabeticalSearchResult.new(pl) }
+      @search_results = Kaminari.paginate_array(@search_results, total_count: search_results_size).page(params[:page])
+    end
+
+    respond_to do |format|
+      format.html { render :index, layout: with_layout? }
+    end
+  end
+
+  protected
+
+  def identify_used_first_letters
+    @letters = Label::Base.where("#{Label::Base.table_name}.language = ?", I18n.locale).joins(:pref_labeled_collections).where("concepts.published_at IS NOT NULL").where("concepts.expired_at IS NULL OR concepts.expired_at >= ?", Time.now).where("concepts.type = ?", Iqvoc::Collection.base_class_name).select("DISTINCT UPPER(SUBSTR(value, 1, 1)) AS letter").order("letter").map(&:letter)
+  end
+
+  def find_labelings
+    letter = (@letters.include?('A')) ? 'a' : @letters.first
+    query = (params[:prefix] || letter)&.to_s&.downcase
+
+    Iqvoc::Collection.pref_labeling_class
+      .collection_published
+      .collection_not_expired
+      .label_begins_with(query)
+      .by_label_language(I18n.locale)
+      .includes(:target)
+      .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))
+      .joins(:owner)
+      .where(concepts: { type: Iqvoc::Collection.base_class_name })
+      .references(:collections, :labels, :labelings)
+  end
+end

data/app/controllers/collections/expired_controller.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+
+# Copyright 2011-2025 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Collections::ExpiredController < Collections::AlphabeticalController
+  protected
+
+  def identify_used_first_letters
+    @letters = Label::Base.where("#{Label::Base.table_name}.language = ?", I18n.locale).joins(:pref_labeled_collections).where("concepts.expired_at < ?", Time.now).where("concepts.type = ?", Iqvoc::Collection.base_class_name).select("DISTINCT UPPER(SUBSTR(value, 1, 1)) AS letter").order("letter").map(&:letter)
+  end
+
+  def find_labelings
+    query = (params[:prefix] || @letters.first || 'a').to_s.downcase
+
+    Iqvoc::Collection.pref_labeling_class
+      .collection_expired
+      .label_begins_with(query)
+      .by_label_language(I18n.locale)
+      .includes(:target)
+      .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))
+      .joins(:owner)
+      .where(concepts: { type: Iqvoc::Collection.base_class_name })
+      .references(:collections, :labels, :labelings)
+  end
+end

data/app/controllers/collections_controller.rb

@@ -18,14 +18,18 @@ class CollectionsController < ApplicationController
   def index
     authorize! :read, Iqvoc::Collection.base_class
 
+    scope = Iqvoc::Collection.base_class
+                             .with_pref_labels
+                             .published
+                             .not_expired
+
     respond_to do |format|
       format.html do
-        @top_collections = Iqvoc::Collection.base_class.with_pref_labels.published
         @top_collections = if params[:root].present?
-          @top_collections.by_parent_id(params[:root])
-        else
-          @top_collections.tops
-        end
+                             scope.by_parent_id(params[:root])
+                           else
+                             scope.tops
+                           end
 
         @top_collections.to_a.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
 
@@ -33,30 +37,22 @@ class CollectionsController < ApplicationController
       end
       format.json do # For the widget and treeview
         response = if params[:root].present?
-          collections = Iqvoc::Collection.base_class
-                                         .with_pref_labels
-                                         .published
-                                         .by_parent_id(params[:root])
-                                         .sort_by { |c| c.pref_label.to_s }
+          collections = scope.by_parent_id(params[:root])
+                             .sort_by { |c| c.pref_label.to_s }
 
           collections.map do |collection|
-            res = {
+            {
               id: collection.id,
               url: collection_path(id: collection, format: :html),
               name: CGI.escapeHTML(collection.pref_label.to_s),
-              load_on_demand: collection.subcollections.any?
-            }
-            res[:additionalText] = " (#{collection.additional_info})" if collection.additional_info
-
-            res
+              load_on_demand: collection.subcollections.any?,
+              additionalText: collection.additional_info&.then { |info| " (#{info})" }
+            }.compact
           end
         else
-          collections = Iqvoc::Collection.base_class
-                                         .with_pref_labels
-                                         .published
-                                         .merge(Label::Base.by_query_value("#{params[:query]}%"))
-                                         .sort_by { |c| c.pref_label.to_s }
-                                         .map { |c| collection_widget_data(c) }
+          scope.merge(Label::Base.by_query_value("#{params[:query]}%"))
+               .sort_by { |c| c.pref_label.to_s }
+               .map { |c| collection_widget_data(c) }
         end
         render json: response
       end
@@ -99,9 +95,7 @@ class CollectionsController < ApplicationController
   def create
     authorize! :create, Iqvoc::Collection.base_class
 
-    @collection = Iqvoc::Collection.base_class.new(concept_params)
-
-    @collection.lock_by_user(current_user.id)
+    @collection = Iqvoc::Collection.base_class.new(collection_params)
 
     if @collection.save
       flash[:success] = I18n.t('txt.controllers.collections.save.success')
@@ -130,9 +124,9 @@ class CollectionsController < ApplicationController
     authorize! :update, @collection
 
     # set to_review to false if someone edits a concepts
-    concept_params["to_review"] = "false"
+    collection_params["to_review"] = "false"
 
-    if @collection.update(concept_params)
+    if @collection.update(collection_params)
       flash[:success] = I18n.t('txt.controllers.collections.save.success')
       redirect_to collection_path(@collection, published: 0)
     else
@@ -156,7 +150,7 @@ class CollectionsController < ApplicationController
 
   private
 
-  def concept_params
+  def collection_params
     params.require(:concept).permit!
   end
 

data/app/controllers/concepts/alphabetical_controller.rb

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-
 class Concepts::AlphabeticalController < ConceptsController
   include DatasetInitialization
 
@@ -29,15 +27,15 @@ class Concepts::AlphabeticalController < ConceptsController
     identify_used_first_letters
 
     if dataset = datasets.detect { |dataset| dataset.name == params[:dataset] }
-      query = params[:prefix].mb_chars.downcase.to_s
+      query = params[:prefix].to_s.downcase
       @search_results = dataset.alphabetical_search(query, I18n.locale) || []
       @search_results = Kaminari.paginate_array(@search_results).page(params[:page])
     else
       # When in single query mode, AR handles ALL includes to be loaded by that
       # one query. We don't want that! So let's do it manually :-)
       includes = Iqvoc::Concept.base_class.default_includes
-      if Iqvoc::Concept.note_classes.include?(Note::SKOS::Definition)
-        includes << Note::SKOS::Definition.name.to_relation_name
+      if Iqvoc::Concept.note_classes.include?(Note::Skos::Definition)
+        includes << Note::Skos::Definition.name.to_relation_name
       end
 
       search_results_size = find_labelings.count
@@ -61,7 +59,7 @@ class Concepts::AlphabeticalController < ConceptsController
 
   def find_labelings
     letter = (@letters.include?('A')) ? 'a' : @letters.first
-    query = (params[:prefix] || letter)&.mb_chars&.downcase.to_s
+    query = (params[:prefix] || letter)&.to_s&.downcase
 
     Iqvoc::Concept.pref_labeling_class
       .concept_published

data/app/controllers/concepts/expired_controller.rb

@@ -22,7 +22,7 @@ class Concepts::ExpiredController < Concepts::AlphabeticalController
   end
 
   def find_labelings
-    query = (params[:prefix] || @letters.first || 'a').mb_chars.downcase.to_s
+    query = (params[:prefix] || @letters.first || 'a').to_s.downcase
 
     Iqvoc::Concept.pref_labeling_class
       .concept_expired

data/app/controllers/concepts/hierarchical_controller.rb

@@ -36,21 +36,24 @@ class Concepts::HierarchicalController < ConceptsController
 
     # if params[:broader] is given, the action is handling the reversed tree
     root_id = params[:root]
-    if root_id && root_id =~ /\d+/
-      # NB: order matters; see the following `where`
-      if params[:broader]
-        scope = scope.includes(:narrower_relations, :broader_relations).references(:relations)
-      else
-        scope = scope.includes(:broader_relations, :narrower_relations).references(:relations)
-      end
-      @concepts = scope.where(Concept::Relation::Base.arel_table[:target_id].eq(root_id))
-    else
-      if params[:broader]
-        @concepts = scope.broader_tops.includes(:broader_relations).references(:concepts)
-      else
-        @concepts = scope.tops.includes(:narrower_relations).references(:concepts)
-      end
-    end
+    broader = params[:broader].present?
+
+    @concepts = if root_id && root_id =~ /\d+/
+                  # NB: order matters; see the following `where`
+                  if broader
+                    scope = scope.includes(:narrower_relations, :broader_relations).references(:relations)
+                  else
+                    scope = scope.includes(:broader_relations, :narrower_relations).references(:relations)
+                  end
+                  scope.where(Concept::Relation::Base.arel_table[:target_id].eq(root_id))
+                else
+                  if broader
+                    scope.broader_tops.includes(:broader_relations).references(:concepts)
+                  else
+                    scope.tops.includes(:narrower_relations).references(:concepts)
+                  end
+                end
+    @concepts = @concepts.sort_by { |c| c.pref_label.to_s }
 
     respond_to do |format|
       format.html

data/app/controllers/concepts_controller.rb

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-require 'reverse_match_job'
-
 class ConceptsController < ApplicationController
   include DatasetInitialization
 

data/app/controllers/concepts_movement_controller.rb

@@ -83,7 +83,7 @@ class ConceptsMovementController < ApplicationController
       r.target = new_parent
     end
 
-    Concept::Relation::SKOS::Narrower::Base.create! do |r|
+    Concept::Relation::Skos::Narrower::Base.create! do |r|
       r.owner = new_parent
       r.target = moved_concept
     end

data/app/controllers/concerns/controller_extensions.rb

@@ -16,10 +16,25 @@ module ControllerExtensions
     rescue_from CanCan::AccessDenied, with: :handle_access_denied
     rescue_from ActionController::ParameterMissing, with: :handle_bad_request
     rescue_from ActionController::UnknownFormat, with: :handle_unknown_format
+    rescue_from ActionController::BadRequest, with: :handle_bad_request
   end
 
   protected
 
+  def append_info_to_payload(payload)
+    super
+
+    # not set by rails because we rescue exceptions using :handle_server_error
+    if @exception.present?
+      payload[:exception] = [@exception.class.name, @exception.message]
+      payload[:exception_object] = @exception
+    end
+
+    if current_user.present?
+      payload[:user_id] = current_user.id
+    end
+  end
+
   def default_url_options(options = nil)
     { format: params[:format], lang: I18n.locale }.
     merge(options || {})

data/app/controllers/dashboard_controller.rb

@@ -69,7 +69,7 @@ class DashboardController < ApplicationController
     object = objects.send(params[:published] == "1" ? 'published' : 'unpublished').first
 
     @title = object.to_s
-    @editorial_notes = object.notes_for_class(Note::SKOS::EditorialNote)
+    @editorial_notes = object.notes_for_class(Note::Skos::EditorialNote)
 
     @path = send(object.class_path, id: object, published: params[:published])
 

data/app/controllers/exports_controller.rb

@@ -26,6 +26,7 @@ class ExportsController < ApplicationController
 
   def show
     @export = Export.find(params[:id])
+    flash[:warning] = t('txt.views.export.success') unless @export.finished_at?
   end
 
   def create
@@ -45,17 +46,25 @@ class ExportsController < ApplicationController
     redirect_to exports_path
   end
 
+  def destroy
+    export = Export.find(params[:id])
+    if export.destroy
+      flash[:success] = t('txt.views.export.delete.success')
+    else
+      flash[:error] = t('txt.views.export.delete.error')
+    end
+    redirect_to exports_path
+  end
+
   def download
     export = Export.find(params[:export_id])
-    time = export.finished_at.strftime('%Y-%m-%d_%H-%M')
+    time = export.finished_at&.strftime('%Y-%m-%d_%H-%M')
 
-    begin
-      Rails.logger.debug("Try to serve export from: #{export.build_filename}")
-      send_file export.build_filename, filename: "export-#{time}.#{export.file_type}"
-    rescue ::ActionController::MissingFile => e
-      flash[:error] = t('txt.views.export.missing_file')
-      redirect_to exports_path
-    end
+    Rails.logger.debug("Try to serve export from: #{export.build_filename}")
+    send_file export.build_filename, filename: "export-#{time}.#{export.file_type}"
+  rescue ::ActionController::MissingFile => e
+    flash[:error] = t('txt.views.export.missing_file')
+    redirect_to exports_path
   end
 
   private

data/app/controllers/rdf_controller.rb

@@ -15,8 +15,6 @@
 # limitations under the License.
 
 class RdfController < ApplicationController
-  skip_before_action :set_locale
-
   def show
     scope = if params[:published] == '0'
       Iqvoc::Concept.base_class.unpublished

data/app/controllers/remote_labels_controller.rb

@@ -1,5 +1,3 @@
-require 'concerns/dataset_initialization'
-
 class RemoteLabelsController < ApplicationController
   include DatasetInitialization
 

data/app/controllers/search_results_controller.rb

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'concerns/dataset_initialization'
-
 class SearchResultsController < ApplicationController
   include DatasetInitialization
 
@@ -92,55 +90,73 @@ class SearchResultsController < ApplicationController
     @remote_result_collections = []
 
     if params[:query]
-      # Deal with language parameter patterns
-      languages = []
-      # Either "l[]=de&l[]=en" as well as "l=de,en" should be possible
-      if params[:languages].respond_to?(:each) && params[:languages].include?('none')
-        # Special treatment for the "nil language"
-        languages << nil
-      elsif params[:languages].respond_to?(:split)
-        languages = params[:languages].split(',')
-      end
+      if params[:query].blank? and request.format.to_sym.in? [:ttl, :nt, :rdf]
+        # support blank searches via web ui, but not for api requests
+        respond_to do |format|
+          format.any(:ttl, :rdf, :nt) do
+            head :bad_request
+          end
+        end
+      else
+        # Deal with language parameter patterns
+        languages = []
+        # Either "l[]=de&l[]=en" as well as "l=de,en" should be possible
+        if params[:languages].respond_to?(:each) && params[:languages].include?('none')
+          # Special treatment for the "nil language"
+          languages << nil
+        elsif params[:languages].respond_to?(:split)
+          languages = params[:languages].split(',')
+        end
 
-      # Ensure a valid class was selected
-      unless klass = Iqvoc.searchable_class_names.detect { |key, value| value == params[:type] }.try(:first)
-        raise "'#{params[:type]}' is not a searchable class! Must be one of " + Iqvoc.searchable_class_names.keys.join(', ')
-      end
-      klass = klass.constantize
+        # Ensure a valid class was selected
+        unless klass = Iqvoc.searchable_class_names.detect { |key, value| value == params[:type] }.try(:first)
+          raise "'#{params[:type]}' is not a searchable class! Must be one of " + Iqvoc.searchable_class_names.keys.join(', ')
+        end
+        klass = klass.constantize
 
-      @results = klass.single_query(params.merge({ languages: languages.flatten }))
-                      .filter { |search_result| result_allowed?(search_result) }
+        @results = klass.single_query(params.merge({ languages: languages.flatten }))
+                        .filter { |search_result| result_allowed?(search_result) }
 
-      if params[:limit] && Iqvoc.unlimited_search_results
-        @results = @results.per(params[:limit].to_i)
-      end
+        if params[:limit] && Iqvoc.unlimited_search_results
+          @results = @results.per(params[:limit].to_i)
+        end
 
-      if params[:datasets] && datasets = @datasets.select { |a| params[:datasets].include?(a.name) }
-        @results = SearchResultCollection.new(@results)
-        datasets.each do |dataset|
-          results = dataset.search(params)
-          if results
-            @results = @results + results
-          else
-            flash.now[:error] ||= []
-            flash.now[:error] << t('txt.controllers.search_results.remote_source_error', source: dataset)
+        if params[:datasets] && datasets = @datasets.select { |a| params[:datasets].include?(a.name) }
+          @results = SearchResultCollection.new(@results)
+          datasets.each do |dataset|
+            results = dataset.search(params)
+            if results
+              @results = @results + results
+            else
+              flash.now[:error] ||= []
+              flash.now[:error] << t('txt.controllers.search_results.remote_source_error', source: dataset)
+            end
           end
+          @results = @results.sort { |x, y| x.to_s <=> y.to_s }
         end
-        @results = @results.sort { |x, y| x.to_s <=> y.to_s }
-      end
-
-      @results = Kaminari.paginate_array(@results)
-      @results = @results.page(params[:page])
 
+        @results = Kaminari.paginate_array(@results)
+        @results = @results.page(params[:page])
+
+        respond_to do |format|
+          format.html {
+            if request.headers['Accept'] == 'text/html; fragment=true'
+              render template: 'search_results/_result_list', layout: false
+            else
+              render :index, layout: with_layout?
+            end
+          }
+          format.any(:ttl, :rdf, :nt)
+        end
+      end
+    else
       respond_to do |format|
-        format.html {
-          if request.headers['Accept'] == 'text/html; fragment=true'
-            render template: 'search_results/_result_list', layout: false
-          else
-            render :index, layout: with_layout?
-          end
-        }
-        format.any(:ttl, :rdf, :nt)
+        format.html do
+          render :index
+        end
+        format.any(:ttl, :rdf, :nt) do
+          head :bad_request
+        end
       end
     end
   end