cul_scv_hydra 0.19.5 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad820d73e4e3ccbebdc24acffefc6fe7e1c50f3
-  data.tar.gz: c134d0ba8f07b271dd19fbf7db1e88ae3da3452a
+  metadata.gz: 46d4b43e9073bab05dbc6a72b36d3a0ea1120ee1
+  data.tar.gz: 5c2392b7aecea8c413aa0e2729987fb15ef400b1
 SHA512:
-  metadata.gz: 3f75bf09c701b26a0f25c3298029895a8354383772be2beb6648bad503faae8c685f63876034b6dd883e41219de27594cc1c305782a47b41690c06bf64c704ef
-  data.tar.gz: faae4690e145ec50beb4e77e95d85446d21e8ff594f0e50d12846855287ee5c48afc7bd96d1ee75587a55c747027ee0f23d55481589138bbce93ebb3dbc36d0a
+  metadata.gz: ca1e49735e2168b74d6942ad4c7b7c51bb055fa24937278c58b92eb5c9a9b7b2c22d587847506d3fea688f46dcefd1e8965a6dc27d6775a96c4ff3179f9b06ab
+  data.tar.gz: 5ab6897aa13e0c987f1103b21866d474a7cabff4fdc1ec872947728ff46304a1aeffe9d335aa0f5392dbf314d4336f5ecbdd920c995e2b8bacf55df5bba41d3e

data/app/models/concerns/nfo/common.rb

@@ -0,0 +1,17 @@
+module NFO
+  module Common
+    extend ActiveSupport::Concern
+    included do
+      property :belongsToContainer, predicate: RDF::NFO[:"#belongsToContainer"], multivalue: false do |ix|
+        ix.as :stored_sortable
+      end
+    end
+
+    def to_solr(solr_doc={})
+      solr_doc = super(solr_doc)
+      if solr_doc['']
+      end
+      solr_doc
+    end
+  end
+end

data/app/models/concerns/nfo/file_data_object.rb

@@ -0,0 +1,10 @@
+module NFO
+  class FileDataObject < ORE::Proxy
+    include NIE::InformationElement
+    include NFO::Common
+    def initialize(proxy_for_uri, context_uri, *args)
+      super(proxy_for_uri, context_uri, *args)
+      self.get_values(:type) << RDF::NFO[:"#FileDataObject"]
+    end
+  end
+end

data/app/models/concerns/nfo/folder.rb

@@ -0,0 +1,10 @@
+module NFO
+  class Folder < ORE::Proxy
+    include NIE::InformationElement
+    include NFO::Common
+    def initialize(proxy_for_uri, context_uri, *args)
+      super(proxy_for_uri, context_uri, *args)
+      self.get_values(:type) << RDF::NFO[:"#Folder"]
+    end
+  end
+end

data/app/models/concerns/nie/information_element.rb

@@ -0,0 +1,10 @@
+module NIE
+  module InformationElement
+    extend ActiveSupport::Concern
+    included do
+      property :isPartOf, predicate: RDF::NIE[:"#isPartOf"], multivalue: true do |ix|
+        ix.as :symbol
+      end
+    end
+  end
+end

data/app/models/concerns/ore/proxy.rb

@@ -0,0 +1,123 @@
+# A named graph describing the location of a Resource in a virtual nested structure
+require 'digest'
+module ORE
+class Proxy < ActiveTriples::Resource
+  include Digest
+  include Solrizer::Common
+  include ActiveFedora::Rdf::Indexing
+
+  module Id
+    class Descriptor < Solrizer::Descriptor
+      def name_and_converter(field_name, field_type)
+        ['id']
+      end
+    end
+    def self.id_for2(proxy_in, proxy_for)
+      path = proxy_for.to_s
+      path = path.sub(/^info.fedora\/[^\/]+\/structMetadata\//,'')
+      "urn:proxy:#{proxy_in ? Digest::MD5.hexdigest(proxy_in.to_s) : '' }:#{path}"
+    end
+  end
+  def self.type
+    RDF::ORE.Proxy
+  end
+  property :id, predicate: RDF.nodeID, multivalue: false do |ix|
+    ix.as Id::Descriptor.new
+  end
+  property :isAggregatedBy, predicate: RDF::ORE.isAggregatedBy, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :lineage, predicate: RDF::ORE.lineage, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :proxyFor, predicate: RDF::ORE.proxyFor, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :proxyIn, predicate: RDF::ORE.proxyIn, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :index, predicate: RDF::OLO.index, multivalue: false do |ix|
+    ix.as :stored_sortable
+    ix.type :integer
+  end
+  property :format, predicate: RDF::DC.format, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :extent, predicate: RDF::DC.extent, multivalue: false do |ix|
+    ix.as :displayable
+  end
+  property :label, predicate: RDF::RDFS.label, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+  property :hasModel, predicate: RDF::FCREPO3::MODEL.hasModel, multivalue: false do |ix|
+    ix.as :stored_sortable
+  end
+
+  def initialize(proxy_resource_uri, graph_context_uri, *args)
+    proxy_resource_uri = RDF::URI(proxy_resource_uri)
+    super(proxy_resource_uri,*args)
+    update(RDF::Statement(rdf_subject,RDF.nodeID,proxy_resource_uri))
+    self.proxyIn = graph_context_uri
+    self.proxyFor = proxy_resource_uri
+  end
+
+  # override to obscure attempts to identify a containing Datastream
+  def apply_prefix(name)
+    name
+  end
+
+  def resource
+    self
+  end
+
+  def to_json
+    to_solr.with_indifferent_access
+  end
+
+  def to_solr(solr_doc = {}) # :nodoc:
+    fields.each do |field_key, field_info|
+      values = resource.get_values(field_key.to_sym).result || []
+      values = [values] unless values.is_a? Array
+      values.each do |val|
+        if val.kind_of? RDF::URI
+          val = val.to_s 
+        elsif val.kind_of? ActiveTriples::Resource
+          val = val.solrize
+        end
+        self.class.create_and_insert_terms(apply_prefix(field_key), val, field_info[:behaviors], solr_doc)
+      end
+    end
+    solr_doc
+  end
+# returns a Hash, e.g.: {field => {:values => [], :type => :something, :behaviors => []}, ...}
+  def fields
+    field_map = {}.with_indifferent_access
+    insert_field_map(:type, type_config(),field_map)
+    self.class.properties.each do |name, config|
+      insert_field_map(name, config, field_map)
+    end
+    field_map
+  end
+
+  def insert_field_map(name, config, field_map={})
+    type = config[:type]
+    behaviors = config[:behaviors]
+    return field_map unless type and behaviors
+    return field_map if config[:class_name] && config[:class_name] < ActiveFedora::Base
+    resource.query(:subject => rdf_subject, :predicate => config[:predicate]).each_statement do |statement|
+      field_map[name] ||= {:values => [], :type => type, :behaviors => behaviors, term: config[:term]}
+      field_map[name][:values] << statement.object.to_s
+    end
+    field_map
+  end
+
+  def type_config
+    @type_node_config ||= begin
+      config = ActiveTriples::NodeConfig.new(:type, RDF.type)
+      config.with_index {|ix| ix.as :symbol }
+      config
+    end
+  end
+
+end
+end

data/app/models/concerns/rdf/sc.rb

@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+require 'rdf'
+module RDF
+  class SC < RDF::StrictVocabulary("http://www.shared-canvas.org/ns/")
+    term :Manifest,
+      type: "rdfs:Class".freeze
+    term :Sequence,
+      type: "rdfs:Class".freeze
+    term :Canvas,
+      type: "rdfs:Class".freeze
+    # IIIF 'attribution'
+    property :attributionLabel
+    # IIIF 'service'
+    property :hasRelatedService
+    # IIIF 'seeAlso'
+    property :hasRelatedDescription
+    # IIIF 'sequences'
+    # range is a collection of Sequence
+    property :hasSequences
+
+    property :withinManifest,
+      range: "http://www.shared-canvas.org/ns/Manifest".freeze,
+      subPropertyOf: "dc:isPartOf".freeze
+    property :withinSequence,
+      range: "http://www.shared-canvas.org/ns/Sequence".freeze,
+      subPropertyOf: "dc:isPartOf".freeze
+
+    # IIIF 'canvases'
+    # range is a collection of Canvas
+    property :hasCanvases
+    # IIIF 'resources'
+    property :hasAnnotations
+    # IIIF 'images'
+    property :hasImageAnnotations
+    # IIIF 'otherContent'
+    property :hasLists
+    # IIIF 'structures'
+    property :hasRanges
+    # IIIF 'metadata'
+    # range is a collection of Resource
+    property :metadataLabels
+    # IIIF 'viewingDirection'
+    property :viewingDirection
+    # IIIF 'viewingHint'
+    property :viewingHint
+  end
+end

data/app/models/concerns/sc/canvas.rb

@@ -0,0 +1,12 @@
+module SC
+  class Canvas < ORE::Proxy
+    include NIE::InformationElement
+    property :belongsToContainer, predicate: RDF::DC[:isPartOf], multivalue: false do |ix|
+      ix.as :stored_sortable
+    end
+    def initialize(proxy_for_uri, context_uri, *args)
+      super(proxy_for_uri, context_uri, *args)
+      self.get_values(:type) << RDF::SC[:Canvas]
+    end
+  end
+end

data/app/models/concerns/sc/sequence.rb

@@ -0,0 +1,21 @@
+module SC
+  class Sequence < ORE::Proxy
+    include NIE::InformationElement
+    property :viewingDirection, predicate: RDF::SC[:viewingDirection], multivalue: false do |ix|
+      ix.as :stored_sortable
+    end
+    property :viewingHint, predicate: RDF::SC[:viewingHint], multivalue: false do |ix|
+      ix.as :stored_sortable
+    end
+    property :canvases, predicate: RDF::SC[:hasCanvases], multivalue: true do |ix|
+      ix.as :symbol
+    end
+    property :belongsToContainer, predicate: RDF::DC[:isPartOf], multivalue: false do |ix|
+      ix.as :stored_sortable
+    end
+    def initialize(proxy_for_uri, context_uri, *args)
+      super(proxy_for_uri, context_uri, *args)
+      self.get_values(:type) << RDF::SC[:Sequence]
+    end
+  end
+end

data/app/models/cul/scv/hydra/datastreams/struct_metadata.rb

@@ -125,6 +125,52 @@ class StructMetadata < ::ActiveFedora::Datastream
     doc
   end
 
+  def proxies
+    divs = divs_with_attribute(true)
+    graph_context_uri = RDF::URI("info:fedora/#{self.pid}")
+    file_system = self.type.eql?(RDF::NFO[:"#Filesystem"].to_s)
+    divs.collect do |div|
+      proxy_uri_chain = proxy_uri_chain_for(div)
+      proxy_resource_uri = proxy_uri_chain.pop
+      if div['CONTENTIDS']
+        subclass = file_system ?
+          NFO::FileDataObject : SC::Canvas
+        proxy = subclass.new(proxy_resource_uri, graph_context_uri)
+        proxy.proxyFor = RDF::URI(div['CONTENTIDS'])
+      else
+        subclass = file_system ?
+          NFO::Folder : SC::Sequence
+        proxy = subclass.new(proxy_resource_uri, graph_context_uri)
+      end
+      if div.parent and div.parent.name == 'div'
+        proxy.belongsToContainer = proxy_uri_for(div.parent)
+      end
+      proxy.isPartOf = proxy_uri_chain unless proxy_uri_chain.empty?
+      proxy.index = div['ORDER']
+      proxy.label = div['LABEL']
+      proxy
+    end
+  end
+
+  private
+  def ancestors(node)
+    current = node
+    labels = []
+    while (current.name == 'div')
+      labels.unshift URI.escape(current['LABEL'])
+      current = current.parent
+    end
+    labels
+  end
+  def proxy_uri_chain_for(node)
+    uris = []
+    ancestors(node).inject(RDF::URI("info:fedora/#{self.pid}/#{self.dsid}")) {|m,a| (uris << m/a).last}
+    uris
+  end
+  def proxy_uri_for(node)
+    # uri = segments.inject(base_uri) {|m,a| m/a}
+    ancestors(node).inject(RDF::URI("info:fedora/#{self.pid}/#{self.dsid}")) {|m,a| m/a} 
+  end
 end
 end
 end

data/app/models/generic_aggregator.rb

@@ -49,4 +49,20 @@ class GenericAggregator < ::ActiveFedora::Base
     solr_doc
   end
 
+  def proxies
+    datastreams['structMetadata'] ? datastreams['structMetadata'].proxies : []
+  end
+  def update_index
+    super
+    if has_struct_metadata?()
+      conn = ActiveFedora::SolrService.instance.conn
+      # delete by query proxyIn_ssi: internal_uri
+      conn.delete_by_query("proxyIn_ssi:#{RSolr.escape(internal_uri())}")
+
+      # reindex proxies
+      proxy_docs = proxies().collect {|p| p.to_solr}
+      conn.add(proxy_docs, params: {softCommit: true})
+      conn.commit
+    end
+  end
 end

data/config/fedora.yml

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

data/config/locales/nnc.ntriples

@@ -0,0 +1,12 @@
+<info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#CorporateName> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasReciprocalAuthority> <http://id.loc.gov/vocabulary/organizations/nnc> . 
+<info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Authority> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "NNC"^^<http://id.loc.gov/datatypes/orgs/code> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "nnc"^^<http://id.loc.gov/datatypes/orgs/normalized> .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#authoritativeLabel> "Butler Library"@en .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasAbbreviationVariant> _:bnodereponncfacet .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasExpansionVariant> _:bnodereponncfull .
+_:bnodereponncfacet <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
+_:bnodereponncfacet <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library"@en .
+_:bnodereponncfull <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
+_:bnodereponncfull <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library, Columbia University"@en

data/config/predicate_mappings.yml

@@ -72,4 +72,4 @@
     :foaf_depicts: depicts
     :foaf_depiction: depiction
   http://www.w3.org/1999/02/22-rdf-syntax-ns#:
-    :rdf_type: type
+    :rdf_type: type

data/config/subs.yml

@@ -0,0 +1,12 @@
+development:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+test:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+production:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"