cul_scv_hydra 0.22.6 → 0.22.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00fd038a4aa096dc2b63253c547b794f99af8a2d
-  data.tar.gz: 95dcb3790b7ab83bf2ea040dfab268ccc9a0e36f
+  metadata.gz: fee4c2f931371cbd1957daca914793b419d4d878
+  data.tar.gz: 9ee170c5764a6c01ec50efffd499569c3d344bed
 SHA512:
-  metadata.gz: 56d23237481df7aa4ebf53ee8223147ae77a72785aaad96b737101f088aba67cc781a019c0be5e62d58bf5119b7aba00a03b2682bd1a904e1a4599381593c0af
-  data.tar.gz: e5a5fdb9f79ec2e9260b2612ab6b75909e52d9f73f6b97dc4ec659fab83669c6d13ceedd03f39754e4c7eafec1be1b976b36aa4f35bd5e112756646e7a9a0208
+  metadata.gz: e225c9555c17775be784def42a334e76b33aebe30b2181d6cb10318d2dd40b9515bee46c732d0f8f40f247e557779ba93b010db5cdd5f3da6b0d1e85c0308a8c
+  data.tar.gz: 6927ae1cfd3b4d79e50db49e20e16cab6543156189ac81214ec3bd1137b02f8a91cc20fab3ae6752fe944e1c880fd6ebb62f261966ac4602537f862bba53edee

data/app/controllers/concerns/cul/hydra/controller.rb

@@ -0,0 +1,22 @@
+module Cul::Hydra::Controller
+
+  def asset_path_from_config(asset)
+    Rails.configuration.assets.paths.each do |dir|
+      result = "#{dir}/#{asset}"
+      return result if File.exists?(result)
+    end
+    return nil
+  end
+
+  def asset_url(source)
+    URI.join(root_url, ActionController::Base.helpers.asset_path(source))
+  end
+
+  def http_client
+    unless @http_client
+      @http_client ||= HTTPClient.new
+    end
+    @http_client
+  end
+
+end

data/app/controllers/concerns/cul/hydra/resolver.rb

@@ -0,0 +1,69 @@
+require 'blacklight'
+require 'active-fedora'
+module Cul::Hydra::Resolver
+  extend ActiveSupport::Concern
+
+  included do 
+    # Whenever an action raises SolrHelper::InvalidSolrID, this block gets executed.
+    # Hint: the SolrHelper #get_solr_response_for_doc_id method raises this error,
+    # which is used in the #show action here.
+    self.rescue_from Blacklight::Exceptions::InvalidSolrID, :with => :invalid_solr_id_error
+    # When RSolr::RequestError is raised, the rsolr_request_error method is executed.
+    # The index action will more than likely throw this one.
+    # Example, when the standard query parser is used, and a user submits a "bad" query.
+    self.rescue_from RSolr::Error::Http, :with => :rsolr_request_error
+  end
+
+  def get_solr_response_for_app_id(id=nil, extra_controller_params={})
+    id ||= params[:id]
+    solr_params = blacklight_config.default_document_solr_params.merge!(extra_controller_params)
+    solr_params[:fq] = "identifier_ssim:#{(id)}"
+    solr_response = find((blacklight_config.document_solr_request_handler || blacklight_config.qt), solr_params)
+    raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.docs.empty?
+    document = SolrDocument.new(solr_response.docs.first, solr_response)
+    @response, @document = [solr_response, document]
+  end
+
+  def get
+    get_solr_response_for_app_id
+    action = params.delete(:action)
+    action.sub!(/s$/,'')
+    method_name = action + '_url'
+    url = send method_name.to_sym, @document[:id]
+    redirect_to url
+  end
+
+  # when solr (RSolr) throws an error (RSolr::RequestError), this method is executed.
+  def rsolr_request_error(exception)
+    if Rails.env == "development"
+      raise exception # Rails own code will catch and give usual Rails error page with stack trace
+    else
+      flash_notice = I18n.t('blacklight.search.errors.request_error')
+      # Set the notice flag if the flash[:notice] is already set to the error that we are setting.
+      # This is intended to stop the redirect loop error
+      notice = flash[:notice] if flash[:notice] == flash_notice
+      logger.error exception
+      unless notice
+        flash[:notice] = flash_notice
+        redirect_to root_path, :status => 500
+      else
+        render :file => "#{Rails.root}/public/500.html", :status => 500
+      end
+    end
+  end
+  
+  # when a request for /resolve/:action/BAD_SOLR_ID is made, this method is executed...
+  def invalid_solr_id_error
+    id = params.delete(:id)
+    flash[:notice] = I18n.t('blacklight.search.errors.invalid_solr_id') + " (#{id})"
+  	redirect_to(root_path)
+  end
+
+  def blacklight_solr
+    @solr ||=  RSolr.connect(blacklight_solr_config)
+  end
+
+  def blacklight_solr_config
+    Blacklight.solr_config
+  end
+end

data/app/controllers/concerns/cul/hydra/thumbnails.rb

@@ -0,0 +1,62 @@
+require 'httpclient'
+module Cul::Hydra::Thumbnails
+  # some thumbnail urls
+  NO_THUMB = "cul_scv_hydra/crystal/file.png"
+  BROKEN_THUMB = "cul_scv_hydra/crystal/file_broken.png"
+  COLLECTION_THUMB = "cul_scv_hydra/crystal/kmultiple.png"
+  AUDIO_THUMB = "cul_scv_hydra/crystal/sound.png"
+  # some rel predicates
+  FORMAT = "http://purl.org/dc/elements/1.1/format"
+  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
+  HAS_MODEL = "info:fedora/fedora-system:def/model#hasModel"
+  IMAGE_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
+  IMAGE_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
+
+  def show
+    pid = params[:id].split(/@/)[0]
+    get_by_pid(pid)
+  end
+
+  def get_by_pid(pid)
+    r_obj = ActiveFedora::Base.find(pid, :cast=>true)
+    
+    if r_obj.respond_to? :thumbnail_info
+      url = r_obj.thumbnail_info
+    else
+      url = {:asset=>(COLLECTION_THUMB),:mime=>'image/png'}
+    end
+    if url[:asset]
+      #url = {:url=>asset_url(COLLECTION_THUMB),:mime=>'image/png'}
+      #redirect_to asset_url(url[:asset]).to_s, status: 302
+      #return
+    end
+    Rails.logger.debug "thumbnail #{url[:url] || url[:asset]} #{url[:mime]}"
+    filename = pid + '.' + url[:mime].split('/')[1].downcase
+    h_cd = "filename=""#{CGI.escapeHTML(filename)}"""
+    headers.delete "Cache-Control"
+    headers["Content-Disposition"] = h_cd
+    headers["Content-Type"] = url[:mime]
+   
+    if url[:asset]
+      full_path = Rails.application.assets.resolve(url[:asset]).to_path
+      render :status => 200, :text => File.read(full_path)
+      return
+    elsif url[:url].to_s =~ /^https?:/
+      cl = http_client
+      render :status => 200, :text => cl.get_content(url[:url])
+      return
+    else
+      render :status => 200, :text => File.read(url[:url])
+      return
+    end
+  end
+
+  def jp2_thumbnail(pid)
+    {:url => ActiveFedora.fedora_config.credentials[:url] + '/objects/' + pid + '/methods/ldpd:sdef.Image/getView?max=250', :mime => 'image/jpeg'}
+  end
+
+  def pid_from_uri(uri)
+    return uri.sub(/info:fedora\//,'')
+  end
+  
+end

data/app/controllers/concerns/cul/scv/hydra/controller.rb

@@ -1,22 +1,6 @@
 module Cul::Scv::Hydra::Controller
-
-  def asset_path_from_config(asset)
-    Rails.configuration.assets.paths.each do |dir|
-      result = "#{dir}/#{asset}"
-      return result if File.exists?(result)
-    end
-    return nil
+  extend ActiveSupport::Concern
+  included do
+    include Cul::Hydra::Controller
   end
-
-  def asset_url(source)
-    URI.join(root_url, ActionController::Base.helpers.asset_path(source))
-  end
-
-  def http_client
-    unless @http_client
-      @http_client ||= HTTPClient.new
-    end
-    @http_client
-  end
-
 end

data/app/controllers/concerns/cul/scv/hydra/resolver.rb

@@ -1,69 +1,6 @@
-require 'blacklight'
-require 'active-fedora'
 module Cul::Scv::Hydra::Resolver
   extend ActiveSupport::Concern
-
-  included do 
-    # Whenever an action raises SolrHelper::InvalidSolrID, this block gets executed.
-    # Hint: the SolrHelper #get_solr_response_for_doc_id method raises this error,
-    # which is used in the #show action here.
-    self.rescue_from Blacklight::Exceptions::InvalidSolrID, :with => :invalid_solr_id_error
-    # When RSolr::RequestError is raised, the rsolr_request_error method is executed.
-    # The index action will more than likely throw this one.
-    # Example, when the standard query parser is used, and a user submits a "bad" query.
-    self.rescue_from RSolr::Error::Http, :with => :rsolr_request_error
-  end
-
-  def get_solr_response_for_app_id(id=nil, extra_controller_params={})
-    id ||= params[:id]
-    solr_params = blacklight_config.default_document_solr_params.merge!(extra_controller_params)
-    solr_params[:fq] = "identifier_ssim:#{(id)}"
-    solr_response = find((blacklight_config.document_solr_request_handler || blacklight_config.qt), solr_params)
-    raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.docs.empty?
-    document = SolrDocument.new(solr_response.docs.first, solr_response)
-    @response, @document = [solr_response, document]
-  end
-
-  def get
-    get_solr_response_for_app_id
-    action = params.delete(:action)
-    action.sub!(/s$/,'')
-    method_name = action + '_url'
-    url = send method_name.to_sym, @document[:id]
-    redirect_to url
-  end
-
-  # when solr (RSolr) throws an error (RSolr::RequestError), this method is executed.
-  def rsolr_request_error(exception)
-    if Rails.env == "development"
-      raise exception # Rails own code will catch and give usual Rails error page with stack trace
-    else
-      flash_notice = I18n.t('blacklight.search.errors.request_error')
-      # Set the notice flag if the flash[:notice] is already set to the error that we are setting.
-      # This is intended to stop the redirect loop error
-      notice = flash[:notice] if flash[:notice] == flash_notice
-      logger.error exception
-      unless notice
-        flash[:notice] = flash_notice
-        redirect_to root_path, :status => 500
-      else
-        render :file => "#{Rails.root}/public/500.html", :status => 500
-      end
-    end
-  end
-  
-  # when a request for /resolve/:action/BAD_SOLR_ID is made, this method is executed...
-  def invalid_solr_id_error
-    id = params.delete(:id)
-    flash[:notice] = I18n.t('blacklight.search.errors.invalid_solr_id') + " (#{id})"
-  	redirect_to(root_path)
-  end
-
-  def blacklight_solr
-    @solr ||=  RSolr.connect(blacklight_solr_config)
-  end
-
-  def blacklight_solr_config
-    Blacklight.solr_config
+  included do
+    include Cul::Hydra::Resolver
   end
 end

data/app/controllers/concerns/cul/scv/hydra/thumbnails.rb

@@ -1,62 +1,6 @@
-require 'httpclient'
 module Cul::Scv::Hydra::Thumbnails
-  # some thumbnail urls
-  NO_THUMB = "cul_scv_hydra/crystal/file.png"
-  BROKEN_THUMB = "cul_scv_hydra/crystal/file_broken.png"
-  COLLECTION_THUMB = "cul_scv_hydra/crystal/kmultiple.png"
-  AUDIO_THUMB = "cul_scv_hydra/crystal/sound.png"
-  # some rel predicates
-  FORMAT = "http://purl.org/dc/elements/1.1/format"
-  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
-  HAS_MODEL = "info:fedora/fedora-system:def/model#hasModel"
-  IMAGE_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
-  IMAGE_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
-
-  def show
-    pid = params[:id].split(/@/)[0]
-    get_by_pid(pid)
+  extend ActiveSupport::Concern
+  included do
+    include Cul::Hydra::Thumbnails
   end
-  
-  def get_by_pid(pid)
-    r_obj = ActiveFedora::Base.find(pid, :cast=>true)
-    
-    if r_obj.respond_to? :thumbnail_info
-      url = r_obj.thumbnail_info
-    else
-      url = {:asset=>(COLLECTION_THUMB),:mime=>'image/png'}
-    end
-    if url[:asset]
-      #url = {:url=>asset_url(COLLECTION_THUMB),:mime=>'image/png'}
-      #redirect_to asset_url(url[:asset]).to_s, status: 302
-      #return
-    end
-    Rails.logger.debug "thumbnail #{url[:url] || url[:asset]} #{url[:mime]}"
-    filename = pid + '.' + url[:mime].split('/')[1].downcase
-    h_cd = "filename=""#{CGI.escapeHTML(filename)}"""
-    headers.delete "Cache-Control"
-    headers["Content-Disposition"] = h_cd
-    headers["Content-Type"] = url[:mime]
-   
-    if url[:asset]
-      full_path = Rails.application.assets.resolve(url[:asset]).to_path
-      render :status => 200, :text => File.read(full_path)
-      return
-    elsif url[:url].to_s =~ /^https?:/
-      cl = http_client
-      render :status => 200, :text => cl.get_content(url[:url])
-      return
-    else
-      render :status => 200, :text => File.read(url[:url])
-      return
-    end
-  end
-
-  def jp2_thumbnail(pid)
-    {:url => ActiveFedora.fedora_config.credentials[:url] + '/objects/' + pid + '/methods/ldpd:sdef.Image/getView?max=250', :mime => 'image/jpeg'}
-  end
-
-  def pid_from_uri(uri)
-    return uri.sub(/info:fedora\//,'')
-  end
-  
 end

data/app/models/concept.rb

@@ -4,7 +4,7 @@ class Concept < GenericAggregator
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
+  include Cul::Hydra::Models::Common
 
   has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
 

data/app/models/concerns/cul/hydra/models.rb

@@ -0,0 +1,24 @@
+require "active-fedora"
+require "cul_scv_hydra/om"
+require 'uri'
+require 'rdf'
+module Cul
+module Hydra
+  module Models
+    AGGREGATOR_TYPE = RDF::CUL.Aggregator
+    RESOURCE_TYPE = RDF::CUL.Resource
+    MEMBER_OF = RDF::CUL.memberOf
+    MEMBER_SPARQL = <<-SPARQL
+      SELECT ?pid WHERE { ?pid <http://purl.oclc.org/NET/CUL/memberOf> <info:fedora/%PID%> }
+    SPARQL
+    MEMBER_ITQL = <<-ITQL
+      select $pid from <#ri> where $pid <http://purl.oclc.org/NET/CUL/memberOf> <info:fedora/%PID%>
+    ITQL
+    autoload :Aggregator, 'cul/hydra/models/aggregator'
+    autoload :Common, 'cul/hydra/models/common'
+    autoload :ImageResource, 'cul/hydra/models/image_resource'
+    autoload :LinkableResources, 'cul/hydra/models/linkable_resources'
+    autoload :Resource, 'cul/hydra/models/resource'
+  end
+end
+end

data/app/models/concerns/cul/hydra/models/aggregator.rb

@@ -0,0 +1,121 @@
+module Cul::Hydra::Models::Aggregator
+  extend ActiveSupport::Concern
+
+  included do
+    has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
+    has_metadata :name => "structMetadata", :type=>Cul::Scv::Hydra::Datastreams::StructMetadata, :versionable => true, :controlGroup => 'M'
+    after_create :aggregator!
+  end
+
+  def aggregator!
+    add_relationship(:rdf_type, Cul::Scv::Hydra::Models::AGGREGATOR_TYPE.to_s)
+    @metadata_is_dirty = true
+    self.save
+  end
+
+  def add_member(member, container=self)
+    member.add_relationship(:cul_member_of, to_uri(container))
+    member.datastreams["RELS-EXT"].content_will_change!
+    member.save
+  end
+
+  def remove_member(member, container=self)
+    rel = ActiveFedora::Relationship.new()
+    rel.subject_pid= :self
+    rel.object = to_uri(container)
+    rel.predicate = :cul_member_of
+    member.remove_relationship(rel)
+    member.datastreams["RELS-EXT"].content_will_change!
+    member.save
+  end
+
+  def has_struct_metadata?
+    return (!datastreams['structMetadata'].nil?) && datastreams['structMetadata'].has_content?
+  end
+
+  def solr_members(opts={})
+    opts = {:rows=>25,:response_format=>:solr}.merge(opts)
+    r = self.parts(opts)
+    members = []
+    r.collect {|hit| members << SolrDocument.new(hit) } unless r.blank?
+    members
+  end
+
+  def members(opts={})
+    parts({:response_format=>:solr}.merge(opts))
+  end
+
+  def member_ids(opts={})
+    solr_members(opts).collect {|hit| hit.id}
+  end
+
+  def thumbnail_info
+    members = solr_members
+    if members.length == 0
+      thumb = {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+    else
+      thumb = nil
+      unless datastreams['structMetadata'].new?
+        thumb = thumb_from_struct(members)
+      else
+        thumb =  thumb_from_members(members)
+      end
+    end
+    return thumb || {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+  end
+
+  private
+  def thumb_from_struct(members)
+    puts "thumb thumb_from_struct"
+    sm = datastreams['structMetadata']
+    first = sm.divs_with_attribute(false,'ORDER','1').first
+    if first
+      members.each do |member|
+        puts "looking for #{first["CONTENTIDS"]} in #{member["identifier_ssim"].inspect}"
+        if member["identifier_ssim"].include? first["CONTENTIDS"]
+          return thumb_from_solr_doc(member)
+        end
+      end
+      return thumb_from_solr_doc(members.first) if members.first
+    else
+      return nil
+    end
+  end
+
+  def thumb_from_members(members)
+    sorted = members.sort do |a,b|
+      c = a['title_si'] <=> b['title_si']
+      if c == 0 && a['identifier_ssim']
+        if b['identifier_ssim']
+          a['identifier_ssim'].delete(a.id) unless a['identifier_ssim'].length == 1
+          b['identifier_ssim'].delete(a.id) unless b['identifier_ssim'].length == 1
+          a['identifier_ssim'][0] <=> b['identifier_ssim'][0]
+        else
+          -1
+        end
+      else
+        c
+      end
+    end
+    thumb_from_solr_doc(sorted[0])
+  end
+
+  def thumb_from_solr_doc(solr_doc)
+    if solr_doc and (member =  ActiveFedora::Base.find(solr_doc.id, :cast=>true)).respond_to? :thumbnail_info
+      member.thumbnail_info
+    else
+      return nil
+    end
+  end
+
+  def to_uri(obj)
+    if obj.respond_to? :internal_uri
+      return obj.internal_uri
+    end
+    obj = obj.pid unless obj.is_a? String
+    if obj.is_a? String and obj =~ /\A[\w\-]+:[\w\-]+\Z/
+      obj = "info:fedora/#{obj}"
+    end
+    return obj
+  end
+end