cul_scv_hydra 0.11.0 → 0.12.0

data/app/models/bag_aggregator.rb

@@ -1,17 +1,7 @@
-require "active-fedora"
-require "active_fedora_finders"
-require "hydra-core"
-class BagAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
-
-  alias :file_objects :resources
+class BagAggregator < GenericAggregator
 
   def route_as
     "collection"
   end
+
 end

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

@@ -8,9 +8,12 @@ module Hydra
   module Models
     AGGREGATOR_TYPE = (URI.parse("http://purl.oclc.org/NET/CUL/Aggregator"))
     RESOURCE_TYPE = (URI.parse("http://purl.oclc.org/NET/CUL/Resource"))
-    MEMBER_QUERY = <<-SPARQL
+    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
   end
 end
 end

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

@@ -3,8 +3,8 @@ module 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'
-    has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
     after_create :aggregator!
   end
 
@@ -30,7 +30,98 @@ module Aggregator
     member.save
   end
 
+  def solr_members(opts={})
+    opts = {:rows=>25,:response_format=>:solr}.merge(opts)
+    self.parts(opts)
+    #opts = {:rows=>25,:response_format=>:solr}.merge(opts)
+    #query = self.class.inbound_relationship_query(self.pid, "parts")
+    #solr_result = ::ActiveFedora::SolrService.instance.conn.query(query, :rows=>opts[:rows])
+    #if opts[:response_format] == :solr
+    #  return solr_result
+    #else
+    #  if opts[:response_format] == :id_array
+    #    id_array = []
+    #    solr_result.hits.each do |hit|
+    #      id_array << hit[SOLR_DOCUMENT_ID]
+    #    end
+    #    return id_array
+    #  elsif opts[:response_format] == :load_from_solr || self.load_from_solr
+    #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
+    #  else
+    #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result)
+    #  end
+    #end
+  end
+
+  def members(opts={})
+    solr_members(opts)
+  end
+  
+  def members_ids(opts={})
+    opts = opts.merge({:response_format=>:id_array})
+    solr_members(opts)
+  end
+
+  def thumbnail_info
+    r = self.parts.reader(:response_format => :solr)
+    members = []
+    r.collect {|hit| members << SolrDocument.new(hit) } unless r.blank?
+    if members.length == 0
+      return {: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)
+    sm = datastreams['structMetadata']
+    first = sm.divs_with_attribute(false,'ORDER','1').first
+    if first
+      members.each do |member|
+        if member["identifier_ssim"].include? first["CONTENTIDS"]
+          return thumb_from_solr_doc(member)
+        end
+      end
+      return nil
+    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
+      puts "thumb: " + (thumb = member.thumbnail_info).inspect
+      thumb
+    else
+      return nil
+    end
+  end
+
   def to_uri(obj)
     if obj.respond_to? :internal_uri
       return obj.internal_uri

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

@@ -3,15 +3,10 @@ require 'uri'
 module Cul::Scv::Hydra::Models
 module Common
   extend ActiveSupport::Concern
-    DC_SPEC = {
-      :name => "DC", :type=>Cul::Scv::Hydra::Datastreams::DCMetadata,
-      :versionable => true, :label => 'Dublin Core Record for this object'
-    }
+
   included do
     define_model_callbacks :create
-    has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
     has_metadata :name => "DC", :type=>Cul::Scv::Hydra::Datastreams::DCMetadata, :versionable => true
-    #self.ds_specs['DC'] = DC_SPEC
     has_metadata :name => "descMetadata", :type=>Cul::Scv::Hydra::Datastreams::ModsDocument, :versionable => true
     has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
     
@@ -22,30 +17,6 @@ module Common
       'ldpd'
     end
 
-    # override a buggy impl in AF
-    def has_datastream(args)
-      unless args.has_key?(:name)
-        return false
-      end
-      unless args.has_key?(:prefix)
-        args.merge!({:prefix=>args[:name].to_s.upcase})
-      end
-      unless class_named_datastreams_desc.has_key?(args[:name]) 
-        class_named_datastreams_desc[args[:name]] = {} 
-      end
-          
-      args.merge!({:mimeType=>args[:mime_type]}) if args.has_key?(:mime_type)
-      
-      unless class_named_datastreams_desc[args[:name]].has_key?(:type) 
-        #default to type ActiveFedora::Datastream
-        args[:type] ||= ActiveFedora::Datastream
-      end
-      args[:type] = args[:type].constantize if args[:type].is_a? String
-      raise args[:type] unless args[:type].name
-      class_named_datastreams_desc[args[:name]]= args   
-      create_named_datastream_finders(args[:name],args[:prefix])
-      create_named_datastream_update_methods(args[:name])
-    end
   end
 
   def rdf_type
@@ -63,44 +34,6 @@ module Common
       super
     end
   end
-
-  def resources(opts={})
-    if self.respond_to? :parts # aggregator
-      opts = {:rows=>25,:response_format=>:solr}.merge(opts)
-      self.parts(opts)
-          #opts = {:rows=>25,:response_format=>:solr}.merge(opts)
-          #query = self.class.inbound_relationship_query(self.pid, "parts")
-          #solr_result = ::ActiveFedora::SolrService.instance.conn.query(query, :rows=>opts[:rows])
-          #if opts[:response_format] == :solr
-          #  return solr_result
-          #else
-          #  if opts[:response_format] == :id_array
-          #    id_array = []
-          #    solr_result.hits.each do |hit|
-          #      id_array << hit[SOLR_DOCUMENT_ID]
-          #    end
-          #    return id_array
-          #  elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-          #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-          #  else
-          #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result)
-          #  end
-          #end
-   else
-      logger.warn 'parts not defined; was this an Aggregator?'
-      []
-    end
-  end
-
-  def members(opts={})
-    resources(opts)
-  end
-  
-  def members_ids(opts={})
-    opts = opts.merge({:response_format=>:id_array})
-    resources(opts)
-  end
-  
     
   def cmodel_pid(klass)
     klass.pid_namespace + ":" + klass.name.split("::")[-1]
@@ -129,23 +62,6 @@ module Common
     "default"
   end
   
-  def index_type_label
-    riquery = Cul::Scv::Hydra::Models::MEMBER_QUERY.gsub(/%PID%/, self.pid)
-    begin
-      docs = ::ActiveFedora::Base.connection_for_pid(self.pid).find_by_sparql riquery
-    rescue Exception=>e
-      docs = self.parts
-    end
-    if docs.size == 0
-      label = "EMPTY"
-    elsif docs.size == 1
-      label = "SINGLE PART"
-    else
-      label = "MULTIPART"
-    end
-    label
-  end
-
   def has_desc?
     has_desc = false
     begin
@@ -159,7 +75,7 @@ module Common
   end
 
   def to_solr(solr_doc = Hash.new, opts={})
-    super
+    solr_doc = super(solr_doc, opts)
     if has_desc?
       solr_doc["descriptor_ssi"] = ["mods"]
     else

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

@@ -0,0 +1,80 @@
+module Cul::Scv::Hydra::Models
+  module ImageResource
+    IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp', 'image/jp2' => 'jp2'}
+    WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
+    LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
+    WIDTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageWidth").to_s
+    LENGTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageLength").to_s
+    EXTENT_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/extent").to_s
+    FORMAT_OF_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/isFormatOf").to_s
+    FORMAT_URI = RDF::URI("http://purl.org/dc/terms/format")
+
+    DJATOKA_THUMBNAIL_PARMS = {
+      "url_ver" => "Z39.88-2004",
+      "svc_id" => "info:lanl-repo/svc/getRegion",
+      "svc_val_fmt" => "info:ofi/fmt:kev:mtx:jpeg2000",
+      "svc.format" => "image/jpeg",
+      "svc.level" => "",
+      "svc.rotate" => "0",
+      "svc.scale" => "200",
+      "svc.clayers" => ""
+    }
+
+    DJATOKA_BASE_URL = "http://iris.cul.columbia.edu:8888/resolve"
+
+    def long
+      @long_side ||= max(width(), length())
+    end
+
+    def width
+      @width ||= begin
+        ds = datastreams["content"]
+        width = 0
+        unless ds.nil? or rels_int.relationships(ds,:exif_image_width).blank?
+          width = rels_int.relationships(ds,:exif_image_width).first.object.to_s.to_i
+        end
+        width = relationships(:image_width).first.to_s.to_i if width == 0
+        width
+      end
+    end
+
+    def length
+      @length ||= begin
+        ds = datastreams["content"]
+        length = 0
+        unless ds.nil? or rels_int.relationships(ds,:exif_image_length).blank?
+          length = rels_int.relationships(ds,:exif_image_length).first.object.to_s.to_i
+        end
+        length = relationships(:image_length).first.to_s.to_i if length == 0
+        length
+      end
+    end
+
+    def zooming?
+      zoom = rels_int.relationships(datastreams['content'],:foaf_zooming).first
+      return zoom.object.to_s if zoom
+      datastreams.each do |k,v|
+        if v.mimeType =~ /image\/jp2$/i
+          zoom = "info:fedora/#{k.dsid}"
+        end
+      end
+      return zoom  
+    end
+
+    def thumbnail_info
+      thumb = rels_int.relationships(datastreams['content'],:foaf_thumbnail).first
+      if thumb
+        t_dsid = thumb.object.to_s.split('/')[-1]
+        t_url = "#{ActiveFedora.fedora_config.credentials[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content"
+        return {:url=>t_url,:mime=>datastreams[t_dsid].mimeType}
+      elsif (zoom = self.zooming?)
+        t_dsid = zoom.split('/')[-1]
+        t_parms = DJATOKA_THUMBNAIL_PARMS.merge({"rft_id" => datastreams[t_dsid].dsLocation})
+        url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
+        {:url => url, :mime => t_parms["svc.format"]}
+      else
+        return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
+      end
+    end
+  end
+end

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

@@ -0,0 +1,111 @@
+module Cul::Scv::Hydra::Models
+  module LinkableResources
+    include Cul::Scv::Fedora::UrlHelperBehavior
+    # so as to avoid including all the url hepers via:
+    ## include Rails.application.routes.url_helpers
+    # we are just going to delegate
+    delegate :fedora_content_path,  :to => 'Rails.application.routes.url_helpers'
+    delegate :cache_path,  :to => 'Rails.application.routes.url_helpers'
+
+    def http_client
+      unless @http_client
+        @http_client ||= HTTPClient.new
+        @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        uname = Cul::Scv::Fedora.repository.config[:user]
+        pwd = Cul::Scv::Fedora.repository.config[:password]
+        @http_client.set_auth(nil, uname, pwd)
+      end
+      @http_client
+    end
+
+    def linkable_resources
+      r = self.parts(:response_format => :solr)
+      return [] if r.blank?
+      members = r.collect {|hit|
+        SolrDocument.new(hit)
+      }
+      members.delete_if { |sd| (sd[:has_model_ssim] & ["info:fedora/ldpd:Resource"]).blank? }
+      case self.route_as
+      when "zoomingimage"
+        results = members.collect {|doc| image_resource(doc)}
+        base_id = self.pid
+        url = fedora_ds_url(base_id, 'SOURCE') + '/content'
+        head_req = http_client().head(url)
+        file_size = head_req.header["Content-Length"].first.to_i
+        results << {
+          :dimensions => "Original",
+          :mime_type => "image/jp2",
+          :uri=>base_id, :block=>"SOURCE", :filename=>base_id + "_source.jp2",
+          :content_models=>[]}  
+      when "audio"
+        results = members.collect {|doc| audio_resource(doc)}
+      when "image"
+        results = members.collect {|doc| image_resource(doc)}
+      else
+        raise "Unknown format #{self.route_as}"
+      end
+      return results
+    end
+    
+    def basic_resource(document)
+      res = {}
+      res[:pid] = document["id"]
+      res[:dsid] = "CONTENT"
+      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+      res[:content_models] = document["has_model_ssim"]
+      res[:file_size] = document["extent_ssim"].first.to_i
+      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+      res
+    end
+
+    def image_resource(document)
+      res = basic_resource(document)
+      if document["image_width_ssim"]
+        res[:dimensions] = document["image_width_ssim"].first + " x " + document["image_length_ssim"].first
+        res[:width] = document["image_width_ssim"].first
+        res[:height] = document["image_length_ssim"].first
+      else
+        res[:dimensions] = "? x ?"
+        res[:width] = "0"
+        res[:height] = "0"
+      end
+      base_id = document["id"]
+      base_filename = base_id.gsub(/\:/,"")
+      img_filename = base_filename + "." + document["dc_format_ssm"].first.gsub(/^[^\/]+\//,"")
+      res[:filename] = img_filename
+      res[:block] = "CONTENT"
+      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+      res[:content_models] = document["has_model_ssim"]
+      res[:file_size] = document["extent_ssim"].first.to_i
+      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+      res[:uri] = base_id
+      res
+    end
+
+    def audio_resource(document)
+      res = basic_resource(document)
+      base_id = document["id"]
+      base_filename = base_id.gsub(/\:/,"")
+      if res[:mime_type] =~ /wav/
+        ext = 'wav'
+      elsif res[:mime_type] =~ /mpeg/
+        ext = 'mp3'
+      else
+        ext = 'bin'
+      end
+      filename = base_filename + "." + ext
+      dc_filename = base_filename + "_dc.xml"
+      res[:uri] = base_id
+      res[:block] = "CONTENT"
+      res[:filename] = filename
+      res[:dc_path] = fedora_content_path(:download_method=>"show_pretty", :uri=>base_id, :block=>"DC", :filename=>dc_filename)
+      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+      res[:content_models] = document["has_model_ssim"]
+      res[:file_size] = document["extent_ssim"].first.to_i
+      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+      res
+    end
+    
+  end
+
+end

data/app/models/content_aggregator.rb

@@ -1,27 +1,13 @@
-require "active-fedora"
-require "active_fedora_finders"
-class ContentAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
-
-  alias :file_objects :resources
-
-  def route_as
-    "multipartitem"
-  end
+class ContentAggregator < GenericAggregator
   
   def thumbnail_info
-    members = resources
-    if members.length > 1
+    _members = member_ids()
+    if _members.length > 1
       return {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime=>'image/png'}
-    elsif members.length == 0
+    elsif _members.length == 0
       return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
     else
-      member = ActiveFedora::Base.find(members[0], :cast=>true)
+      member = ActiveFedora::Base.find(_members[0], :cast=>true)
       if member.respond_to? :thumbnail_info
         return member.thumbnail_info
       end

data/app/models/dcdocument.rb

@@ -8,7 +8,7 @@ class DcDocument < ActiveFedora::Base
   include Cul::Scv::Hydra::Models::Common
   alias :file_objects :resources
   
-  has_many :parts, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
+  has_and_belongs_to_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
   def self.load_instance_from_solr(pid,solr_doc=nil)
     if solr_doc.nil?

data/app/models/generic_aggregator.rb

@@ -1,16 +1,35 @@
 require "active-fedora"
 require "active_fedora_finders"
 class GenericAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common
   include Cul::Scv::Hydra::Models::Aggregator
 
-  alias :file_objects :resources
+  has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
   def route_as
     "multipartitem"
   end
+
+  def index_type_label
+    riquery = Cul::Scv::Hydra::Models::MEMBER_ITQL.gsub(/%PID%/, self.pid)
+    begin
+      docs = Cul::Scv::Fedora.repository.find_by_itql riquery, limit: 2, format: json
+      docs = JSON.parse(docs)['results']
+    rescue Exception=>e
+      Rails.logger.warn("#{self.class.name} failed to find children with TQL: #{e.message}")
+      docs = self.parts
+    end
+    if docs.size == 0
+      label = "EMPTY"
+    elsif docs.size == 1
+      label = "SINGLE PART"
+    else
+      label = "MULTIPART"
+    end
+    label
+  end
+
 end

data/app/models/generic_object.rb

@@ -8,6 +8,8 @@ class GenericObject < ::ActiveFedora::Base
   include Cul::Scv::Hydra::Models::Common
   include Cul::Scv::Hydra::Models::Aggregator
 
+  has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
+
   alias :file_objects :resources
 
   def route_as

data/app/models/generic_resource.rb

@@ -10,8 +10,11 @@ class GenericResource < ::ActiveFedora::Base
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::ImageResource
+  include Cul::Scv::Fedora::UrlHelperBehavior
   include ::ActiveFedora::RelsInt
-  alias :file_objects :resources
+
+  has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
   
   IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp'}
   WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
@@ -25,7 +28,7 @@ class GenericResource < ::ActiveFedora::Base
   end
 
   def route_as
-    "resource"
+    self.zooming? ? "zoomingimage" : "resource"
   end
 
   def index_type_label
@@ -49,5 +52,97 @@ class GenericResource < ::ActiveFedora::Base
       return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
     end
   end
-        
+
+  def to_solr(solr_doc = Hash.new, opts={})
+    solr_doc = super
+    unless solr_doc["extent_ssim"] || self.datastreams["content"].nil?
+      solr_doc["extent_ssim"] = [self.datastreams["content"].size]
+    end
+    if self.zooming?
+      fz = rels_int.relationships(datastreams['content'], :foaf_zooming).first.object.to_s.split('/')[-1]
+      ds = datastreams[fz]
+      rft_id = ds.controlGroup == 'E' ? datastreams[fz].dsLocation : fedora_ds_url(pid, ds.dsid) + '/content'
+      solr_doc['rft_id_ss'] = rft_id
+    end
+    solr_doc
+  end
+  
+  def thumbnail_info
+    thumb = rels_int.relationships(datastreams['content'],:foaf_thumbnail).first
+    if thumb
+      t_dsid = thumb.object.to_s.split('/')[-1]
+      t_url = "#{ActiveFedora.fedora_config.credentials[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content"
+      return {:url=>t_url,:mime=>datastreams[t_dsid].mimeType}
+    elsif self.zooming?
+      t_dsid = rels_int.relationships(dsuri, :foaf_zooming).first.object.to_s.split('/')[-1]
+      t_parms = DJATOKA_THUMBNAIL_PARMS.merge({"rft_id" => datastreams[t_dsid].dsLocation})
+      url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
+      {:url => url, :mime => t_parms["svc.format"]}
+    else
+      return {:asset=>"crystal/file.png",:mime=>'image/png'}
+    end
+  end
+  
+  def linkable_resources
+    # let's start with the known DSIDs from lindquist, then work our way back to parsing the solrized relsint
+    results = []
+    if (rels = rels_int.instance_variable_get :@solr_hash)
+      # this was loaded from solr
+      rels.each do |dsuri, props|
+        if dsuri =~ /\/content$/ or not props[FORMAT_OF_PREDICATE].blank?
+          dsid =  dsuri.split('/')[-1]
+          res = datastream_as_resource(dsid, props)
+          results << res
+        end
+      end
+    else
+      content_uri = RDF::URI("info:fedora/#{self.pid}/content")
+      dsuris = [content_uri]
+      results = []
+      # read the graph
+      datastreams.each do |k, v|
+        rels = rels_int.relationships(v, :format_of, content_uri)
+        dsuris << rels[0].subject unless rels.blank?
+      end
+
+      dsuris.each do |dsuri|
+        dsid = dsuri.to_s.split('/')[-1]
+        width_rel = rels_int.relationships(dsuri, :exif_image_width)[0]
+        length_rel = rels_int.relationships(dsuri, :exif_image_length)[0]
+        extent_rel = rels_int.relationships(dsuri, :extent)[0]
+        props = {EXTENT_PREDICATE => [], WIDTH_PREDICATE => [], LENGTH_PREDICATE => []}
+        props[EXTENT_PREDICATE] << extent_rel.object.to_s unless extent_rel.blank?
+        props[WIDTH_PREDICATE] << width_rel.object.to_s unless width_rel.blank?
+        props[LENGTH_PREDICATE] << length_rel.object.to_s unless length_rel.blank?
+        results << datastream_as_resource(dsid, props)
+      end
+    end
+    results
+  end
+
+  def zooming?
+    !rels_int.relationships(datastreams['content'], :foaf_zooming).first.blank?
+  end
+  
+  private
+  def datastream_as_resource(dsid, props={})
+    ds = datastreams[dsid]
+    raise "No resource at info:fedora/#{pid}/#{dsid}" unless ds
+    res = {}
+    res[:uri] = self.pid
+    res[:block] = dsid
+    res[:mime_type] = ds.mimeType
+    res[:content_models] = ["Datastream"]
+    res[:file_size] = ds.dsSize.to_s
+    if res[:file_size] == "0" and props[EXTENT_PREDICATE]
+      res[:file_size] = (props[EXTENT_PREDICATE].first || "0")
+    end
+    res[:size] = (res[:file_size].to_i / 1024).to_s + " Kb"
+    res[:width] = props[WIDTH_PREDICATE].first || "0"
+    res[:height] = props[LENGTH_PREDICATE].first || "0"
+    res[:dimensions] = "#{res[:width]} x #{res[:height]}"
+    base_filename = pid.gsub(/\:/,"")
+    res[:filename] = base_filename + "." + dsid + "." + ds.mimeType.gsub(/^[^\/]+\//,"")
+   res
+  end       
 end

data/app/models/jp2_image_aggregator.rb

@@ -1,17 +1,9 @@
 require "active-fedora"
 require "active_fedora_finders"
-class JP2ImageAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
+class JP2ImageAggregator < ResourceAggregator
 
   has_datastream :name => "SOURCE", :type=>::ActiveFedora::Datastream, :mimeType=>"image/jp2", :controlGroup=>'E'
 
-  alias :file_objects :resources
-
   def route_as
     "zoomingimage"
   end

data/app/models/mets_structured_aggregator.rb

@@ -8,6 +8,8 @@ class METSStructuredAggregator < ::ActiveFedora::Base
   include Cul::Scv::Hydra::Models::Common
   include Cul::Scv::Hydra::Models::Aggregator
 
+  has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
+
   alias :file_objects :resources
 
   def route_as

data/app/models/resource.rb

@@ -3,20 +3,20 @@ require "active_fedora_finders"
 require "cul_image_props"
 require "mime/types"
 require "uri"
-class Resource < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
+class Resource < ActiveFedora::Base
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
+#  include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common
   include Cul::Scv::Hydra::Models::Resource
+  include Cul::Scv::Hydra::Models::ImageResource
 
-  alias :file_objects :resources
+  belongs_to :container, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
 
-  CUL_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
-  CUL_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
-  FORMAT = "http://purl.org/dc/elements/1.1/format"
-  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
+#  CUL_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
+#  CUL_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
+#  FORMAT = "http://purl.org/dc/elements/1.1/format"
+#  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
 
   def route_as
     "resource"
@@ -35,46 +35,44 @@ class Resource < ::ActiveFedora::Base
   end
 
   def set_title_and_label(new_title, opts={})
-      if opts[:only_if_blank]
-        if self.label.nil? || self.label.empty?
-          self.label = new_title
-          self.set_title( new_title )
-        end
-      else
+    if opts[:only_if_blank]
+      if self.label.nil? || self.label.empty?
         self.label = new_title
-        set_title( new_title )
+        self.set_title( new_title )
       end
+    else
+      self.label = new_title
+      set_title( new_title )
     end
+  end
 
-    # Set the title and label on the current object
-    #
-    # @param [String] new_title
-    # @param [Hash] opts (optional) hash of configuration options
-    def set_title(new_title, opts={})
-      if has_desc? 
-        desc_metadata_ds = self.datastreams["descMetadata"]
-        if desc_metadata_ds.respond_to?(:title_values)
-          desc_metadata_ds.title_values = new_title
-        else
-          desc_metadata_ds.title = new_title
-        end
+  # Set the title and label on the current object
+  #
+  # @param [String] new_title
+  # @param [Hash] opts (optional) hash of configuration options
+  def set_title(new_title, opts={})
+    if has_desc? 
+      desc_metadata_ds = self.datastreams["descMetadata"]
+      if desc_metadata_ds.respond_to?(:title_values)
+        desc_metadata_ds.title_values = new_title
+      else
+        desc_metadata_ds.title = new_title
       end
     end
-    
-    def thumbnail_info
-      # do the triples indicate this is a thumb? fetch
-      width = object_relations[CUL_WIDTH].first.to_i
-      length = object_relations[CUL_LENGTH].first.to_i
-      if width <= 251 && length <= 251
-        mime = object_relations[FORMAT].first
-        url = {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{self.pid}/datastreams/CONTENT/content", :mime=>mime}
+  end
+  
+  def thumbnail_info
+    # do the triples indicate this is a thumb? fetch
+    if long <= 251
+      mime = object_relations[FORMAT].first
+      url = {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{self.pid}/datastreams/CONTENT/content", :mime=>mime}
+    else
+      if object_relations[MEMBER_OF].blank?
+        return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
       else
-        if object_relations[MEMBER_OF].blank?
-          return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
-        else
-          url = StaticImageAggregator.find(object_relations[MEMBER_OF].first).thumbnail_info
-        end
+        url = ActiveFedora::Base.find(parents.first, :cast => true).thumbnail_info
       end
-      return url
     end
+    return url
+  end
 end

data/app/models/resource_aggregator.rb

@@ -0,0 +1,22 @@
+class ResourceAggregator < ::ActiveFedora::Base
+  include ::ActiveFedora::Finders
+  include ::ActiveFedora::DatastreamCollections
+  include ::Hydra::ModelMethods
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
+  include Cul::Scv::Hydra::Models::LinkableResources
+
+  has_many :parts, :property => :cul_member_of, :class_name=>'Resource'
+
+  def route_as
+    "resource"
+  end
+  
+  def index_type_label
+    "PART"
+  end
+  
+  def thumbnail_info
+    return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+  end
+end

data/app/models/static_audio_aggregator.rb

@@ -1,23 +1,11 @@
 require "active-fedora"
 require "active_fedora_finders"
-class StaticAudioAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
-
-  alias :file_objects :resources
+class StaticAudioAggregator < ResourceAggregator
 
   def route_as
     "audio"
   end
   
-  def index_type_label
-    "PART"
-  end
-  
   def thumbnail_info
     return {:url=>image_url("cul_scv_hydra/crystal/mp3.png"),:mime=>'image/png'}
   end

data/app/models/static_image_aggregator.rb

@@ -1,14 +1,6 @@
 require "active-fedora"
 require "active_fedora_finders"
-class StaticImageAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
-
-  alias :file_objects :resources
+class StaticImageAggregator < ResourceAggregator
   
   CUL_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
   CUL_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
@@ -18,20 +10,17 @@ class StaticImageAggregator < ::ActiveFedora::Base
   end
 
   def index_type_label
-    "PART"
+    'PART'
   end
-  
+
   def thumbnail_info
     candidate = nil
     max_dim = 251
     resources.each do |pid|
       resource = Resource.find(pid)
-      width = resource.object_relations[CUL_WIDTH].first.to_i
-      length = resource.object_relations[CUL_LENGTH].first.to_i
-      max = (width > length) ? width : length
-      if max_dim > max
+      if max_dim > resouce.long
         candidate = resource
-        max_dim = max
+        max_dim = resource.long
       end
     end
     if candidate.nil?

data/config/fedora.yml

@@ -1,19 +1,11 @@
-development:
-#  :url: http://127.0.0.1:8983/fedora
-#  :user: fedoraAdmin
-#  :password: fedoraAdmin
+alcott: &alcott
   :url: http://alcott.cul.columbia.edu:8080/fedora
   :user: fedoraAdmin
   :password: f+BULUS*^
-test:
-  :url: http://127.0.0.1:8983/fedora
-  :user: fedoraAdmin
-  :password: fedoraAdmin
-production:
-  :url: http://alcott.cul.columbia.edu:8080/fedora
-  :user: fedoraAdmin
-  :password: f+BULUS*^
-default:
+default: &default
   :url: http://127.0.0.1:8983/fedora
   :user: fedoraAdmin
   :password: fedoraAdmin
+development: *alcott
+test: *default
+production: *alcott

data/config/predicate_mappings.yml

@@ -64,6 +64,8 @@
     :y_resolution: yResolution
     :resolution_unit: resolutionUnit
   http://xmlns.com/foaf/0.1/:
+    :foaf_image: image
     :foaf_thumbnail: thumbnail
+    :foaf_zooming: zoomingImage
   http://www.w3.org/1999/02/22-rdf-syntax-ns#:
     :rdf_type: type

data/lib/cul_scv_fedora/dummy_object.rb

@@ -0,0 +1,31 @@
+module Cul
+  module Scv
+    module Fedora
+      class FakeObject
+        attr_accessor :pid
+        def initialize(pid, isNew=false)
+          @pid = pid
+          @isNew = isNew
+        end
+        def new_record?
+          @isNew
+        end
+        def connection
+          Cul::Scv::Fedora.connection
+        end    
+        def repository
+          Cul::Scv::Fedora.repository
+        end
+        def spawn(pid)
+          s = FakeObject.new(pid)
+          s.connection= connection
+          s.repository= repository
+          s
+        end
+        protected
+        def connection=(connection); @connection = connection; end
+        def repository=(repo); @repository = repo; end
+      end
+    end
+  end
+end

data/lib/cul_scv_fedora/rubydora_patch.rb

@@ -0,0 +1,11 @@
+module Cul
+  module Scv
+    module Fedora
+      module RubydoraPatch
+        def find_by_itql query, options = {}
+          self.risearch(query, {:lang => 'itql'}.merge(options))
+        end
+      end
+    end
+  end
+end

data/lib/cul_scv_fedora/url_helper_behavior.rb

@@ -0,0 +1,32 @@
+module Cul
+  module Scv
+    module Fedora
+      module UrlHelperBehavior
+
+        def fedora_url
+          @fedora_url ||= ActiveFedora.config.credentials[:url]
+        end
+
+        def pid_for_url(pid)
+          pid.gsub(/^\//,'').gsub(/info:fedora\//,'')
+        end
+
+        def fedora_object_url(pid)
+          fedora_url + '/objects/' + pid_for_url(pid)
+        end
+
+        def fedora_ds_url(pid, dsid)
+          fedora_object_url(pid) + '/datastreams/' + dsid
+        end
+
+        def fedora_method_url(pid, method)
+          fedora_object_url(pid) + '/methods/' + method
+        end
+
+        def fedora_risearch_url
+          fedora_url + '/risearch'
+        end
+      end
+    end
+  end
+end

data/lib/cul_scv_hydra.rb

@@ -1,19 +1,41 @@
-require "rubygems"
+require 'hydra/head'
+require 'active_fedora_relsint'
 module Cul
   module Scv
     module Hydra
     end
+    module Fedora
+      require 'cul_scv_fedora/url_helper_behavior'
+      require 'cul_scv_fedora/dummy_object'
+      require 'cul_scv_fedora/rubydora_patch'
+      def self.config_path
+        File.join(Rails.root.to_s, 'config', 'fedora.yml')
+      end
+      def self.config
+        ActiveFedora.fedora_config.credentials
+      end
+      def self.connection
+        @connection ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.fedora_config.credentials)
+      end
+
+      def self.repository
+        @repository ||= begin
+          repo = connection.connection
+          repo.extend(RubydoraPatch)
+          repo
+        end
+      end
+
+      def self.ds_for_uri(fedora_uri, fake_obj=nil)
+        return nil unless fedora_uri =~ /info\:fedora\/.*/
+        p = fedora_uri.split('/')
+        fake_obj = fake_obj.nil? ? DummyObject.new(p[1]) : fake_obj.spawn(p[1])
+        ::Rubydora::Datastream.new(fake_obj, p[2])
+      end
+    end
   end
 end
-# this is a hack to make requiring hydra possible
-#module Hydra
-#  module Datastream
-#    module CommonModsIndexMethods
-#    end
-#  end
-#end
-require 'hydra/head'
-require 'active_fedora_relsint'
+
 require "cul_scv_hydra/access_controls_enforcement"
 require "cul_scv_hydra/controllers"
 require "cul_scv_hydra/om"

data/lib/cul_scv_hydra/engine.rb

@@ -7,6 +7,13 @@ module Cul::Scv::Hydra
   class Engine < ::Rails::Engine
   	isolate_namespace Cul::Scv::Hydra
 
+    config.mount_at = '/'
+
+    config.autoload_paths += %W(
+      #{config.root}/app/controllers/concerns
+      #{config.root}/app/models/concerns
+    )
+
     config.generators do |g|                                                               
       g.test_framework :rspec
       g.integration_tool :rspec

data/lib/cul_scv_hydra/version.rb

@@ -1,10 +1,10 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.11.0'
+        VERSION = '0.12.0'
         def self.version
           VERSION
         end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -210,6 +210,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rails
+- lib/cul_scv_fedora/dummy_object.rb
+- lib/cul_scv_fedora/rubydora_patch.rb
+- lib/cul_scv_fedora/url_helper_behavior.rb
 - lib/cul_scv_hydra/access_controls_enforcement.rb
 - lib/cul_scv_hydra/controllers/aggregates.rb
 - lib/cul_scv_hydra/controllers/aggregator_controller_helper.rb
@@ -258,6 +261,8 @@ files:
 - app/models/bag_aggregator.rb
 - app/models/concerns/cul/scv/hydra/models/aggregator.rb
 - app/models/concerns/cul/scv/hydra/models/common.rb
+- app/models/concerns/cul/scv/hydra/models/image_resource.rb
+- app/models/concerns/cul/scv/hydra/models/linkable_resources.rb
 - app/models/concerns/cul/scv/hydra/models/resource.rb
 - app/models/concerns/cul/scv/hydra/models.rb
 - app/models/concerns/cul.rb
@@ -272,6 +277,7 @@ files:
 - app/models/jp2_image_aggregator.rb
 - app/models/mets_structured_aggregator.rb
 - app/models/resource.rb
+- app/models/resource_aggregator.rb
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
 - config/fedora.yml
@@ -284,6 +290,8 @@ licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
+- app
+- config
 - lib
 - fixtures
 required_ruby_version: !ruby/object:Gem::Requirement