triannon 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a7669bd9da9a9b2606b8e69581aefa06ba3758
-  data.tar.gz: 647d6a29caedcec5c4050d6fa2fcb52024e07248
+  metadata.gz: d962055a1eab01f2506013e1b964c52c4e8f53b8
+  data.tar.gz: 2015fcbfba7f07fed353a59250a044376863aad0
 SHA512:
-  metadata.gz: d1a31dcf5fd7f41d9cd07a5b516c6fda3f3c90c8ae9eeffbbdd4ee50dba79d0cedc9bc27e6af741ac7834186d8a7bc930824e508ab4cad8eafae635abd0a8f29
-  data.tar.gz: 646d9abc0b152ab17e852295f3e0e7c8a58d0343572f5be6de8b596be10540fb1664e27eed4881be2af19b2c9ab20306edf2c5e48c9c42baf8c4357e9ab4bcd1
+  metadata.gz: a267c5b3a4c2fd76e386ca1b9f6e196dd5905a94c9590c9698ec906add9614df8c512d6382ce2c17f7aad619dc608435904dfe28fbd22748b2df87532310340e
+  data.tar.gz: c22b8ddb6e7b659598f879aceefa008345b35995b8945b8aa57a218162f5b29a5cc2e2bc420034727e02af14624fc113949165acfb11ab7331d7c9f6b7073d03

data/README.md

@@ -50,7 +50,7 @@ Set up caching for jsonld context documents:
 ** add to Gemfile:
 
 ```ruby
-gem 'rest-client', '~> 1.7.2'
+gem 'rest-client', '~> 1.7.3' # problem with rest-client 1.8.0 and rest-client-components
 gem 'rack-cache'
 gem 'rest-client-components'
 ``` 

data/app/controllers/concerns/rdf_response_formats.rb

@@ -0,0 +1,72 @@
+# methods to support RDF response formats
+module RdfResponseFormats
+  extend ActiveSupport::Concern
+
+  # find first mime type from request.accept that matches return mime type
+  def mime_type_from_accept(return_mime_types)
+    @mime_type_from_accept ||= begin
+      if request.accept && request.accept.is_a?(String)
+        accept_mime_types = request.accept.split(',')
+        accept_mime_types.each { |mime_type|
+          mime_str = mime_type.split("; profile=").first.strip
+          if return_mime_types.include? mime_str
+            return mime_str
+          end
+        }
+      end
+    end
+  end
+
+  # set format to jsonld if it isn't already set
+  def default_format_jsonld
+    if ((!request.accept || request.accept.empty?) && (!params[:format] || params[:format].empty?))
+      request.format = "jsonld"
+    end
+  end
+
+  # parse the Accept HTTP header for the value of profile if it is a request for jsonld or json
+  # e.g. Accept: application/ld+json; profile="http://www.w3.org/ns/oa-context-20130208.json"
+  # @return [String] url for jsonld @context or nil if missing or non-jsonld/json format
+  def context_url_from_accept
+    if request.format == "jsonld" || request.format == "json"
+      accept_str = request.accept
+      if accept_str && accept_str.split("profile=") && accept_str.split("profile=").last
+        context_url = accept_str.split("profile=").last.strip
+        context_url = context_url[1, context_url.size] if context_url.start_with?('"')
+        context_url = context_url[0, context_url.size-1] if context_url.end_with?('"')
+        case context_url
+          when Triannon::JsonldContext::OA_DATED_CONTEXT_URL,
+            Triannon::JsonldContext::OA_CONTEXT_URL,
+            Triannon::JsonldContext::IIIF_CONTEXT_URL
+            context_url
+          else
+            nil
+        end
+      end
+    end
+  end
+
+  # parse the Accept HTTP Link for the value of rel if it is a request for jsonld or json
+  # e.g. Link: http://www.w3.org/ns/oa.json; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
+  # note that the "type" part is optional
+  # @return [String] url for jsonld @context or nil if missing or non-jsonld/json format
+  def context_url_from_link
+    if request.format == "jsonld" || request.format == "json"
+      link_str = request.headers["Link"]
+      if link_str && link_str.split("; rel=") && link_str.split("; rel=").first
+        context_url = link_str.split("; rel=").first.strip
+        case context_url
+          when Triannon::JsonldContext::OA_DATED_CONTEXT_URL,
+            Triannon::JsonldContext::OA_CONTEXT_URL,
+            Triannon::JsonldContext::IIIF_CONTEXT_URL
+            context_url
+          else
+            nil
+        end
+      end
+    end
+  end
+
+
+
+end

data/app/controllers/triannon/annotations_controller.rb

@@ -2,6 +2,8 @@ require_dependency "triannon/application_controller"
 
 module Triannon
   class AnnotationsController < ApplicationController
+    include RdfResponseFormats
+
     before_action :default_format_jsonld, only: [:show]
     before_action :set_annotation, only: [:show, :update, :destroy]
     rescue_from Triannon::ExternalReferenceError, with: :ext_ref_error
@@ -51,7 +53,7 @@ module Triannon
     end
 
     # NOT YET IMPLEMENTED
-    # GET /annotations/1/edit    
+    # GET /annotations/1/edit
 #    def edit
 #    end
 
@@ -71,7 +73,7 @@ module Triannon
         content_type = request.headers["Content-Type"]
         @annotation = Annotation.new({:data => request.body.read, :expected_content_type => content_type})
       end
-      
+
       if @annotation.save
         default_format_jsonld # NOTE: this must be here and not in before_filter or we get Missing template errors
         flash[:notice] = "Annotation #{@annotation.id} was successfully created."
@@ -124,83 +126,18 @@ module Triannon
       @annotation.destroy
       redirect_to annotations_url, status: 204, notice: 'Annotation was successfully destroyed.'
     end
-    
+
 private
 
     def set_annotation
       @annotation = Annotation.find(params[:id])
     end
-    
-    # set format to jsonld if it isn't already set
-    def default_format_jsonld
-      if ((!request.accept || request.accept.empty?) && (!params[:format] || params[:format].empty?))
-        request.format = "jsonld"
-      end
-    end
-
-    # find first mime type from request.accept that matches return mime type
-    def mime_type_from_accept(return_mime_types)
-      @mime_type_from_accept ||= begin
-        if request.accept && request.accept.is_a?(String)
-          accept_mime_types = request.accept.split(',')
-          accept_mime_types.each { |mime_type|
-            mime_str = mime_type.split("; profile=").first.strip
-            if return_mime_types.include? mime_str
-              return mime_str
-            end
-          }
-        end
-      end
-    end
-
-    # parse the Accept HTTP header for the value of profile if it is a request for jsonld or json
-    # e.g. Accept: application/ld+json; profile="http://www.w3.org/ns/oa-context-20130208.json"
-    # @return [String] url for jsonld @context or nil if missing or non-jsonld/json format
-    def context_url_from_accept
-      if request.format == "jsonld" || request.format == "json"
-        accept_str = request.accept
-        if accept_str && accept_str.split("profile=") && accept_str.split("profile=").last
-          context_url = accept_str.split("profile=").last.strip
-          context_url = context_url[1, context_url.size] if context_url.start_with?('"')
-          context_url = context_url[0, context_url.size-1] if context_url.end_with?('"')
-          case context_url
-            when Triannon::JsonldContext::OA_DATED_CONTEXT_URL, 
-              Triannon::JsonldContext::OA_CONTEXT_URL,
-              Triannon::JsonldContext::IIIF_CONTEXT_URL
-              context_url
-            else
-              nil
-          end
-        end
-      end
-    end
-
-    # parse the Accept HTTP Link for the value of rel if it is a request for jsonld or json
-    # e.g. Link: http://www.w3.org/ns/oa.json; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
-    # note that the "type" part is optional
-    # @return [String] url for jsonld @context or nil if missing or non-jsonld/json format
-    def context_url_from_link
-      if request.format == "jsonld" || request.format == "json"
-        link_str = request.headers["Link"]
-        if link_str && link_str.split("; rel=") && link_str.split("; rel=").first
-          context_url = link_str.split("; rel=").first.strip
-          case context_url
-            when Triannon::JsonldContext::OA_DATED_CONTEXT_URL,
-              Triannon::JsonldContext::OA_CONTEXT_URL,
-              Triannon::JsonldContext::IIIF_CONTEXT_URL
-              context_url
-            else
-              nil
-          end
-        end
-      end
-    end
 
     # handle Triannon::ExternalReferenceError
     def ext_ref_error(exception)
       render plain: exception.message, status: 403
     end
-    
+
     # render json_ld respecting requested context
     # @param [String] req_context set to "iiif" or "oa".  Default is oa
     # @param [String] mime_type the mime type to be set in the Content-Type header of the HTTP response

data/app/controllers/triannon/search_controller.rb

@@ -0,0 +1,46 @@
+require_dependency "triannon/application_controller"
+
+module Triannon
+  class SearchController < ApplicationController
+    include RdfResponseFormats
+
+    before_action :default_format_jsonld, only: [:find]
+
+    def find
+      anno_graphs_array = solr_searcher.find(params)
+
+      # add id to iiif_anno_list
+      @list_hash = Triannon::IIIFAnnoList.anno_list(anno_graphs_array)
+      @list_hash["@id"] = request.original_url if @list_hash
+
+      respond_to do |format|
+        format.jsonld { render :json => @list_hash.to_json, content_type: "application/ld+json" }
+        format.ttl {
+          accept_return_type = mime_type_from_accept(["application/x-turtle", "text/turtle"])
+          render :body => RDF::Graph.new.from_jsonld(@list_hash.to_json).to_ttl, content_type: accept_return_type if accept_return_type
+        }
+        format.rdfxml {
+          accept_return_type = mime_type_from_accept(["application/rdf+xml", "text/rdf+xml", "text/rdf"])
+          render :body => RDF::Graph.new.from_jsonld(@list_hash.to_json).to_rdfxml, content_type: accept_return_type if accept_return_type }
+        format.json {
+          accept_return_type = mime_type_from_accept(["application/json", "text/x-json", "application/jsonrequest"])
+          render :json => @list_hash.to_json, content_type: accept_return_type
+        }
+        format.xml {
+          accept_return_type = mime_type_from_accept(["application/xml", "text/xml", "application/x-xml"])
+          render :xml => RDF::Graph.new.from_jsonld(@list_hash.to_json).to_rdfxml, content_type: accept_return_type if accept_return_type }
+        format.html { render :find }
+      end
+    end
+
+
+  protected
+
+    def solr_searcher
+      @ss ||= Triannon::SolrSearcher.new
+    end
+
+
+  end # SearchController
+
+end # Triannon

data/app/models/triannon/annotation.rb

@@ -102,7 +102,7 @@ protected
 
     # Add annotation to Solr as a Solr document
     def solr_save
-      solr_writer.write(graph) if graph && graph.id_as_url && !graph.id_as_url.empty?
+      solr_writer.write(graph) if id_as_url && !id_as_url.empty?
     end
 
     # Delete annotation from Solr

data/app/services/triannon/solr_searcher.rb

@@ -0,0 +1,164 @@
+module Triannon
+  class SolrSearcher
+
+    # convert RSolr::Response object into an array of Triannon::Graph objects,
+    #   where each graph object contains a single annotation returned in the response docs
+    # @param [Hash] rsolr_response an RSolr response to a query.  It's actually an
+    #   RSolr::HashWithResponse but let's not quibble
+    # @return [Array<Triannon::Graph>]
+    def self.anno_graphs_array(rsolr_response)
+      result = []
+      # TODO: deal with Solr pagination
+      rsolr_response['response']['docs'].each { |solr_doc_hash|
+        result << Triannon::Graph.new(RDF::Graph.new.from_jsonld(solr_doc_hash['anno_jsonld']))
+      }
+      result
+    end
+    
+    # @note hardcoded Solr search service expectation in generated search params
+    # @note hardcoded mapping of REST params for /search to Solr params
+    #
+    # Convert action request params to appropriate params
+    #   to be sent to the search service as part of a search request
+    #
+    # request params are given in "Annotation Lists in Triannon" by Robert Sanderson
+    #   in Google Docs:
+    #
+    # - targetUri, value is a URI
+    # - bodyUri, value is a URI
+    # - bodyExact, value is a string
+    # - bodyKeyword, value is a string
+    # - bodyType, value is a URI
+    # - motivatedBy, value is a URI (or just the fragment portion)
+    # - annotatedBy, value is a URI
+    # - annotatedAt, value is a datetime
+    #
+    # @param [Hash<String => String>] controller_params params from Controller
+    # @return [Hash] params to send to Solr as a Hash
+    def self.solr_params(controller_params)
+      solr_params_hash = {}
+      q_terms_array = []
+      fq_terms_array = []
+
+      controller_params.each_pair { |k, v|
+        case k.downcase
+          when 'targeturi'
+            q_terms_array << q_terms_for_url("target_url", v)
+          when 'bodyuri'
+            q_terms_array << q_terms_for_url("body_url", v)
+          when 'bodyexact'
+            # no need to Solr escape value because it's in quotes
+            q_terms_array << "body_chars_exact:\"#{v}\""
+          when 'motivatedby'
+            case
+              when v.include?('#')
+                # we want fragment portion of URL value only, as that
+                # is what is in Solr
+                fq_terms_array << "motivation:#{RSolr.solr_escape(v.sub(/^.*#/, ''))}"
+              when v == "http://www.shared-canvas.org/ns/painting", v == "sc:painting"
+                fq_terms_array << "motivation:painting"
+              else
+                fq_terms_array << "motivation:#{RSolr.solr_escape(v)}"
+            end
+          when 'bodykeyword'
+            solr_params_hash[:kqf] = 'body_chars_exact^3 body_chars_unstem^2 body_chars_stem'
+            solr_params_hash[:kpf] = 'body_chars_exact^15 body_chars_unstem^10 body_chars_stem^5'
+            solr_params_hash[:kpf3] = 'body_chars_exact^9 body_chars_unstem^6 body_chars_stem^3'
+            solr_params_hash[:kpf2] = 'body_chars_exact^6 body_chars_unstem^4 body_chars_stem^2'
+            q_terms_array << '_query_:"{!dismax qf=$kqf pf=$kpf pf3=$kpf3 pf2=$kpf2}' + RSolr.solr_escape(v) + '"'
+
+          # TODO: add'l params to implement:
+          # targetType - fq
+          # bodyType - fq
+          # annotatedAt - fq (deal with time format and wildcard for specificity)
+          # annotatedBy - q (may be incomplete string)
+        end
+      }
+
+      q_terms_array.flatten
+      if q_terms_array.size > 0
+        solr_params_hash[:q] = q_terms_array.join(' AND ')
+        solr_params_hash[:defType] = "lucene"
+      end
+      if fq_terms_array.size > 0
+        solr_params_hash[:fq] = fq_terms_array
+      end
+
+      solr_params_hash
+
+      # TODO:  integration tests for
+      #  target_url with and without the scheme prefix
+      #  target_url with and without fragment
+      #  bodykeyword single terms, multiple terms, quoted strings ...
+
+    end # solr_params
+
+
+    # If the url contains a fragment, query terms should only match the exact
+    #   url given (with the specific fragment).  (i.e. foo.org#bar does not
+    #   match foo.org)
+    # If the url does NOT contain a fragment, query terms should match the
+    #   url given (no fragment) AND any urls that are the same with a fragment
+    #   added.  (i.e. foo.org  matches  foo.org#bar)
+    # @param [String] fieldname the name of the Solr field to be searched with url as a value
+    # @param [String] url the url value sought in the Solr field
+    # @return [Array<String>] an array of query terms to be added to the Solr q argument
+    def self.q_terms_for_url(fieldname, url)
+      q_terms = []
+      q_terms << "#{fieldname}:#{RSolr.solr_escape(url)}"
+      if !url.include? '#'
+        # Note: do NOT Solr escape the # (unnec) or the * (want Solr to view it as wildcard)
+        q_terms << "#{fieldname}:#{RSolr.solr_escape(url)}#*"
+      end
+      q_terms
+    end
+
+
+    def initialize
+      @rsolr_client = RSolr.connect :url => Triannon.config[:solr_url]
+      @logger = Rails.logger
+      @max_retries = Triannon.config[:max_solr_retries] || 5
+      @base_sleep_seconds = Triannon.config[:base_sleep_seconds] || 1
+      @max_sleep_seconds = Triannon.config[:max_sleep_seconds] || 5
+    end
+
+    #  to be called from controller:
+    #     1.  converts controller params to solr params
+    #     2.  sends request to Solr
+    #     3.  converts Solr response object to array of anno graphs
+    # @param [Hash<String => String>] controller_params params from Controller
+    # @return [Array<Triannon::Graph>] array of Triannon::Graph objects,
+    #   where each graph object contains a single annotation returned in the response docs
+    def find(controller_params)
+      solr_params = self.class.solr_params(controller_params)
+      solr_response = search(solr_params)
+      anno_graphs_array = self.class.anno_graphs_array(solr_response)
+    end
+
+
+    protected
+
+    # send params to Solr 'select' with POST, retrying if an error occurs.
+    # See https://github.com/ooyala/retries for info on with_retries.
+    # @param [Hash] solr_params the params to send to Solr
+    # @return RSolr::Response object
+    def search(solr_params = {})
+      handler = Proc.new do |exception, attempt_cnt, total_delay|
+        @logger.debug "#{exception.inspect} on Solr search attempt #{attempt_cnt} for #{solr_params.inspect}"
+      end
+
+      response = nil
+      with_retries(:handler => handler,
+                    :max_tries => @max_retries,
+                    :base_sleep_seconds => @base_sleep_seconds,
+                    :max_sleep_seconds => @max_sleep_seconds) do |attempt|
+        @logger.debug "Solr search attempt #{attempt} for #{solr_params.inspect}"
+        # use POST in case of long params
+        response = @rsolr_client.post 'select', :params => solr_params
+        @logger.info "Successfully searched Solr on attempt #{attempt}"
+      end
+      response
+    end
+
+  end
+end

data/app/views/triannon/search/find.html.erb

@@ -0,0 +1,3 @@
+<pre>
+<%= @list_hash.to_json.html_safe %>
+</pre>

data/config/routes.rb

@@ -1,26 +1,31 @@
 Triannon::Engine.routes.draw do
+
   root to: 'annotations#index'
 
-  # show action must explicitly forbid "new", "iiif" and "oa" as id values;  couldn't
-  #  figure out how to do it with regexp constraint since beginning and end regex
-  #  matchers aren't allowed when enforcing formats for segment (e.g. :id)
-  get '/annotations/:id(.:format)', to: 'annotations#show', 
-    constraints: lambda { |request| 
+  resources :annotations, except: [:update, :edit],
+    # show action must explicitly forbid "new", "iiif" and "oa" as id values;  couldn't
+    #   figure out how to do it with regexp constraint since beginning and end regex
+    #   matchers aren't allowed when enforcing formats for segment (e.g. :id)
+    constraints: lambda { |request|
                             id = request.env["action_dispatch.request.path_parameters"][:id]
-                            id !~ /^new$/ && id !~ /^iiif$/ && id !~ /^oa$/ 
-                        }
-
-  resources :annotations, :except => [:update, :edit, :show]
+                            id !~ /^iiif$/ && id !~ /^oa$/ && id !~ /^search$/
+                        } do
+    collection do
+      get 'search', to: 'search#find'
+    end
+  end
+  
+  get '/search', to: 'search#find'
 
   # allow jsonld context in path (only allow iiif or oa as values)
   # must explicitly forbid "new" as id values;  couldn't
-  #  figure out how to do it with regexp constraint since beginning and end regex
-  #  matchers aren't allowed when enforcing formats for segment (e.g. :id)
-  get '/annotations/:jsonld_context/:id(.:format)', to: 'annotations#show', 
-    constraints: lambda { |request| 
+  #   figure out how to do it with regexp constraint since beginning and end regex
+  #   matchers aren't allowed when enforcing formats for segment (e.g. :id)
+  get '/annotations/:jsonld_context/:id(.:format)', to: 'annotations#show',
+    constraints: lambda { |request|
                           jsonld_context = request.env["action_dispatch.request.path_parameters"][:jsonld_context]
                           id = request.env["action_dispatch.request.path_parameters"][:id]
                           (jsonld_context =~ /^iiif$/ || jsonld_context =~ /^oa$/ ) && id !~ /^new$/
                       }
-  
+
 end

data/lib/generators/triannon/install_generator.rb

@@ -30,7 +30,7 @@ production:
     end
 
     def add_linked_data_caching
-      gem 'rest-client', '~> 1.7.2'
+      gem 'rest-client', '~> 1.7.3' # problem with rest-client 1.8.0 and rest-client-components
       gem 'rack-cache'
       gem 'rest-client-components'
 

data/lib/triannon.rb

@@ -13,6 +13,7 @@ module Triannon
   require "triannon/engine"
   require "triannon/error"
   require "triannon/graph"
+  require "triannon/iiif_anno_list"
   require "triannon/jsonld_context"
 
   class << self

data/lib/triannon/iiif_anno_list.rb

@@ -0,0 +1,59 @@
+module Triannon
+
+  class IIIFAnnoList
+
+    # from http://iiif.io/api/presentation/2/annotationList_frame.json
+    ANNO_LIST_FRAME = JSON.parse('
+      {
+          "@context" : "http://iiif.io/api/presentation/2/context.json",
+          "@type": "sc:AnnotationList",
+          "resources": [{
+              "@type": "oa:Annotation",
+              "on" : [{
+                  "@embed" : false
+              }]
+          }]
+      }')
+
+    # from http://iiif.io/api/presentation/2/annotation_frame.json
+    ANNO_FRAME = JSON.parse('
+      {
+        "@context" : "http://iiif.io/api/presentation/2/context.json",
+        "@type": "oa:Annotation",
+        "on" : [{
+            "@embed" : false
+        }]
+      }')
+
+# Class Methods ----------------------------------------------------------------
+
+    # take an Array of annos as Triannon::Graph objects and return a Hash representation
+    #    of IIIF Annotation List
+    # @param [Array<Triannon::Graph>] tgraph_array annotations as Triannon::Graph objects
+    # @return [Hash] IIIF Annotation List as a Hash, containing the annotations in the array
+    def self.anno_list(tgraph_array)
+      if tgraph_array
+        result = {
+          "@context" => Triannon::JsonldContext::IIIF_CONTEXT_URL,
+          "@type" => "sc:AnnotationList",
+          "within" => {"@type" => "sc:Layer", "total" => tgraph_array.size },
+          "resources" => tgraph_array.map { |g|
+            embedded_body = JSON::LD::API.frame(JSON.parse(g.jsonld_iiif), ANNO_FRAME)
+            resource = embedded_body["@graph"]
+            if resource.is_a?(Array) && resource.size == 1
+              resource = resource.first
+            end
+            resource
+          }
+        }
+
+        # remove context from each anno as it is redundant
+        result["resources"].each { |anno_hash|
+          anno_hash.delete("@context")
+        }
+        result
+      end
+    end
+
+  end
+end

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -284,14 +284,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: rest-client-components
   requirement: !ruby/object:Gem::Requirement
@@ -335,8 +335,10 @@ files:
 - app/assets/javascripts/triannon/application.js
 - app/assets/stylesheets/triannon/annotations.css
 - app/assets/stylesheets/triannon/application.css.scss
+- app/controllers/concerns/rdf_response_formats.rb
 - app/controllers/triannon/annotations_controller.rb
 - app/controllers/triannon/application_controller.rb
+- app/controllers/triannon/search_controller.rb
 - app/helpers/triannon/application_helper.rb
 - app/models/triannon/annotation.rb
 - app/models/triannon/annotation_ldp.rb
@@ -344,6 +346,7 @@ files:
 - app/services/triannon/ldp_to_oa_mapper.rb
 - app/services/triannon/ldp_writer.rb
 - app/services/triannon/root_annotation_creator.rb
+- app/services/triannon/solr_searcher.rb
 - app/services/triannon/solr_writer.rb
 - app/views/layouts/triannon/application.html.erb
 - app/views/triannon/annotations/_form.html.erb
@@ -351,6 +354,7 @@ files:
 - app/views/triannon/annotations/index.html.erb
 - app/views/triannon/annotations/new.html.erb
 - app/views/triannon/annotations/show.html.erb
+- app/views/triannon/search/find.html.erb
 - config/initializers/mime_types.rb
 - config/routes.rb
 - config/solr/solr.xml
@@ -365,6 +369,7 @@ files:
 - lib/triannon/engine.rb
 - lib/triannon/error.rb
 - lib/triannon/graph.rb
+- lib/triannon/iiif_anno_list.rb
 - lib/triannon/jsonld_context.rb
 - lib/triannon/version.rb
 homepage: