hydra-file-access 5.0.0.pre1

data/app/views/mods_assets/_publication_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_tag(url_for(:controller=>"hydra/assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
+  <%= hidden_field_tag("_method","put") %>
+  <p id="title_field" class="fedora-text-field">
+    <%= fedora_field_label("descMetadata", [:title_info,:main_title], "Title<span class=\"required-note\">Required</span>".html_safe) %>
+    <%= fedora_text_field(@document_fedora,"descMetadata", [:title_info, :main_title], :multiple=>false, :required=>true) %>
+  </p>
+  <%= render :partial=>"mods_assets/edit_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
+  <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "publisher_wf_step") %>
+  <%= hidden_field_tag(:new_asset, true, :id => "publisher_new_asset") if params[:new_asset] %>
+  <%= hidden_field_tag(:content_type,"mods_asset", :id => "publisher_content_type") %>
+  <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
+  <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
+<%- end -%>

data/app/views/mods_assets/_show.html.erb

@@ -0,0 +1,39 @@
+<div class="document_viewer" id="cover_container">
+
+	<h1 class="document-heading">
+		<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first.empty? %>
+	      <%= get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first %>
+		<% else %>
+			<%= params[:id] %>
+		 <% end %>
+	</h1>
+
+  <h2 class="section-title">Description</h2>
+  <div class="description">
+    <%= render :partial => 'mods_assets/show_description' %>
+  </div>
+  <%# copied to show_file_assets %>
+	<% unless @document_fedora.file_objects(:response_format=>:solr).empty? %>
+    <h2 class="section-title">Files</h2>
+    <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
+      <table id="file_assets" class="multipleEdit">
+		    <tr>
+		      <th>File Name</th>
+		      <th>Size</th>
+		      <th>Uploaded</th>
+		    </tr>
+			<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
+  			<tr class="file_asset" >
+  			  <td><%= link_to result[solr_name("title", :text)], hydra_file_asset_path(result["id"]) %></td>
+  			  <td><%= result[solr_name("extent", :text)] %></td>
+  			  <td>
+  			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
+            <%= l dt, :format => :hydra %>
+  			  </td>
+  			</tr>
+			<% end %>		
+		  </table>
+  	</div>
+	<% end %>
+
+</div>

data/app/views/mods_assets/_show_additional_info.html.erb

@@ -0,0 +1,17 @@
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).first.empty? %>
+  <fieldset>
+    <legend>Keywords</legend>
+  	<div class="browse_value">
+  	  <%= get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).join(', ') %>
+  	</div>
+  </fieldset>
+<% end %>
+
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first.empty? %>
+  <fieldset>
+    <legend>Abstract</legend>
+    <div id="abstract" class="browse_value">
+      <%= Sanitize.clean( RedCloth.new(get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first, [:sanitize_html]).to_html, Sanitize::Config::BASIC).html_safe %>    	
+    </div>
+  </fieldset>
+<% end %>

data/app/views/mods_assets/_show_contributors.html.erb

@@ -0,0 +1,7 @@
+<div id="contributors_list">
+  <ol> 
+  	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
+  	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
+  	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>
+  </ol>
+</div>

data/app/views/mods_assets/_show_description.html.erb

@@ -0,0 +1,35 @@
+<%# copied div below to show_contributor partial %>
+<div id="contributors_list">
+<ol> 
+
+	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
+	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
+	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>
+</ol>
+</div>
+
+<%# copied fieldset to show_publication partial %>
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => 0}, :title_info, :main_title]).first.empty? %>
+	<fieldset><legend>Published</legend>
+	<div id="journal" class="browse_value">
+	<%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
+	</div>
+	</fieldset>
+	<% end %>
+
+<%# copied fieldsets to show_additional_info partial %>
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).first.empty? %>
+<fieldset><legend>Keywords</legend>
+	<div class="browse_value">
+	<%= get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).join(', ') %>
+	</div>
+</fieldset>
+<% end %>
+
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first.empty? %>
+<fieldset><legend>Abstract</legend>
+<div id="abstract" class="browse_value">
+	<%= Sanitize.clean( RedCloth.new(get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first, [:sanitize_html]).to_html, Sanitize::Config::BASIC).html_safe %>
+</div>
+</fieldset>
+<% end %>

data/app/views/mods_assets/_show_file_assets.html.erb

@@ -0,0 +1,22 @@
+<% unless @document_fedora.file_objects(:response_format=>:solr).empty? %>
+  <h2 class="section-title">Files</h2>
+  <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
+    <table id="file_assets" class="multipleEdit">
+	    <tr>
+	      <th>File Name</th>
+	      <th>Size</th>
+	      <th>Uploaded</th>
+	    </tr>
+		<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
+			<tr class="file_asset" >
+			  <td><%= link_to result[solr_name("title", :text)], hydra_file_asset_path(result["id"]) %></td>
+			  <td><%= result[solr_name("extent", :text)] %></td>
+			  <td>
+			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
+          <%= l dt, :format => :hydra %>
+			  </td>
+			</tr>
+		<% end %>		
+	  </table>
+	</div>
+<% end %>

data/app/views/mods_assets/_show_journal.html.erb

@@ -0,0 +1,42 @@
+<% journal = show_journal %>
+<% journal_counter = show_journal_counter %>
+<% base_id = "journal_#{journal_counter}" %>
+
+  <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :title_info, :main_title]).first.empty? %>
+
+    <div class="journal">
+      <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :title_info, :main_title]).first.strip %><% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:publication_date]).first.empty? -%>, <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:publication_date]) %>
+	<% end %>
+   </div>
+  <% end %>
+
+  <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:origin_info, :publisher]).first.empty? %>
+    <div class="publisher">
+      <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:origin_info, :publisher]) %>
+    </div>
+  <% end %>
+
+  <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn]).first.empty? %>
+    <div class="issn">
+	  <%#= fedora_field_label("descMetadata", [{:journal => journal_counter}, :issn], "ISSN:") %>
+      <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn]) %>
+    </div>
+  <% end %>
+
+    <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page]).first.empty? %>
+	<div class="citation">
+        <%#= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:start_page], "Pages:") %>
+        <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page]) %>
+	    <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page]).first.empty? %>
+	        - <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page]) %>
+	    <% end %>
+	</div>
+    <% end %>
+    <% journal_issue_values =  get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level]).inspect %>
+    <% unless journal_issue_values.empty? || journal_issue_values.first.empty? %>
+	<div class="issue">
+        <%#= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:level], "Issue:") %>
+        <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level]) %>
+	</div>
+    <% end %>
+

data/app/views/mods_assets/_show_permissions.html.erb

@@ -0,0 +1,15 @@
+<%- document ||= @document -%>
+<div>
+  <dl class="defList">
+    <% if can? :edit, document %>
+      <h3>Group</h3>
+      <%= get_data_with_label(document, "Discover Access:", 'discover_access_group_t', :default=>"private") %>
+      <%= get_data_with_label(document, "Read & Download Access:", 'read_access_group_t', :default=>"private") %>
+      <%= get_data_with_label(document, "Edit & Upload Access:", 'edit_access_group_t', :default=>"private") %>
+      <h3>Individual</h3>
+      <%= get_data_with_label(document, "Discover Access:", 'discover_access_t', :default=>"private") %>
+      <%= get_data_with_label(document, "Read & Download Access:", 'read_access_t', :default=>"private") %>
+      <%= get_data_with_label(document, "Edit & Upload Access:", 'edit_access_t', :default=>"private") %>
+    <% end %>
+  </dl>
+</div>

data/app/views/mods_assets/_show_publication.html.erb

@@ -0,0 +1,8 @@
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => 0}, :title_info, :main_title]).first.empty? %>
+	<fieldset>
+	  <legend>Published</legend>
+  	<div id="journal" class="browse_value">
+  	  <%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
+  	</div>
+	</fieldset>
+<% end %>

data/app/views/shared/_delete_asset_confirmation.html.erb

@@ -0,0 +1,17 @@
+<div id="delete_dialog_container" style="display:none;">
+	<div id="delete_dialog">
+    <%= form_tag(url_for(:action => "destroy", :controller => "hydra/assets", :id => pid, :method => "delete")) %>
+      <div>
+        <span>Permanently delete <%= title %> and its assets from the repository?</span><br/>
+        <div id="deletable_assets"></div>
+      </div>
+      <div class="button">
+        <%=  submit_tag("Delete") %>
+      </div>
+      <div class="button">
+        <%= button_to_function("Cancel", "$('div#delete_dialog_container').fadeOut();"); %>
+      </div>
+      <%= hidden_field_tag("_method", "delete") %>
+    </form>
+  </div>
+</div>

data/config/jetty.yml

@@ -0,0 +1,7 @@
+default:
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
+  jetty_home: ../jetty
+  startup_wait: 30
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"

data/hydra-file-access.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+version = File.read(File.expand_path("../../HYDRA_VERSION", __FILE__)).strip
+
+
+Gem::Specification.new do |gem|
+  gem.authors     = ["Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors"]
+  gem.email       = ["hydra-tech@googlegroups.com"]
+  gem.homepage    = "http://projecthydra.org"
+  gem.summary     = %q{Hydra-Head Rails Engine (requires Rails3) }
+  gem.description = %q{Hydra-File-Access is a plugin Rails Engine containing the code for manipulating files in a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om}
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "hydra-file-access"
+  gem.require_paths = ["lib"]
+  gem.version       = version
+#  gem.required_ruby_version = '>= 1.9.3'
+
+
+  gem.add_dependency "rails", '~>3.2.3' 
+  gem.add_dependency "blacklight", '~>3.4'  
+  gem.add_dependency "devise"
+  gem.add_dependency "active-fedora", '~>4.1'
+  gem.add_dependency 'RedCloth', '=4.2.9'
+  gem.add_dependency 'block_helpers'
+  gem.add_dependency 'sanitize'
+  gem.add_dependency 'hydra-mods', ">= 0.0.5"
+  gem.add_dependency 'deprecation', ">= 0.0.5"
+  gem.add_dependency 'hydra-core', version
+  
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'jettywrapper', ">=1.3.0"
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'cucumber-rails', '>=1.2.0'
+  gem.add_development_dependency 'factory_girl_rails', '<2.0.0'  #>=2.0.0 requires ruby 1.9
+  gem.add_development_dependency 'solrizer-fedora', '>=2.1.0'
+end

data/lib/hydra-file-access.rb

@@ -0,0 +1,15 @@
+module Hydra
+  module FileAccess
+    require 'hydra/file_access/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  end
+  autoload :Assets
+  autoload :AssetsControllerHelper
+  autoload :SubmissionWorkflow
+  autoload :UI
+
+  module Controller
+    extend ActiveSupport::Autoload
+    autoload :FileAssetsBehavior
+    autoload :AssetsControllerBehavior
+  end
+end

data/lib/hydra/assets.rb

@@ -0,0 +1,5 @@
+module Hydra
+  module Assets
+    include Hydra::Controller::AssetsControllerBehavior
+  end
+end

data/lib/hydra/assets_controller_helper.rb

@@ -0,0 +1,122 @@
+require "om"
+# TODO: All of this should be moved into module Hydra::Assets and this file should be eliminated.
+module Hydra::AssetsControllerHelper
+  
+  # This makes sure that assets have the current user marked as their depositor/owner.  
+  # Relies on the asset's model to define _what_ apply_depositor_metadata should do.  Most Hydra assets will rely on {Hydra::ModelMethods#apply_depositor_metadata}
+  #
+  # Attempts to call apply_depositor_metadata on the +asset+, passing user_key as the depositor
+  # Does nothing if the asset doesn't respond to .apply_depositor_metadata 
+  # @param asset to call apply_depositor_metadata on
+  def apply_depositor_metadata(asset)
+    if asset.respond_to?(:apply_depositor_metadata) && user_key
+      asset.apply_depositor_metadata(user_key)
+    end
+  end
+
+  def set_collection_type(asset, collection)
+    if asset.respond_to?(:set_collection_type)
+      asset.set_collection_type(collection)
+    end
+  end
+  
+  # Builds a Hash that you can feed into ActiveFedora::Base.update_datstream_attributes
+  # If params[:asset] is empty, returns an empty Hash
+  # @return [Hash] a Hash that you can feed into ActiveFedora::Base.update_datstream_attributes
+  #   {
+  #    "descMetadata"=>{ [{:person=>0}, :role]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} },
+  #    "properties"=>{ "notes"=>"foo" }
+  #   }
+  def sanitize_update_params
+    @sanitized_params ||= {}
+    
+    unless params["asset"].nil?
+      params["asset"].each_pair do |datastream_name,fields|
+      
+        @sanitized_params[datastream_name] = {}
+      
+        # TEMPORARY HACK: special case for supporting textile 
+        if params["field_id"]=="abstract_0" 
+          params[:field_selectors] = {"descMetadata" => {"abstract" => [:abstract]}}
+        end
+      
+        if params.fetch("field_selectors",false) && params["field_selectors"].fetch(datastream_name, false)
+          # If there is an entry in field_selectors for the datastream (implying a nokogiri datastream), retrieve the field_selector for this field.
+          # if no field selector, exists, use the field name
+          fields.each_pair do |field_name,field_values|
+            parent_select = OM.destringify( params["field_selectors"][datastream_name].fetch(field_name, field_name) )
+            # calling on unique because duplicate keys can be problematic for multi-valued fields. (HYDRA-785)
+            parent_select.uniq! if parent_select.respond_to?(:uniq!)
+            
+            @sanitized_params[datastream_name][parent_select] = field_values       
+          end        
+        else
+          @sanitized_params[datastream_name] = unescape_keys(params[:asset][datastream_name])
+        end
+      end
+    end
+    
+    return @sanitized_params
+  end
+  
+  # Tidies up the response from updating the document, making it more JSON-friendly
+  # @param [Hash] response_from_update the response from updating the object's values
+  # @return [Hash] A Hash where value of "updated" is an array with fieldname / index / value Hash for each field updated
+  def tidy_response_from_update(response_from_update)
+    response = Hash["updated"=>[]]
+    last_result_value = ""
+    response_from_update.each_pair do |field_name,changed_values|
+      changed_values.each_pair do |index,value|
+        response["updated"] << {"field_name"=>field_name,"index"=>index,"value"=>value} 
+        last_result_value = value
+      end
+    end
+    # If handling submission from jeditable (which will only submit one value at a time), return the value it submitted
+    if params.has_key?(:field_id)
+      response = last_result_value
+    end
+    return response
+  end
+  
+  
+  # Updates the document based on the provided parameters
+  # This method can be overridden to perform additional update work in the hydra head.
+  # @param [ActiveFedora::Base] document
+  # @param [Hash] params should be the type expected by ActiveFedora::Base.update_datastream_attributes
+  def update_document(document, params)
+    # this will only work if there is only one datastream being updated.
+    # once ActiveFedora::MetadataDatastream supports .update_datastream_attributes, use that method instead (will also be able to pass through params["asset"] as-is without usin prep_updater_method_args!)
+    # result = document.update_indexed_attributes(params[:params], params[:opts])
+    result = document.update_datastream_attributes(params)
+  end
+  
+  # moved destringify into OM gem. 
+  # ie.  OM.destringify( params )
+  # Note: OM now handles destringifying params internally.  You probably don't have to do it!
+  
+  private
+  
+  
+  def send_datastream(datastream)
+    self.send_data datastream.content, :filename=>datastream.dsLabel, :type=>datastream.mimeType
+  end
+  
+  #underscores are escaped w/ + signs, which are unescaped by rails to spaces
+  def unescape_keys(attrs)
+    h=Hash.new
+    attrs.each do |k,v|
+      h[k.gsub(/ /, '_')]=v
+
+    end
+    h
+  end
+  def escape_keys(attrs)
+    h=Hash.new
+    attrs.each do |k,v|
+      h[k.gsub(/_/, '+')]=v
+
+    end
+    h
+  end
+  
+end

data/lib/hydra/controller/assets_controller_behavior.rb

@@ -0,0 +1,153 @@
+# @deprecated  Create Model-specific Controllers instead ie. ArticlesController, ETDController, etc.
+# Also see Hydra::Controller::AssetsControllerBehavior for more info.
+# will move to lib/hydra/controller / assets_controller_behavior.rb in release 5.x
+require 'om'
+
+module Hydra::Controller::AssetsControllerBehavior
+  extend ActiveSupport::Concern
+
+  include Blacklight::SolrHelper
+  include Hydra::Controller::RepositoryControllerBehavior
+  include Hydra::AssetsControllerHelper
+  include Blacklight::Catalog
+
+  included do
+    helper :hydra
+    before_filter :search_session, :history_session
+    before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called
+
+    include Hydra::SubmissionWorkflow
+    include Hydra::AccessControlsEnforcement
+    
+    
+    prepend_before_filter :sanitize_update_params, :only=>:update
+    before_filter :check_embargo_date_format, :only=>:update
+    before_filter :enforce_access_controls
+  end
+      
+  def show
+    if params.has_key?("field")
+      
+      @response, @document = get_solr_response_for_doc_id
+      result = @document["#{params["field"]}_t"]
+      unless result.nil?
+        if params.has_key?("field_index")
+          result = result[params["field_index"].to_i-1]
+        elsif result.kind_of?(Array)
+          result = result.first
+        end
+      end
+      respond_to do |format|
+        format.html     { render :text=>result }
+        format.textile  { render :text=> RedCloth.new(result, [:sanitize_html]).to_html  }
+      end
+    else
+      redirect_to catalog_path(params[:id])
+    end
+  end
+
+  # Uses the update_indexed_attributes method provided by ActiveFedora::Base
+  # This should behave pretty much like the ActiveRecord update_indexed_attributes method
+  # For more information, see the ActiveFedora docs.
+  # 
+  # @example Appends a new "subject" value of "My Topic" to on the descMetadata datastream in in the _PID_ document.
+  #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"subject"=>{"-1"=>"My Topic"}}
+  # @example Sets the 1st and 2nd "medium" values on the descMetadata datastream in the _PID_ document, overwriting any existing values.
+  #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"medium"=>{"0"=>"Paper Document", "1"=>"Image"}}
+  def update
+    logger.debug("attributes submitted: #{@sanitized_params.inspect}")
+         
+    @response = update_document(@document, @sanitized_params)
+   
+    @document.save
+    flash[:notice] = "Your changes have been saved."
+    
+    #logger.debug("returning #{@response.inspect}")
+    
+    respond_to do |want| 
+      want.html {
+        redirect_to next_step(params[:id])
+      }
+      want.js {
+        render :json=> tidy_response_from_update(@response)  
+      }
+      want.textile {
+        if @response.kind_of?(Hash)
+          textile_response = tidy_response_from_update(@response).values.first
+        end
+        render :text=> RedCloth.new(textile_response, [:sanitize_html]).to_html
+      }
+    end
+  end
+  
+  def new
+    af_model = retrieve_af_model(params[:content_type])
+    raise "Can't find a model for #{params[:content_type]}" unless af_model
+    @asset = af_model.new
+    apply_depositor_metadata(@asset)
+    set_collection_type(@asset, params[:content_type])
+    @asset.save
+    model_display_name = af_model.to_s.camelize.scan(/[A-Z][^A-Z]*/).join(" ")
+    msg = "Created a #{model_display_name} with pid #{@asset.pid}. Now it's ready to be edited."
+    flash[:notice]= msg
+    session[:scripts] = params[:combined] == "true"
+
+    redirect_to edit_catalog_path(@asset.pid, :new_asset=>true)
+  end
+  
+  def destroy
+    af = ActiveFedora::Base.find(params[:id], :cast=>true)
+    assets = af.destroy_child_assets
+    af.delete
+    msg = "Deleted #{params[:id]}"
+    msg.concat(" and associated file_asset(s): #{assets.join(", ")}") unless assets.empty?
+    flash[:notice]= msg
+    redirect_to catalog_index_path()
+  end
+
+  
+  # This is a method to simply remove the item from SOLR but keep the object in fedora. 
+  alias_method :withdraw, :destroy
+  
+  protected
+
+  def check_embargo_date_format
+    if params.keys.include? [:embargo, :embargo_release_date]
+      em_date = params[[:embargo, :embargo_release_date]]["0"]
+      unless em_date.blank?
+        begin 
+          !Date.parse(em_date)
+        rescue
+          params[[:embargo,:embargo_release_date]]["0"] = ""
+          raise "Unacceptable date format"
+        end
+      end
+    end
+  end  
+
+  
+  def mods_assets_update_validation
+    desc_metadata = params[:asset][:descMetadata]
+    rights_metadata = params[:asset][:rightsMetadata]
+    if !rights_metadata.nil? and rights_metadata.has_key?(:embargo_embargo_release_date)
+      unless rights_metadata[:embargo_embargo_release_date]["0"].blank?
+        begin
+          parsed_date = Date.parse(rights_metadata[:embargo_embargo_release_date]["0"]).to_s
+          params[:asset][:rightsMetadata][:embargo_embargo_release_date]["0"] = parsed_date
+        rescue
+          flash[:error] = "You must enter a valid release date."
+          return false
+        end
+      end
+    end
+    
+    if !desc_metadata.nil? and desc_metadata.has_key?(:title_info_main_title) and desc_metadata.has_key?(:journal_0_title_info_main_title)
+      if desc_metadata[:title_info_main_title]["0"].blank? or desc_metadata[:journal_0_title_info_main_title]["0"].blank?
+        flash[:error] = "The title fields are required."
+        return false
+      end
+    end
+    
+    return true
+  end
+end