hydra-head 3.3.0 → 4.0.0.rc2

data/app/controllers/assets_controller.rb

@@ -1,3 +0,0 @@
-class AssetsController < ApplicationController
-    include Hydra::Assets
-end

data/app/controllers/file_assets_controller.rb

@@ -1,3 +0,0 @@
-class FileAssetsController < ApplicationController
-  include Hydra::FileAssets
-end

data/app/controllers/permissions_controller.rb

@@ -1,152 +0,0 @@
-require 'mediashelf/active_fedora_helper'
-class PermissionsController < ApplicationController
-  include MediaShelf::ActiveFedoraHelper
-  include Hydra::AssetsControllerHelper
-  
-  before_filter :require_solr
-  # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
-  include Hydra::SubmissionWorkflow
-  
-  def index
-    @document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
-    pid = params[:asset_id]
-    dsid = "rightsMetadata"
-    xml_content = @document_fedora.datastreams_in_memory[dsid].content
-    ds = Hydra::RightsMetadata.from_xml(xml_content)
-    ds.pid = pid
-    ds.dsid = dsid
-    @document_fedora.datastreams_in_memory[dsid] = ds
-    
-    respond_to do |format|
-      format.html 
-      format.inline { render :partial=>"permissions/index.html", :format=>"html" }
-    end
-  end
-  
-  def new
-=begin
-HYDRA-150
-Removed from permissions/_new.html.erb
-<% javascript_includes << ["jquery.form.js", {:plugin=>"hydra-head"}] %>
-=end
-    respond_to do |format|
-      format.html 
-      format.inline { render :partial=>"permissions/new.html" }
-    end
-  end
-  
-  def edit
-    @document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
-    pid = params[:asset_id]
-    dsid = "rightsMetadata"
-    xml_content = @document_fedora.datastreams_in_memory[dsid].content
-    ds = Hydra::RightsMetadata.from_xml(xml_content)
-    ds.pid = pid
-    ds.dsid = dsid
-    @document_fedora.datastreams_in_memory[dsid] = ds
-    
-    respond_to do |format|
-      format.html 
-      format.inline {render :action=>"edit", :layout=>false}
-    end
-  end
-  
-  # Create a new permissions entry
-  # expects permission["actor_id"], permission["actor_type"] and permission["access_level"] as params. ie.   :permission=>{"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}
-  def create
-    #pid = params[:asset_id]
-    pid = params[:asset_id]
-    dsid = "rightsMetadata"
-    # xml_content = Fedora::Repository.instance.fetch_custom(pid, "datastreams/#{dsid}/content")
-    #@document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
-    @document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
-    xml_content = @document_fedora.datastreams[dsid].content
-    ds = Hydra::RightsMetadata.new(@document_fedora.inner_object, dsid)
-    Hydra::RightsMetadata.from_xml(xml_content, ds)
-
-    @document_fedora.datastreams[dsid] = ds
-    
-    access_actor_type = params["permission"]["actor_type"]
-    actor_id = params["permission"]["actor_id"]
-    access_level = params["permission"]["access_level"]
-  
-    # update the datastream's values
-    result = ds.permissions({access_actor_type => actor_id}, access_level)
-      
-    ds.serialize!
-    ds.save
-    
-    # Re-index the object
-    Solrizer::Fedora::Solrizer.new.solrize(pid)
-    
-    #flash[:notice] = "#{actor_id} has been granted #{access_level} permissions for #{params[:asset_id]}"
-    flash[:notice] = "#{actor_id} has been granted #{access_level} permissions for #{params[:asset_id]}"
-    
-    respond_to do |format|
-      #format.html { redirect_to :controller=>"permissions", :action=>"index" }
-      format.html do 
-        if params.has_key?(:add_permission)
-          redirect_to :back
-        else
-          #redirect_to :controller=>"catalog", :action=>"edit", :id => params[:asset_id], :wf_step => next_step_in_workflow(:permissions)
-          redirect_to( {:controller => "catalog", :action => "edit", :id => params[:asset_id]}.merge(params_for_next_step_in_wokflow) )
-        end
-        
-      end
-      format.inline { render :partial=>"permissions/edit_person_permissions", :locals=>{:person_id=>actor_id}}
-    end
-
-  end
-  
-  # Updates the permissions for all actors in a hash.  Can specify as many groups and persons as you want
-  # ie. :permission => {"group"=>{"group1"=>"discover","group2"=>"edit"}, {"person"=>{"person1"=>"read"}}}
-  def update
-    if params[:id].nil?  
-      pid = params[:asset_id]
-    else
-      pid = params[:id]
-    end
-    
-    dsid = "rightsMetadata"
-    @document_fedora=ActiveFedora::Base.load_instance(pid)
-    xml_content = @document_fedora.datastreams[dsid].content
-    ds = Hydra::RightsMetadata.new(@document_fedora.inner_object, dsid)
-    Hydra::RightsMetadata.from_xml(xml_content, ds)
-    @document_fedora.datastreams[dsid] = ds
-
-     
-    # update the datastream's values
-    result = ds.update_permissions(params[:permission])
-    
-    ds.serialize!
-    ds.save
-    
-    # Re-index the object
-    Solrizer::Fedora::Solrizer.new.solrize(pid)
-    
-    flash[:notice] = "The permissions have been updated."
-    
-    respond_to do |format|
-      #format.html { redirect_to :controller=>"catalog", :action=>"edit", :id=>params[:asset_id] }
-      format.html do
-        if params.has_key?(:add_permission)
-          redirect_to :controller=>"catalog", :action=>"edit", :id => pid, :wf_step => :permissions, :add_permission => true
-        else
-          redirect_to( {:controller => "catalog", :action => "edit", :id => pid}.merge(params_for_next_step_in_wokflow) )
-        end
-      end
-      format.inline do
-        # This should be replaced ...
-        if params[:permission].has_key?(:group)
-          access_actor_type = "group"
-        else
-          access_actor_type = "person"
-        end
-        actor_id = params["permission"][access_actor_type].first[0]
-        render :partial=>"permissions/edit_person_permissions", :locals=>{:person_id=>actor_id} 
-      end
-    end
-    
-  end
-    
-end

data/app/views/generic_contents/_edit.html.erb_

@@ -1,39 +0,0 @@
-<div class="document_viewer" id="cover_container">
-  <div class="multipleEdit">
-
-		<h2 class="section-title">Describe the Item</h2>
-		<div id="description_editor">
-		  <%= render :partial => "generic_content_objects/edit_description", :locals => { :content_type => "generic_content"} %>
-		</div>
-		
-    <h2 class="section-title">Upload Content</h2>
-    <div id="uploads">
-      <%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets} %>
-	  </div>
-
-    <h2 class="section-title">Set Permissions</h2>
-    <div id="permissions_editor">
-      <%= render :partial => "permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
-    </div>
-  
-    <%#
-    // This hidden form really belongs elsewhere, but putting it inside of an 
-    // accordion section un-hides it, so I stuck it here for now. -MZ
-    %>
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post">
-      <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
-      <p><label for="contributor_type">Contributor Type</label>
-      <select id="contributor_type" name="contributor_type">
-        <option value="person">Person</option>
-        <option value="organization">Organization</option>
-        <option value="conference">Conference</option>
-      </select></p>
-      <p><input type="submit" value="Add Contributor" /></p>
-    </form>
-  </div>
-</div>
-<% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-  <%#= render :partial=>'facets' %>
-  <%= delete_asset_link(params[:id], "article") %>
-<% end %>

data/app/views/mods_assets/_edit.html.erb_

@@ -1,63 +0,0 @@
-<!--  ###
-
-  Divide the mods_assets partials into the following:
-  
-  1.) Author (mods_assets/_edit_description and contributors/index)
-  2.) Title and Journal Info (mods_assets/_edit_description and mods_assets/_edit_journal)
-  3.) Additional Work Info (mods_assets/_edit_description)
-  4.) File Count Selection (NEW)
-  5.) File Upload (file_assets/index)
-  6.) Permissions (permissions/index)
-  7.) Review and Submit (NEW)
-  
-  N.B.: information from show partials are also included in the new workflow
-  
-      ### -->
-
-<div class="document_viewer" id="cover_container">
-  <div class="multipleEdit">
-    
-    <h2 class="section-title">Describe the Asset</h2>
-    <div id="description_editor">
-      <%= render :partial => 'mods_assets/edit_description' %>
-    </div>
-    
-<!-- ### Begin file upload (step 5) ### -->
-    <h2 class="section-title">Upload Files</h2>
-    <div id="uploads">  			
-      <%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets} %>
-    </div>
-<!-- ### End file upload (step 5) ### -->
-
-
-<!-- ### Begin permissions (step 6) ### -->
-    <h2 class="section-title">Set permissions</h2>
-    <div id="permissions_editor">
-      <%= render :partial => "permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
-    </div> 
-<!-- ### End permissions (step 6) ### -->
-
-
-<!-- ### Append to step 1 ### -->
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post">
-      <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
-      <p><label for="contributor_type">Contributor Type</label>
-      <select id="contributor_type" name="contributor_type">
-        <option value="person">Person</option>
-        <option value="organization">Organization</option>
-        <option value="conference">Conference</option>
-      </select></p>
-      <p><input type="submit" value="Add Contributor" /></p>
-    </form>
-<!-- ### End append to step 1 ### -->
-      
-  </div>
-</div>
-
-<% sidebar_items << capture do %>
-  <%# = render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-  <%# = render :partial=>'facets' %>
-  <%= delete_asset_link(params[:id], "dataset") %>
-<% end %>
-
-<%= async_load_tag(asset_file_assets_path(params[:id]), 'uploads') %>

data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb

@@ -1,253 +0,0 @@
-# -*- encoding : utf-8 -*-
-# You can configure Blacklight from here. 
-#   
-#   Blacklight.configure(:environment) do |config| end
-#   
-# :shared (or leave it blank) is used by all environments. 
-# You can override a shared key by using that key in a particular
-# environment's configuration.
-# 
-# If you have no configuration beyond :shared for an environment, you
-# do not need to call configure() for that envirnoment.
-# 
-# For specific environments:
-# 
-#   Blacklight.configure(:test) {}
-#   Blacklight.configure(:development) {}
-#   Blacklight.configure(:production) {}
-# 
-
-Blacklight.configure(:shared) do |config|
-
-  config[:default_solr_params] = {
-    :qt => "search",
-    :per_page => 10 
-  }
- 
-  # solr field values given special treatment in the show (single result) view
-  config[:show] = {
-    :html_title => "title_t",
-    :heading => "title_t",
-    :display_type => "has_model_s"
-  }
-
-  # solr fld values given special treatment in the index (search results) view
-  config[:index] = {
-    :show_link => "title_t",
-    :record_display_type => "id"
-  }
-
-  # solr fields that will be treated as facets by the blacklight application
-  #   The ordering of the field names is the order of the display
-  # TODO: Reorganize facet data structures supplied in config to make simpler
-  # for human reading/writing, kind of like search_fields. Eg,
-  # config[:facet] << {:field_name => "format", :label => "Format", :limit => 10}
-  #
-  # Hydra uses active_fedora_model_s by default for displaying Format because that field is automatically 
-  # populated by active-fedora from your RELS-EXT.  You can change this to anything you want to use though.
-  # for example, the sample Hydra::ModsAsset Datastream Class adds object_type_facet = "Article" in its to_solr method.\
-  # You could use that as the format field instead of active_fedora_model_s to have a more nicer value displayed.
-  # 
-  #
-  config[:facet] = {
-    :field_names => (facet_fields = [
-      "object_type_facet",
-      "pub_date",
-      "subject_topic_facet",
-      "language_facet",
-      "lc_1letter_facet",
-      "subject_geo_facet",
-      "subject_era_facet"
-    ]),
-    :labels => {
-      "object_type_facet"   => "Format",
-      "pub_date"            => "Publication Year",
-      "subject_topic_facet" => "Topic",
-      "language_facet"      => "Language",
-      "lc_1letter_facet"    => "Call Number",
-      "subject_era_facet"   => "Era",
-      "subject_geo_facet"   => "Region"
-    },
-    # Setting a limit will trigger Blacklight's 'more' facet values link.
-    # * If left unset, then all facet values returned by solr will be displayed.
-    # * If set to an integer, then "f.somefield.facet.limit" will be added to
-    # solr request, with actual solr request being +1 your configured limit --
-    # you configure the number of items you actually want _displayed_ in a page.    
-    # * If set to 'true', then no additional parameters will be sent to solr,
-    # but any 'sniffed' request limit parameters will be used for paging, with
-    # paging at requested limit -1. Can sniff from facet.limit or 
-    # f.specific_field.facet.limit solr request params. This 'true' config
-    # can be used if you set limits in :default_solr_params, or as defaults
-    # on the solr side in the request handler itself. Request handler defaults
-    # sniffing requires solr requests to be made with "echoParams=all", for
-    # app code to actually have it echo'd back to see it.     
-    :limits => {
-      "subject_topic_facet" => 20,
-      "language_facet" => true
-    }
-  }
-
-  # Have BL send all facet field names to Solr, which has been the default
-  # previously. Simply remove these lines if you'd rather use Solr request
-  # handler defaults, or have no facets.
-  config[:default_solr_params] ||= {}
-  config[:default_solr_params][:"facet.field"] = facet_fields
-
-  # solr fields to be displayed in the index (search results) view
-  #   The ordering of the field names is the order of the display 
-  config[:index_fields] = {
-    :field_names => [
-      "title_display",
-      "title_vern_display",
-      "author_display",
-      "author_vern_display",
-      "format",
-      "language_facet",
-      "published_display",
-      "published_vern_display",
-      "lc_callnum_display"
-    ],
-    :labels => {
-      "title_display"           => "Title:",
-      "title_vern_display"      => "Title:",
-      "author_display"          => "Author:",
-      "author_vern_display"     => "Author:",
-      "format"                  => "Format:",
-      "language_facet"          => "Language:",
-      "published_display"       => "Published:",
-      "published_vern_display"  => "Published:",
-      "lc_callnum_display"      => "Call number:"
-    }
-  }
-
-  # solr fields to be displayed in the show (single result) view
-  #   The ordering of the field names is the order of the display 
-  config[:show_fields] = {
-    :field_names => [
-      "title_display",
-      "title_vern_display",
-      "subtitle_display",
-      "subtitle_vern_display",
-      "author_display",
-      "author_vern_display",
-      "format",
-      "url_fulltext_display",
-      "url_suppl_display",
-      "material_type_display",
-      "language_facet",
-      "published_display",
-      "published_vern_display",
-      "lc_callnum_display",
-      "isbn_t"
-    ],
-    :labels => {
-      "title_display"           => "Title:",
-      "title_vern_display"      => "Title:",
-      "subtitle_display"        => "Subtitle:",
-      "subtitle_vern_display"   => "Subtitle:",
-      "author_display"          => "Author:",
-      "author_vern_display"     => "Author:",
-      "format"                  => "Format:",
-      "url_fulltext_display"    => "URL:",
-      "url_suppl_display"       => "More Information:",
-      "material_type_display"   => "Physical description:",
-      "language_facet"          => "Language:",
-      "published_display"       => "Published:",
-      "published_vern_display"  => "Published:",
-      "lc_callnum_display"      => "Call number:",
-      "isbn_t"                  => "ISBN:"
-    }
-  }
-
-
-  # "fielded" search configuration. Used by pulldown among other places.
-  # For supported keys in hash, see rdoc for Blacklight::SearchFields
-  #
-  # Search fields will inherit the :qt solr request handler from
-  # config[:default_solr_parameters], OR can specify a different one
-  # with a :qt key/value. Below examples inherit, except for subject
-  # that specifies the same :qt as default for our own internal
-  # testing purposes.
-  #
-  # The :key is what will be used to identify this BL search field internally,
-  # as well as in URLs -- so changing it after deployment may break bookmarked
-  # urls.  A display label will be automatically calculated from the :key,
-  # or can be specified manually to be different. 
-  config[:search_fields] ||= []
-
-  # This one uses all the defaults set by the solr request handler. Which
-  # solr request handler? The one set in config[:default_solr_parameters][:qt],
-  # since we aren't specifying it otherwise. 
-  config[:search_fields] << {
-    :key => "all_fields",  
-    :display_label => 'All Fields'   
-  }
-
-  # Now we see how to over-ride Solr request handler defaults, in this
-  # case for a BL "search field", which is really a dismax aggregate
-  # of Solr search fields. 
-  config[:search_fields] << {
-    :key => 'title',     
-    # solr_parameters hash are sent to Solr as ordinary url query params. 
-    :solr_parameters => {
-      :"spellcheck.dictionary" => "title"
-    },
-    # :solr_local_parameters will be sent using Solr LocalParams
-    # 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_local_parameters => {
-      :qf => "$title_qf",
-      :pf => "$title_pf"
-    }
-  }
-  config[:search_fields] << {
-    :key =>'author',     
-    :solr_parameters => {
-      :"spellcheck.dictionary" => "author" 
-    },
-    :solr_local_parameters => {
-      :qf => "$author_qf",
-      :pf => "$author_pf"
-    }
-  }
-
-  # Specifying a :qt only to show it's possible, and so our internal automated
-  # tests can test it. In this case it's the same as 
-  # config[:default_solr_parameters][:qt], so isn't actually neccesary. 
-  config[:search_fields] << {
-    :key => 'subject', 
-    :qt=> 'search',
-    :solr_parameters => {
-      :"spellcheck.dictionary" => "subject"
-    },
-    :solr_local_parameters => {
-      :qf => "$subject_qf",
-      :pf => "$subject_pf"
-    }
-  }
-  
-  # "sort results by" select (pulldown)
-  # label in pulldown is followed by the name of the SOLR field to sort by and
-  # whether the sort is ascending or descending (it must be asc or desc
-  # except in the relevancy case).
-  # label is key, solr field is value
-  config[:sort_fields] ||= []
-  config[:sort_fields] << ['relevance', 'score desc, pub_date_sort desc, title_sort asc']
-  config[:sort_fields] << ['year', 'pub_date_sort desc, title_sort asc']
-  config[:sort_fields] << ['author', 'author_sort asc, title_sort asc']
-  config[:sort_fields] << ['title', 'title_sort asc, pub_date_sort desc']
-  
-  # If there are more than this many search results, no spelling ("did you 
-  # mean") suggestion is offered.
-  config[:spell_max] = 5
-
-  # Add documents to the list of object formats that are supported for all objects.
-  # This parameter is a hash, identical to the Blacklight::Solr::Document#export_formats 
-  # output; keys are format short-names that can be exported. Hash includes:
-  #    :content-type => mime-content-type
-  config[:unapi] = {
-    'oai_dc_xml' => { :content_type => 'text/xml' } 
-  }
-end
-