krikri 0.4.0 → 0.5.0

data/app/models/krikri/validation_report.rb

@@ -0,0 +1,62 @@
+module Krikri
+  class ValidationReport
+    attr_accessor :provider_id, :start, :rows
+
+    REQUIRED_FIELDS = ['dataProvider_name', 'isShownAt_id', 'preview_id',
+                       'sourceResource_rights', 'sourceResource_title',
+                       'sourceResource_type_id']
+
+    ##
+    # @param &block may contain provider_id
+    #   Sample use:
+    #     ValidationReport.new.all do
+    #       self.provider_id = '0123'
+    #     end
+    #
+    # @return [Array<Blacklight::SolrResponse::Facet>]
+    def all(&block)
+      # set values from block
+      instance_eval &block if block_given?
+
+      query_params = { :rows => 0,
+                       'facet.field' => REQUIRED_FIELDS,
+                       'facet.mincount' => 10000000,
+                       'facet.missing' => true }
+      query_params[:fq] = "provider_id:\"#{provider_uri}\"" if
+        provider_id.present?
+
+      Krikri::SolrResponseBuilder.new(query_params).response.facets
+    end
+
+    ##
+    # @param id [String]
+    # @param &block may contain provider_id, start, rows
+    #   Sample use:
+    #     ValidationReport.new.find('sourceResource_title') do
+    #       self.provider_id = '0123'
+    #     end
+    #
+    # @raise [RSolr::Error::Http] for non-existant field requests
+    # @return [Blacklight::SolrResponse]
+    def find(id, &block)
+      # set values from block
+      instance_eval &block if block_given?
+
+
+      query_params = { :qt => 'standard', :q => "-#{id}:[* TO *]" }
+      query_params[:rows] = @rows.present? ? @rows : '10'
+      query_params[:fq] = "provider_id:\"#{provider_uri}\""
+      query_params[:start] = @start if @start.present? if
+        provider_id.present?
+
+      Krikri::SolrResponseBuilder.new(query_params).response
+    end
+
+    private
+
+    def provider_uri
+      return unless provider_id.present?
+      Krikri::Provider.new(provider_id).rdf_subject
+    end
+  end
+end

data/app/views/krikri/providers/index.html.erb

@@ -0,0 +1,18 @@
+<% content_for :title do %>Providers<% end %>
+
+<div id='main-container' class='container'>
+  <%= render :partial=>'krikri/shared/flash_message' %>
+
+  <h1>Dashboard</h1>
+  <h2><%= provider_name(@current_provider) %></h2>
+
+  <ul>
+  <% @providers.each do |provider| %>
+    <li>
+      <%= link_to provider_name(provider), { controller: 'providers',
+        action: 'show', id: provider.id } %> (<%= provider.records.count %> records)
+    </li>
+  <% end %>
+  </ul>
+
+</div>

data/app/views/krikri/providers/show.html.erb

@@ -0,0 +1,21 @@
+<% content_for :title do %>
+  <%= provider_name(@current_provider) %> Dashboard
+<% end %>
+
+<div id='main-container' class='container'>
+  <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
+
+  <h1>Dashboard</h1>
+  <h2><%= provider_name(@current_provider) %></h2>
+
+  <h3>Current Ingest</h3>
+  <div>QA Tasks</div>
+  <ul>
+    <li>
+      <%= link_to 'Records', krikri.records_path(provider: @current_provider.id) %>
+    </li>
+    <li>
+      <%= link_to 'Reports', krikri.reports_path(provider: @current_provider.id) %>
+    </li>
+  </ul>
+</div>

data/app/views/krikri/qa_reports/index.html.erb

@@ -0,0 +1,12 @@
+<% # krikri/qa_reports/index %>
+
+<h1>QA Reports</h1>
+<div id='main-container' class='container'>
+  <ul>
+    <% @reports.each do |report| %>
+    <li><span><%= provider_name(report.build_provider) %></span>
+      <%= link_to 'fields csv', qa_report_path(report, format: 'csv') %> -
+      <%= link_to 'count csv', qa_report_path(report, format: 'csv', type: 'count') %>
+    <% end %>
+  </ul>
+</div>

data/app/views/krikri/qa_reports/show.html.erb

@@ -0,0 +1 @@
+<% # krikri/qa_reports/show %>

data/app/views/krikri/records/index.html.erb

@@ -13,8 +13,6 @@
 
   <div class="row">
     <div id="sidebar" class="col-md-3 col-sm-4">
-      <%= button_to "View Reports", report_lists_path, :class => "btn btn-primary", 
-        :method => :get %>
       <%= render 'search_sidebar' %>
     </div>
 

data/app/views/krikri/records/show.html.erb

@@ -1,22 +1,25 @@
 <% content_for :title do %>QA Record: <%= @document.id.html_safe %><% end %>
 
-<div id="main-container" class="container">
+<div id='main-container' class='container'>
   <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
 
-  <h2>QA Record: <%= @document.id.html_safe %></h2>
+  <h1>Record</h1>
+  <h2><%= @document.id.html_safe %></h2>
 
-  <%= button_to 'Random record', random_record_url,
-    :class => "btn btn-primary", :method => :get %>
+  <%= link_to "Random record from #{provider_name(@provider_id)}",
+      { :controller => 'records', :action => 'show',
+  :id => random_record_id(@provider_id), :provider => @provider_id },
+  :method => :get, :class => 'btn btn-primary' %>
 
-  <div class="row">
-    <div class="col-md-6 col-sm-6">
+  <div class='row'>
+    <div class='col-md-6 col-sm-6'>
       <h3>Enriched Record</h3>
-      <pre class="pre-scrollable"><%= render_enriched_record(@document) %></pre>
+      <pre class='pre-scrollable'><%= render_enriched_record(@document) %></pre>
     </div>
 
-    <div class="col-md-6 col-sm-6">
+    <div class='col-md-6 col-sm-6'>
       <h3>Original Record</h3>
-      <pre class="pre-scrollable"><%= render_original_record(@document) %></pre>
+      <pre class='pre-scrollable'><%= render_original_record(@document) %></pre>
     </div>
   </div>
 </div>

data/app/views/krikri/reports/_qa_report_list.html.erb

@@ -0,0 +1,13 @@
+<h3>QA Reports</h3>
+<% if @qa_reports %>
+  <dl>
+    <% @qa_reports.each do |qa_report| %>
+    <dt><%= provider_name(qa_report.provider) %><dt>
+      <dd><%= link_to 'fields csv', qa_report_path(qa_report, format: 'csv') %> -
+      <%= link_to 'count csv',
+          qa_report_path(qa_report, format: 'csv', type: 'count') %></dd>
+    <% end %>
+  </dl>
+<% else %>
+  <div>There was an error generating the QA reports.</div>
+<% end %>

data/app/views/krikri/reports/_validation_report_list.html.erb

@@ -0,0 +1,10 @@
+<h3>Validation Reports</h3>
+<% if @validation_reports %>
+  <ul>
+    <% @validation_reports.each do |validation_report| %>
+      <li><%= render_validation_report(validation_report) %></li>
+    <% end %>
+  </ul>
+<% else %>
+  <div>There was an error generating the validation reports.</div>
+<% end %>

data/app/views/krikri/reports/index.html.erb

@@ -0,0 +1,11 @@
+<% content_for :title do %>Reports<% end %>
+
+<div id="main-container" class="container">
+  <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
+
+  <h1>Reports</h1>
+  <h2><%= provider_name(@current_provider) %></h2>
+  <%= render "validation_report_list" %>
+
+  <%= render "qa_report_list" %>
+</div>

data/app/views/krikri/shared/_flash_message.html.erb

@@ -0,0 +1 @@
+<%= flash[:message] %>

data/app/views/krikri/shared/_navigation.html.erb

@@ -1,10 +1,40 @@
-<div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
-  <div class="container">
-    <div class="navbar-right">
-    <ul class="nav navbar-nav">
-        <li><%= link_to 'Institutions', krikri.institutions_path %></li>
-        <li><%= link_to 'QA', krikri.records_path %></li>
-    </ul>
+<div id='header-navbar' class='navbar navbar-inverse navbar-static-top' role='navigation'>
+  <div class='container'>
+    <div class='navbar-right'>
+      <ul class='nav navbar-nav'>
+        <li class='dropdown'>
+          <a href='#' class='dropdown-toggle' data-toggle='dropdown'
+            role='button' aria-expanded='false'>
+            <%= provider_name(session[:current_provider]) %> <span class="caret"></span>
+          </a>
+          <ul class='dropdown-menu' role='menu'>
+	    <li>
+              <%= remove_session_provider %>
+            </li>
+	    <li class='divider'></li>
+
+            <% available_providers.each do |provider| %>
+	      <% unless session[:current_provider] == provider.id %>
+              <li><%= set_session_provider(provider) %></li>
+	      <% end %>
+            <% end %>
+          </ul>
+        </li>
+
+        <% if session[:current_provider].present? %>
+          <li><%= link_to 'Dashboard',
+            krikri.provider_path(session[:current_provider]) %></li>
+          <li><%= link_to 'Records',
+            krikri.records_path(provider: session[:current_provider]) %></li>
+          <li><%= link_to 'Reports',
+            krikri.reports_path(provider: session[:current_provider]) %></li>
+        <% else %>
+          <li><%= link_to 'Dashboard', krikri.providers_path %></li>
+          <li><%= link_to 'Records', krikri.records_path %></li>
+          <li><%= link_to 'Reports', krikri.reports_path %></li>
+        <% end %>
+
+      </ul>
+    </div>
   </div>
 </div>
-</div>

data/app/views/krikri/validation_reports/_validation_report.html.erb

@@ -0,0 +1,23 @@
+<%= render 'sort_and_per_page' %>
+
+<div id='documents'>
+  <% @documents.each do |doc| %>
+    <div class='document'>
+      <dl class='document-metadata dl-horizontal dl-invert'>
+        <dt>ID:</dt>
+        <dd>
+          <%= link_to doc.id, :controller => 'records', :action => 'show',
+          :id => doc.id, :provider => @current_provider, :method => :get %>
+        </dd>
+        <% if doc['sourceResource_title'].present? %>
+          <dt>Title:</dt>
+          <dd><%= doc['sourceResource_title'] %></dd>
+        <% end %>
+        <% if doc['isShownAt_id'].present? %>
+          <dt>Is Shown At:</dt>
+          <dd><%= link_to doc['isShownAt_id'], doc['isShownAt_id'] %></dd>
+        <% end %>
+      </dl>
+    </div>
+  <% end %>
+</div>

data/app/views/krikri/validation_reports/show.html.erb

@@ -0,0 +1,19 @@
+<% content_for :title do %>Validation Report - <%= params[:id] %><% end %>
+
+<div id="main-container" class="container">
+  <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
+
+  <h1>Validation Report: <%= params[:id] %></h1>
+  <h2><%= provider_name(@current_provider) %></h2>
+  <div>
+    The following records have missing values for 
+    <code><%= params[:id] %></code>.
+  </div>
+
+  <% if @documents.count > 0 %>
+    <%= render "validation_report" %>
+  <% else %>
+    <div>There are no invalid records to report.</div>
+  <% end %>
+
+</div>

data/config/routes.rb

@@ -3,11 +3,15 @@ require 'resque/server'
 Krikri::Engine.routes.draw do
   # TODO: remove unnecessary :harvest_sources and :institutions routes once we
   # have established what we do and don't need
-  resources :validation_reports, only: [:index]
+  resources :validation_reports, only: [:show]
   resources :records, only: [:index, :show]
-  resources :report_lists, only: [:index]
+  resources :reports, only: [:index]
+  resources :qa_reports, only: [:index, :show]
   resources :institutions do
     resources :harvest_sources, shallow: true
   end
+
+  resources :providers, only: [:index, :show]
+
   mount Resque::Server.new, at: '/resque'
 end

data/config/settings/development.yml

@@ -5,5 +5,11 @@ marmotta:
   record_container: 'http://localhost:8983/marmotta/ldp/original_record'
   item_container: 'http://localhost:8983/marmotta/ldp/items'
 
+elasticsearch:
+  host: 'localhost:9200'
+  # index_name is the alias that points to whatever index is deployed:
+  index_name: 'dpla_alias'
+
 prov:
   activity: 'activity'
+  provider_base: 'http://dp.la/api/contributor/'

data/config/settings/test.yml

@@ -5,5 +5,14 @@ marmotta:
   record_container: 'http://localhost:8983/marmotta/ldp/original_record'
   item_container: 'http://localhost:8983/marmotta/ldp/items'
 
+elasticsearch:
+  host: 'localhost:9200'
+  # In testing, index_name refers to a temporary index created just for tests.
+  index_name: 'dpla_test'
+
 prov:
   activity: 'activity'
+  provider_base: 'http://dp.la/api/contributor/'
+
+solr:
+  url: 'http://localhost:8983/solr/'

data/db/migrate/20150328035550_add_qa_report.rb

@@ -0,0 +1,11 @@
+class AddQaReport < ActiveRecord::Migration
+  def change
+    create_table :krikri_qa_reports do |t|
+      t.string :provider
+      t.text :field_report, limit: nil
+      t.text :count_report, limit: nil
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/krikri/templates/schema.xml

@@ -506,72 +506,72 @@ v         currently supported on types that are sorted internally as strings
 
    <field name="type" type="string" indexed="false" stored="false" multiValued="true" />
 
-   <field name="dataProvider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="dataProvider_type" type="string" indexed="false" stored="false" />
-   <field name="dataProvider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="dataProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="dataProvider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="dataProvider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="dataProvider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="dataProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="hasView_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="hasView_type" type="string" indexed="false" stored="false" />
+   <field name="hasView_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="hasView_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="hasView_rights" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="hasView_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="intermediateProvider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="intermediateProvider_type" type="string" indexed="false" stored="false" />
-   <field name="intermediateProvider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="intermediateProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="intermediateProvider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="intermediateProvider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="intermediateProvider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="intermediateProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="isShownAt_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="isShownAt_type" type="string" indexed="false" stored="false" />
+   <field name="isShownAt_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="isShownAt_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="isShownAt_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="isShownAt_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="isShownAt_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="isShownAt_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="object_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="object_type" type="string" indexed="false" stored="false" />
+   <field name="object_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="object_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="object_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="object_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="object_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="object_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="originalRecord" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="originalRecord" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="preview_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="preview_type" type="string" indexed="false" stored="false" />
+   <field name="preview_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="preview_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="preview_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="preview_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="preview_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="preview_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="provider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="provider_type" type="string" indexed="false" stored="false" />
-   <field name="provider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="provider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="provider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="provider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="provider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="provider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="sourceResource_id" type="string" indexed="true" stored="true" multiValued="false"/>
-   <field name="sourceResource_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_id" type="string" indexed="true" stored="true" multiValued="true"/>
+   <field name="sourceResource_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_alternative" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_collection_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_collection_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_collection_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_collection_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_collection_title" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_collection_description" type="text" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_contributor_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_contributor_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_contributor_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_contributor_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_contributor_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_creator_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_creator_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_creator_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_creator_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_creator_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <!-- TODO: Change date_begin and date_end type to "date" assuming they have been correctly formatted -->
    <field name="sourceResource_date_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_date_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_date_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_date_begin" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_date_end" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_date_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
@@ -591,7 +591,7 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_genre_type" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_publisher_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_publisher_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_publisher_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_publisher_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_publisher_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
@@ -602,12 +602,12 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_rightsHolder" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_rightsHolder_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_rightsHolder_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_rightsHolder_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_rightsHolder_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_rightsHolder_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_spatial_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_spatial_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_spatial_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_spatial_exactMatch" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_spatial_countryCode" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_spatial_parentFeature_id" type="string" indexed="true" stored="true" multiValued="true" />
@@ -618,10 +618,10 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_spatial_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_specType_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_specType_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_specType_type" type="string" indexed="false" stored="false" multiValued="true" />
 
    <field name="sourceResource_subject_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_subject_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_subject_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_subject_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_subject_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
@@ -629,7 +629,7 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_title" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_type_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_type_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_type_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_type_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <!-- Dynamic field definitions.  If a field name is not found, dynamicFields

data/lib/krikri/engine.rb

@@ -1,12 +1,14 @@
 require 'active_support'
 require 'rails_config'
 require 'krikri/ldp'
+require 'krikri/search_index'
 
 require 'dpla/map'
 require 'rdf/marmotta'
 require 'oai/client'
 require 'rest-client'
 require 'edtf'
+require 'csv'
 
 require 'resque'
 
@@ -17,6 +19,7 @@ module Krikri
     isolate_namespace Krikri
 
     def configure_blacklight!
+      return unless File.exist?(Blacklight.solr_file)
       krikri_solr = Krikri::Settings.solr
       Blacklight.solr_config = Blacklight.solr_config.merge(krikri_solr) unless
         krikri_solr.nil?
@@ -134,5 +137,12 @@ module Krikri
         end
       end
     end
+
+    ##
+    # Allow the methods in Krikri::ApplicatoinHelper to be accessible by the
+    # host application.
+    initializer 'krikri.helpers' do |app|
+      ActionView::Base.send :include, Krikri::ApplicationHelper
+    end
   end
 end

data/lib/krikri/enricher.rb

@@ -25,6 +25,7 @@ module Krikri
   #
   class Enricher
     include SoftwareAgent
+    include EntityConsumer
 
     attr_reader :chain, :generator_uri
 
@@ -32,6 +33,14 @@ module Krikri
       :enrichment
     end
 
+    ##
+    # @see Krikri::Activity#entities
+    # @see Krikri::EntityBehavior
+    # @see Krikri::SoftwareAgent#entity_behavior
+    def entity_behavior
+      @entity_behavior ||= Krikri::AggregationEntityBehavior
+    end
+
     ##
     # Create a new Enricher, given a hash of options:
     #   generator_uri:  the LDP URI of the Activity that generated the mapped
@@ -44,6 +53,7 @@ module Krikri
     def initialize(opts = {})
       @generator_uri = RDF::URI(opts.fetch(:generator_uri))
       @chain = deep_sym(opts.fetch(:chain) { {} })
+      assign_generator_activity!(opts)
     end
 
     ##
@@ -54,11 +64,11 @@ module Krikri
     #
     def run(activity_uri = nil)
       log :info, 'enricher is running'
-      # see TODO below
-      target_aggregations.each do |agg|
+      mapped_records = generator_activity.entities
+      mapped_records.each do |rec|
         begin
-          chain_enrichments!(agg)
-          activity_uri ? agg.save_with_provenance(activity_uri) : agg.save
+          chain_enrichments!(rec)
+          activity_uri ? rec.save_with_provenance(activity_uri) : rec.save
         rescue => e
           log :error, "Enrichment error: #{e.message}\n#{e.backtrace}"
         end
@@ -66,17 +76,6 @@ module Krikri
       log :info, 'enricher is done'
     end
 
-    # TODO:  remove this when the current topic branch that introduces the
-    # EntityConsumer mixin has been merged.
-    def target_aggregations
-      query = Krikri::ProvenanceQueryClient.find_by_activity(generator_uri)
-      query.execute.lazy.flat_map do |solution|
-        agg = DPLA::MAP::Aggregation.new(solution.record.to_s)
-        agg.get
-        agg
-      end
-    end
-
     ##
     # Given an aggregation, take each enrichment specified by the `chain'
     # given in our instantiation, and apply that enrichment, with the given