sufia 5.0.0 → 6.0.0.beta1

data/app/views/records/edit_fields/_default.html.erb

@@ -1,12 +1,10 @@
-<div>
-  <% required = render_req && record.required?(key) %>
-  <% lbl = get_label(key) %>
-  <% single = f.object.class.unique?(key) %>
-
-  <% opts = { label: lbl, required: required } %>
-  <% opts = opts.merge(as: :multi_value) unless single %>
-
-  <%= f.input key, opts %>
-
-  <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key) } %>
-</div>
+      <div <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %> class="input-group">
+        <% required = render_req && (index == 0) && record.required?(key) %>
+        <% if f.object.class.multiple?(key) %>
+          <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: required  %>
+        <% else %>
+          <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: required  %>
+        <% end %>
+        <%= render "records/edit_fields/suffix", key: key, index: index, single: f.object.class.unique?(key) %>
+      </div>
+      <div id="additional_<%= key %>_elements"></div>

data/app/views/records/edit_fields/_description.html.erb

@@ -1,3 +1,10 @@
-<% render_req ||= false %>
-<% required = render_req && record.required?(key) %>
-<%= f.input key, label: label_for_field, as: :multi_value, required: required, input_html: { rows: '5', type: 'textarea'} %>
+      <div <% if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
+        <% required = render_req && (index == 0) && f.object.required?(key) %>
+        <% if f.object.class.multiple?(key) %>
+          <%= f.text_area :description, name:"#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: required %>
+        <% else %>
+          <%= f.text_area :description, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: required  %>
+        <% end %>
+        <%= render "records/edit_fields/suffix", key: key, index: index, single: f.object.class.unique?(key) %>
+      </div>
+      <div id="additional_<%= key %>_elements"></div>

data/app/views/records/edit_fields/_resource_type.html.erb

@@ -1,6 +1,5 @@
-<div class='multi_value'>
-  <div class='listing'>
-    <%= f.input :resource_type, required: required, collection: Sufia.config.resource_types, input_html: { multiple: 'multiple', size: '7', class: 'form-control' } %>
-    <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
-  </div>
+<%# convert class variable to a local variable if the local hasn't been set %>
+<div>
+  <%= f.select :resource_type, Sufia.config.resource_types.keys, {}, { multiple: true, size: 7, class: 'form-control' } %>
+  <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
 </div>

data/app/views/records/edit_fields/_rights.html.erb

@@ -1,2 +1,9 @@
-<%= f.input :rights, as: :multi_value, required: required, collection: Sufia.config.cc_licenses, include_blank: true, input_html: { type: 'select', include_blank: true, selected: :blank, class: 'select optional form-control' } %>
-<%= render partial: 'records/rights_modal' %>
+      <div <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %> class="input-group">
+        <% if f.object.class.multiple?(key) %>
+          <%= select_tag "rights", options_for_select(Sufia.config.cc_licenses, v), name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", class: 'form-control' %>
+        <% else %>
+          <%= f.select :rights, Sufia.config.cc_licenses, class: 'form-control' %>
+        <% end %>
+        <%= render "records/edit_fields/suffix", key: key, index: index %>
+      </div>
+      <div id="additional_<%= key %>_elements"></div>

data/app/views/records/edit_fields/_suffix.html.erb

@@ -0,0 +1,10 @@
+        <% single ||= false %>
+        <% if index == 0  %>
+          <% unless single %>
+            <%= add_field(key) %>
+          <% end %>
+          <%= render partial: "records/rights_modal" if key == "rights" %>
+        <% else %>
+          <%= subtract_field(key) %>
+        <% end %>
+

data/app/views/records/edit_fields/_type.html.erb

@@ -1,2 +1,8 @@
-<% required = render_req && record.required?(key) %>
-<%= render partial: "records/edit_fields/resource_type", locals: { record: record, f: f, required: required, key: key } %>
+      <div class="form-group">
+        <%= f.label :resource_type, "Resource Types", for: "resource_type" %>
+        <p class="help-block">You may select multiple types to apply<p>
+        <%= f.select :resource_type, options_for_select(Sufia.config.resource_types.keys), {},
+          {multiple: true, size: 7} %>
+        <%= help_icon(:resource_type) %>
+      </div>
+

data/app/views/records/show_fields/_based_near.html.erb

@@ -1,6 +1,6 @@
 <% record.based_near.each do |bn| %>
   <span itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-    <span itemprop="name"><%= link_to_facet(bn, Solrizer.solr_name("desc_metadata__based_near", :facetable)) %></span>
+    <span itemprop="name"><%= link_to_facet(bn, Solrizer.solr_name("based_near", :facetable)) %></span>
   </span>
   <br />
 <% end %>

data/app/views/records/show_fields/_creator.html.erb

@@ -1,6 +1,6 @@
 <% record.creator.each do |creator| %>
 <span itemprop="creator" itemscope itemtype="http://schema.org/Person">
-  <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("desc_metadata__creator", :facetable)) %></span>
+  <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("creator", :facetable)) %></span>
 </span>
 <br />
 <% end %>

data/app/views/records/show_fields/_language.html.erb

@@ -1,4 +1,4 @@
 <% record.language.each do |lang| %>
-  <span itemprop="inLanguage"><%= link_to_facet(lang, Solrizer.solr_name("desc_metadata__language", :facetable)) %></span><br />
+  <span itemprop="inLanguage"><%= link_to_facet(lang, Solrizer.solr_name("language", :facetable)) %></span><br />
 <% end %>
 

data/app/views/records/show_fields/_publisher.html.erb

@@ -1,6 +1,6 @@
 <% record.publisher.each do |pub| %>
   <span itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
-    <span itemprop="name"><%= link_to_facet(pub, Solrizer.solr_name("desc_metadata__publisher", :facetable)) %></span>
+    <span itemprop="name"><%= link_to_facet(pub, Solrizer.solr_name("publisher", :facetable)) %></span>
         </span>
   <br />
 <% end %>

data/app/views/records/show_fields/_resource_type.html.erb

@@ -1,4 +1,4 @@
 <% record.resource_type.each do |rtype| %>
-  <%= link_to_facet(rtype, Solrizer.solr_name("desc_metadata__resource_type", :facetable)) %><br />
+  <%= link_to_facet(rtype, Solrizer.solr_name("resource_type", :facetable)) %><br />
 <% end %>
 

data/app/views/records/show_fields/_subject.html.erb

@@ -1,6 +1,6 @@
 <% record.subject.each do |sub| %>
   <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
-    <span itemprop="name"><%= link_to_facet(sub, Solrizer.solr_name("desc_metadata__subject", :facetable)) %></span>
+    <span itemprop="name"><%= link_to_facet(sub, Solrizer.solr_name("subject", :facetable)) %></span>
   </span>
   <br />
 <% end %>

data/app/views/records/show_fields/_tag.html.erb

@@ -1,4 +1,4 @@
 <% record.tag.each do |t| %>
-  <span itemprop="keywords"><%= link_to_facet(t, Solrizer.solr_name("desc_metadata__tag", :facetable)) %></span><br />
+  <span itemprop="keywords"><%= link_to_facet(t, Solrizer.solr_name("tag", :facetable)) %></span><br />
 <% end %>
 

data/app/views/single_use_links/new_download.html.erb

@@ -1,5 +1,5 @@
 <div class="single-use-link">
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to download the file</p>
-<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="glyphicon glyphicon-link large-icon"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.pid}" %>
-</div>
+<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="glyphicon glyphicon-link large-icon"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.id}" %>
+</div>

data/app/views/users/_profile.html.erb

@@ -1,6 +1,7 @@
         <div class="tab-pane" id="profile">
           <h2>User Info</h2>
-             <dl id="user_info">
+             <dl id="user_info"> 
+                <%= render partial: 'social_media_info', locals: {user: @user} %>
                 <%= render partial: 'user_info', locals: {user: @user} %>
              </dl>
         </div>

data/app/views/users/_social_media_info.html.erb

@@ -0,0 +1,20 @@
+  <% if !user.facebook_handle.blank?() %>
+    <dt><i class="fa fa-facebook"></i> Facebook Handle</dt>
+    <dd><%= link_to "http://facebook.com/#{user.facebook_handle}", "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
+  <% end %>
+
+  <% if !user.twitter_handle.blank?() %>
+    <dt><i class="fa fa-twitter"></i> Twitter Handle</dt>
+    <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
+  <% end %>
+
+  <!-- 
+
+  <dt><i class="fa fa-google-plus"></i> Google+ Handle</dt>
+  <dd><%# link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
+  --> 
+
+  <% if !user.linkedin_handle.blank?() %>
+    <dt><i class="fa fa-linkedin"></i> Linked In</dt>
+    <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
+  <% end %>

data/app/views/users/_user_info.html.erb

@@ -1,31 +1,14 @@
 <dl id="user_info" class="row">
-
-<% if user.orcid.present? %>
-  <dt class="col-xs-5"><%= orcid_label('orcid') %></dt>
-  <dd class="col-xs-7"><%= link_to user.orcid, user.orcid, { target: '_blank' } %></dd>
-<% end %>
-
-<% if user.facebook_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-facebook"></i> Facebook Handle</dt>
   <dd class="col-xs-7"><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
-<% end %>
 
-<% if user.twitter_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-twitter"></i> Twitter Handle</dt>
   <dd class="col-xs-7"><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
-<% end %>
-
-<% if user.googleplus_handle.present? %>
+ 
   <dt class="col-xs-5"><i class="fa fa-google-plus"></i> Google+ Handle</dt>
   <dd class="col-xs-7"><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
-<% end %>
-
-<% if user.linkedin_handle.present? %>
-  <dt class="col-xs-5"><i class="fa fa-linkedin"></i> LinkedIn</dt>
-  <dd class="col-xs-7"><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", { target: '_blank' } %></dd>
-<% end %>
-
-  <dt class="col-xs-5"><i class="fa fa-envelope"></i> Email</dt>
+ 
+  <dt class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>
   <dd class="col-xs-7"><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>

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

@@ -1,5 +1,5 @@
 <h1>Edit Profile</h1>
-<div class="col-xs-12 col-sm-5 profile">
+<div class="col-xs-12 col-sm-5">
   <div class="well">
   <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
     <div class="form-group">
@@ -29,15 +29,6 @@
       </div>
     </div>
 
-    <div class="form-group">
-      <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
-        <%= orcid_label %>
-      <% end %>
-      <div class="col-xs-8">
-         <%= f.text_field :orcid, class: "form-control" %>
-      </div>
-    </div><!-- .form-group -->
-
     <div class="form-group">
       <%= f.label :twitter_handle, '<i class="fa fa-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
@@ -69,7 +60,7 @@
   </div>
 </div><!-- .col-xs-5 /well-->
 
-<div class="col-xs-12 col-sm-offset-1 col-sm-6 well profile">
+<div class="col-xs-12 col-sm-offset-1 col-sm-6 well">
   <h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', class: 'btn btn-mini btn-primary' %></h3>
   <%= render partial: 'user_info', locals: {user: @user} %>
 

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

@@ -1,7 +1,7 @@
 <%= javascript_tag do %>
 <% end %>
 
-<div class="col-xs-12 profile">
+<div class="col-xs-12">
   <div class="pull-right">
     <%= render 'profile_actions' %>
   </div>

data/bin/audit_repository

@@ -3,4 +3,4 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../config/environment.rb'))
 
-GenericFile.audit_everything
+Sufia::RepositoryAuditService.audit_everything

data/config/initializers/sufia_events.rb

@@ -1,17 +1,17 @@
 Sufia.config.after_create_content = lambda { |generic_file, user|
-  Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, user.user_key))
+  Sufia.queue.push(ContentDepositEventJob.new(generic_file.id, user.user_key))
 }
 
 Sufia.config.after_revert_content = lambda { |generic_file, user, revision|
-  Sufia.queue.push(ContentRestoredVersionEventJob.new(generic_file.pid, user.user_key, revision))
+  Sufia.queue.push(ContentRestoredVersionEventJob.new(generic_file.id, user.user_key, revision))
 }
 
 Sufia.config.after_update_content = lambda { |generic_file, user|
-  Sufia.queue.push(ContentNewVersionEventJob.new(generic_file.pid, user.user_key))
+  Sufia.queue.push(ContentNewVersionEventJob.new(generic_file.id, user.user_key))
 }
 
 Sufia.config.after_update_metadata = lambda { |generic_file, user|
-  Sufia.queue.push(ContentUpdateEventJob.new(generic_file.pid, user.user_key))
+  Sufia.queue.push(ContentUpdateEventJob.new(generic_file.id, user.user_key))
 }
 
 Sufia.config.after_destroy = lambda { |pid, user|

data/config/locales/sufia.en.yml

@@ -149,9 +149,6 @@ en:
     user_profile:
       no_followers: "No one is following you."
       no_following: "You are not following anyone."
-      orcid:
-        alt: "ORCID icon"
-        label: "ORCID Profile"
     batch:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
@@ -174,5 +171,3 @@ en:
       subject:  'Subject'
       message:  'Message'
       delete:   'Delete Message'
-    generic_file:
-      browse_view: "Browse View"

data/config/routes.rb

@@ -99,7 +99,7 @@ Sufia::Engine.routes.draw do
 
   # Batch edit routes
   get 'batches/:id/edit' => 'batch#edit', as: :batch_edit
-  post 'batches/:id/' => 'batch#update', as: :batch_generic_files
+  post 'batches/:id' => 'batch#update', as: :batch_generic_file
 
   # Contact form routes
   post 'contact' => 'contact_form#create', as: :contact_form_index

data/lib/generators/sufia/install_generator.rb

@@ -23,10 +23,6 @@ module Sufia
       generate "sufia:models:install"
     end
 
-    def banner
-      say_status("warning", "GENERATING SUFIA", :yellow)
-    end
-
     def insert_abilities
       insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
         "\n  include Sufia::Ability\n"

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -22,11 +22,11 @@ class CatalogController < ApplicationController
   skip_before_filter :default_html_head
 
   def self.uploaded_field
-    solr_name('desc_metadata__date_uploaded', :stored_sortable, type: :date)
+    solr_name('date_uploaded', :stored_sortable, type: :date)
   end
 
   def self.modified_field
-    solr_name('desc_metadata__date_modified', :stored_sortable, type: :date)
+    solr_name('date_modified', :stored_sortable, type: :date)
   end
 
   configure_blacklight do |config|
@@ -42,22 +42,22 @@ class CatalogController < ApplicationController
 
     # Specify which field to use in the tag cloud on the homepage.
     # To disable the tag cloud, comment out this line.
-    config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
+    config.tag_cloud_field_name = Solrizer.solr_name("tag", :facetable)
 
     # solr field configuration for document/show views
-    config.index.title_field = solr_name("desc_metadata__title", :stored_searchable)
+    config.index.title_field = solr_name("title", :stored_searchable)
     config.index.display_type_field = solr_name("has_model", :symbol)
     config.index.thumbnail_method = :sufia_thumbnail_tag
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
-    config.add_facet_field solr_name("desc_metadata__resource_type", :facetable), label: "Resource Type", limit: 5
-    config.add_facet_field solr_name("desc_metadata__creator", :facetable), label: "Creator", limit: 5
-    config.add_facet_field solr_name("desc_metadata__tag", :facetable), label: "Keyword", limit: 5
-    config.add_facet_field solr_name("desc_metadata__subject", :facetable), label: "Subject", limit: 5
-    config.add_facet_field solr_name("desc_metadata__language", :facetable), label: "Language", limit: 5
-    config.add_facet_field solr_name("desc_metadata__based_near", :facetable), label: "Location", limit: 5
-    config.add_facet_field solr_name("desc_metadata__publisher", :facetable), label: "Publisher", limit: 5
+    config.add_facet_field solr_name("resource_type", :facetable), label: "Resource Type", limit: 5
+    config.add_facet_field solr_name("creator", :facetable), label: "Creator", limit: 5
+    config.add_facet_field solr_name("tag", :facetable), label: "Keyword", limit: 5
+    config.add_facet_field solr_name("subject", :facetable), label: "Subject", limit: 5
+    config.add_facet_field solr_name("language", :facetable), label: "Language", limit: 5
+    config.add_facet_field solr_name("based_near", :facetable), label: "Location", limit: 5
+    config.add_facet_field solr_name("publisher", :facetable), label: "Publisher", limit: 5
     config.add_facet_field solr_name("file_format", :facetable), label: "File Format", limit: 5
 
     # Have BL send all facet field names to Solr, which has been the default
@@ -67,41 +67,41 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field solr_name("desc_metadata__title", :stored_searchable), label: "Title", itemprop: 'name'
-    config.add_index_field solr_name("desc_metadata__description", :stored_searchable), label: "Description", itemprop: 'description'
-    config.add_index_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword", itemprop: 'keywords'
-    config.add_index_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject", itemprop: 'about'
-    config.add_index_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator", itemprop: 'creator'
-    config.add_index_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor'
-    config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher'
-    config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation'
-    config.add_index_field solr_name("desc_metadata__language", :stored_searchable), label: "Language", itemprop: 'inLanguage'
-    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded", itemprop: 'datePublished'
-    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified", itemprop: 'dateModified'
-    config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
-    config.add_index_field solr_name("desc_metadata__rights", :stored_searchable), label: "Rights"
-    config.add_index_field solr_name("desc_metadata__resource_type", :stored_searchable), label: "Resource Type"
-    config.add_index_field solr_name("desc_metadata__format", :stored_searchable), label: "File Format"
-    config.add_index_field solr_name("desc_metadata__identifier", :stored_searchable), label: "Identifier"
+    config.add_index_field solr_name("title", :stored_searchable), label: "Title", itemprop: 'name'
+    config.add_index_field solr_name("description", :stored_searchable), label: "Description", itemprop: 'description'
+    config.add_index_field solr_name("tag", :stored_searchable), label: "Keyword", itemprop: 'keywords'
+    config.add_index_field solr_name("subject", :stored_searchable), label: "Subject", itemprop: 'about'
+    config.add_index_field solr_name("creator", :stored_searchable), label: "Creator", itemprop: 'creator'
+    config.add_index_field solr_name("contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor'
+    config.add_index_field solr_name("publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher'
+    config.add_index_field solr_name("based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation'
+    config.add_index_field solr_name("language", :stored_searchable), label: "Language", itemprop: 'inLanguage'
+    config.add_index_field solr_name("date_uploaded", :stored_searchable), label: "Date Uploaded", itemprop: 'datePublished'
+    config.add_index_field solr_name("date_modified", :stored_searchable), label: "Date Modified", itemprop: 'dateModified'
+    config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
+    config.add_index_field solr_name("rights", :stored_searchable), label: "Rights"
+    config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
+    config.add_index_field solr_name("format", :stored_searchable), label: "File Format"
+    config.add_index_field solr_name("identifier", :stored_searchable), label: "Identifier"
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field solr_name("desc_metadata__title", :stored_searchable), label: "Title"
-    config.add_show_field solr_name("desc_metadata__description", :stored_searchable), label: "Description"
-    config.add_show_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword"
-    config.add_show_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject"
-    config.add_show_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator"
-    config.add_show_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor"
-    config.add_show_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher"
-    config.add_show_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location"
-    config.add_show_field solr_name("desc_metadata__language", :stored_searchable), label: "Language"
-    config.add_show_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded"
-    config.add_show_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified"
-    config.add_show_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created"
-    config.add_show_field solr_name("desc_metadata__rights", :stored_searchable), label: "Rights"
-    config.add_show_field solr_name("desc_metadata__resource_type", :stored_searchable), label: "Resource Type"
-    config.add_show_field solr_name("desc_metadata__format", :stored_searchable), label: "File Format"
-    config.add_show_field solr_name("desc_metadata__identifier", :stored_searchable), label: "Identifier"
+    config.add_show_field solr_name("title", :stored_searchable), label: "Title"
+    config.add_show_field solr_name("description", :stored_searchable), label: "Description"
+    config.add_show_field solr_name("tag", :stored_searchable), label: "Keyword"
+    config.add_show_field solr_name("subject", :stored_searchable), label: "Subject"
+    config.add_show_field solr_name("creator", :stored_searchable), label: "Creator"
+    config.add_show_field solr_name("contributor", :stored_searchable), label: "Contributor"
+    config.add_show_field solr_name("publisher", :stored_searchable), label: "Publisher"
+    config.add_show_field solr_name("based_near", :stored_searchable), label: "Location"
+    config.add_show_field solr_name("language", :stored_searchable), label: "Language"
+    config.add_show_field solr_name("date_uploaded", :stored_searchable), label: "Date Uploaded"
+    config.add_show_field solr_name("date_modified", :stored_searchable), label: "Date Modified"
+    config.add_show_field solr_name("date_created", :stored_searchable), label: "Date Created"
+    config.add_show_field solr_name("rights", :stored_searchable), label: "Rights"
+    config.add_show_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
+    config.add_show_field solr_name("format", :stored_searchable), label: "File Format"
+    config.add_show_field solr_name("identifier", :stored_searchable), label: "Identifier"
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -122,7 +122,7 @@ class CatalogController < ApplicationController
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map{|val| val.field}.join(" ")
-      title_name = solr_name("desc_metadata__title", :stored_searchable)
+      title_name = solr_name("title", :stored_searchable)
       field.solr_parameters = {
         qf: "#{all_names} noid_tsi file_format_tesim all_text_timv",
         pf: "#{title_name}"
@@ -142,7 +142,7 @@ class CatalogController < ApplicationController
       # syntax, as eg {! qf=$title_qf }. This is neccesary to use
       # Solr parameter de-referencing like $title_qf.
       # See: http://wiki.apache.org/solr/LocalParams
-      solr_name = solr_name("desc_metadata__contributor", :stored_searchable)
+      solr_name = solr_name("contributor", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -151,7 +151,7 @@ class CatalogController < ApplicationController
 
     config.add_search_field('creator') do |field|
       field.solr_parameters = { :"spellcheck.dictionary" => "creator" }
-      solr_name = solr_name("desc_metadata__creator", :stored_searchable)
+      solr_name = solr_name("creator", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -162,7 +162,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "title"
       }
-      solr_name = solr_name("desc_metadata__title", :stored_searchable)
+      solr_name = solr_name("title", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -174,7 +174,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "description"
       }
-      solr_name = solr_name("desc_metadata__description", :stored_searchable)
+      solr_name = solr_name("description", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -185,7 +185,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "publisher"
       }
-      solr_name = solr_name("desc_metadata__publisher", :stored_searchable)
+      solr_name = solr_name("publisher", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -196,7 +196,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "date_created"
       }
-      solr_name = solr_name("desc_metadata__created", :stored_searchable)
+      solr_name = solr_name("created", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -207,7 +207,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "subject"
       }
-      solr_name = solr_name("desc_metadata__subject", :stored_searchable)
+      solr_name = solr_name("subject", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -218,7 +218,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "language"
       }
-      solr_name = solr_name("desc_metadata__language", :stored_searchable)
+      solr_name = solr_name("language", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -229,7 +229,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "resource_type"
       }
-      solr_name = solr_name("desc_metadata__resource_type", :stored_searchable)
+      solr_name = solr_name("resource_type", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -241,7 +241,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "format"
       }
-      solr_name = solr_name("desc_metadata__format", :stored_searchable)
+      solr_name = solr_name("format", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -253,7 +253,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "identifier"
       }
-      solr_name = solr_name("desc_metadata__id", :stored_searchable)
+      solr_name = solr_name("id", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -265,7 +265,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "based_near"
       }
-      solr_name = solr_name("desc_metadata__based_near", :stored_searchable)
+      solr_name = solr_name("based_near", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -276,7 +276,7 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "tag"
       }
-      solr_name = solr_name("desc_metadata__tag", :stored_searchable)
+      solr_name = solr_name("tag", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -284,7 +284,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('depositor') do |field|
-      solr_name = solr_name("desc_metadata__depositor", :stored_searchable)
+      solr_name = solr_name("depositor", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -292,7 +292,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('rights') do |field|
-      solr_name = solr_name("desc_metadata__rights", :stored_searchable)
+      solr_name = solr_name("rights", :stored_searchable)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name