cul_scv_hydra 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTA1YzIzNjNjZWI5YjllODU5MGE3NzkwOGRlYjA5YWYyMDc4ZmU4NA==
+    YTI5YWY3ZWFjMWVhYjdjNjI4Mzc4MGRjYWNkNTg5MTk0MmNiZjY3Mg==
   data.tar.gz: !binary |-
-    ZjUyODhkNDIwMmI0ZjA2NTllMTRiNDgxYTAwZTAzNzdiYmY5OTgzMw==
+    YzU5YzY4YjY3OWFjYWM5NzllOWRiNDU2ZThiYTk0ZTgwMjg4ZWE4MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTcyNWQ0MmQ1YTgwZThhNTY0NDg5NzRhNGM0N2RiNjZlODBhNjA1MTRmZWM0
-    NjcxNmQ1MzI5ZDc0ZTc3MmY1MWVlYTBmYThkYzY1MTc5YjUwYzg2NDZhNWVm
-    NGRjNGVmNWVkYTUxMzU3OWZhMmI4OWIxY2VhN2MxNDkyNzViZGY=
+    YWU1Y2U2ZGQ5Zjg1ZDlhNmUxNzFmNDBjYTdhZjlmNDdjYjQ1MjhjYjc2YzVj
+    ZjBjYTcwMTY5NTViNTZiZTNhY2U3OTk1Yjc2YWFkODYxYTQyMzE4MjkwZDUz
+    YzBkNWM4ZTA4ZWNmNjk5NDA3M2YyY2JlNjNmNzNmZjk5NTYwNTM=
   data.tar.gz: !binary |-
-    NDI5Y2JmODlkYWJmZjNlMWM4M2Y1M2RmYzZiMTgwMWI1NDAyNTk3YTA4NDkz
-    MGUzMTI5Y2E2YTdmYTJmZDE0YTUxNjdlYTQ2OWFlYWQxMDRhNjE0NDU4ZDcx
-    Yjk1OTE5N2Y0Y2E2NmU4NjFmNGEyYzVlNzczMDdjNDUxZDRlNjM=
+    ZTI1ZjY5ZDRmYzM0MWVhZDQ5MmVmNWQwZDVlZWVjODJmNTVjZDBmMzA3ZWQ2
+    YTRhODNhYTI1Yjc5MmJkNGJmN2Y2OTBjOWM2NzRiM2FhODM1NzhjZjdkZTFi
+    ZmNlNzA2ZWM0NTFjODRjYWYwYWViMWRlNTRlZGE3NTM0ZGJjZjA=

data/app/models/bag_aggregator.rb

@@ -4,7 +4,6 @@ class BagAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/content_aggregator.rb

@@ -3,7 +3,6 @@ class ContentAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/dcdocument.rb

@@ -1,13 +1,13 @@
 require "active-fedora"
 class DcDocument < ActiveFedora::Base
+  include ::ActiveFedora::Associations
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   alias :file_objects :resources
   
-  has_relationship "parts", :cul_member_of, :inbound => true
+  has_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

@@ -3,7 +3,6 @@ class GenericAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/generic_object.rb

@@ -3,7 +3,6 @@ class GenericObject < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/generic_resource.rb

@@ -7,7 +7,6 @@ class GenericResource < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include ::ActiveFedora::RelsInt
@@ -34,8 +33,8 @@ class GenericResource < ::ActiveFedora::Base
 
   def to_solr(solr_doc = Hash.new, opts={})
     super
-    unless solr_doc["extent_s"] || self.datastreams["content"].nil?
-      solr_doc["extent_s"] = [self.datastreams["content"].size]
+    unless solr_doc["extent_ssi"] || self.datastreams["content"].nil?
+      solr_doc["extent_ssi"] = [self.datastreams["content"].size]
     end
     solr_doc
   end

data/app/models/jp2_image_aggregator.rb

@@ -3,7 +3,6 @@ class JP2ImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
@@ -25,13 +24,13 @@ class JP2ImageAggregator < ::ActiveFedora::Base
     source = self.datastreams["SOURCE"]
     source.profile
     if source.controlGroup == 'E'
-      solr_doc["rft_id"] = source.dsLocation
+      solr_doc["rft_id_ss"] = source.dsLocation
     else
       rc = ActiveFedora::RubydoraConnection.instance.connection
       url = rc.config["url"]
       uri = URI::parse(url)
       url = "#{uri.scheme}://#{uri.host}:#{uri.port}/fedora/objects/#{pid}/datastreams/SOURCE/content"
-      solr_doc["rft_id"] = url
+      solr_doc["rft_id_ss"] = url
     end
     solr_doc
   end

data/app/models/mets_structured_aggregator.rb

@@ -3,7 +3,6 @@ class METSStructuredAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/resource.rb

@@ -6,7 +6,6 @@ class Resource < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Resource
@@ -28,8 +27,8 @@ class Resource < ::ActiveFedora::Base
 
   def to_solr(solr_doc = Hash.new, opts={})
     super
-    unless solr_doc["extent_s"] || self.datastreams["CONTENT"].nil?
-      solr_doc["extent_s"] = [self.datastreams["CONTENT"].size]
+    unless solr_doc["extent_ssi"] || self.datastreams["CONTENT"].nil?
+      solr_doc["extent_ssi"] = [self.datastreams["CONTENT"].size]
     end
     solr_doc
   end

data/app/models/static_audio_aggregator.rb

@@ -3,7 +3,6 @@ class StaticAudioAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/app/models/static_image_aggregator.rb

@@ -3,7 +3,6 @@ class StaticImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
-  include ::ActiveFedora::Relationships
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator

data/config/fedora.yml

@@ -0,0 +1,19 @@
+development:
+  :url: http://127.0.0.1:8983/fedora
+  :user: fedoraAdmin
+  :password: fedoraAdmin
+#  :url: http://sayers.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:
+  :url: http://127.0.0.1:8983/fedora
+  :user: fedoraAdmin
+  :password: fedoraAdmin

data/config/predicate_mappings.yml

@@ -18,6 +18,8 @@
     :cul_has_member: hasMember
     :cul_member_of: memberOf
     :cul_metadata_for: metadataFor
+  http://creativecommons.org/ns#:
+    :cc_license: license
   info:fedora/fedora-system:def/relations-external#: 
     :conforms_to: conformsTo
     :has_annotation: hasAnnotation
@@ -45,23 +47,23 @@
   info:fedora/fedora-system:def/model#:
     :has_model: hasModel
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/:
-    :cul_image_width: imageWidth
-    :cul_image_length: imageLength
+    :image_width: imageWidth
+    :image_length: imageLength
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/ASSESSMENT/:
-    :cul_x_resolution: xSamplingFrequency
-    :cul_y_resolution: ySamplingFrequency
-    :cul_resolution_unit: samplingFrequencyUnit
+    :x_sampling: xSamplingFrequency
+    :y_sampling: ySamplingFrequency
+    :sampling_unit: samplingFrequencyUnit
   http://purl.org/dc/terms/:
     :extent: extent
     :format: format
     :format_of: isFormatOf
   http://www.w3.org/2003/12/exif/ns#:
-    :image_width: imageWidth
-    :image_length: imageLength
+    :exif_image_width: imageWidth
+    :exif_image_length: imageLength
     :x_resolution: xResolution
     :y_resolution: yResolution
-    :resolution_unti: resolutionUnit
+    :resolution_unit: resolutionUnit
   http://xmlns.com/foaf/0.1/:
     :foaf_thumbnail: thumbnail
   http://www.w3.org/1999/02/22-rdf-syntax-ns#:
-    :rdf_type: type
+    :rdf_type: type

data/config/solr_value_maps.yml

@@ -20,8 +20,8 @@
   'NNC-RB' : 'Rare Book and Manuscript Library'
   'NyNyCBL' : 'Burke Library at Union Theological Seminary'
   'NyNyCOH' : 'Columbia Center for Oral History Collections'
-:project_facet :
-  'Customer Order Collection' : 'Pres Orders'
+:project_to_facet :
+  'Customer Order Collection' : 'PRD Orders'
   "Children's Drawings of the Spanish Civil War (online exhibition)" : 'Spanish Civil War'
   "Jewels in her crown: treasures of Columbia University Libraries special collections" : 'Jewels in her Crown'
   "Russian Imperial Corps of Pages" : 'Russian Corps of Pages'

data/lib/cul_scv_hydra/active_fedora/model/aggregator.rb

@@ -3,7 +3,7 @@ module Aggregator
   extend ActiveSupport::Concern
 
   included do
-    has_many :parts, :property => :cul_member_of
+    has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
     after_create :aggregator!
   end
 
@@ -21,7 +21,7 @@ module Aggregator
       container = "info:fedora/#{container}"
     end
     member.add_relationship(:cul_member_of, container)
-    member.datastreams["RELS-EXT"].dirty = true
+    member.datastreams["RELS-EXT"].content_will_change!
     member.save
   end
 
@@ -37,7 +37,7 @@ module Aggregator
     rel.object = container
     rel.predicate = :cul_member_of
     member.remove_relationship(rel)
-    member.datastreams["RELS-EXT"].dirty = true
+    member.datastreams["RELS-EXT"].content_will_change!
     member.save
   end
 end

data/lib/cul_scv_hydra/active_fedora/model/common.rb

@@ -1,4 +1,4 @@
-require "active-fedora"
+require 'active-fedora'
 require 'uri'
 module Cul::Scv::Hydra::ActiveFedora::Model
 module Common
@@ -7,7 +7,7 @@ module Common
   included do
     define_model_callbacks :create
 
-    has_and_belongs_to_many :containers, :property=>:cul_member_of
+    has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
     has_metadata :name => "DC", :type=>Cul::Scv::Hydra::Om::DCMetadata, :versionable => true
     has_metadata :name => "descMetadata", :type=>Cul::Scv::Hydra::Om::ModsDocument, :versionable => true
     has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
@@ -16,7 +16,7 @@ module Common
     
   module ClassMethods
     def pid_namespace
-      "ldpd"
+      'ldpd'
     end
   end
 
@@ -59,7 +59,7 @@ module Common
           #  end
           #end
    else
-      logger.warn "parts not defined; was this an Aggregator?"
+      logger.warn 'parts not defined; was this an Aggregator?'
       []
     end
   end
@@ -133,31 +133,39 @@ module Common
   def to_solr(solr_doc = Hash.new, opts={})
     super
     if has_desc?
-      solr_doc["descriptor_s"] = ["mods"]
+      solr_doc["descriptor_ssi"] = ["mods"]
     else
-      solr_doc["descriptor_s"] = ["dublin core"]
+      solr_doc["descriptor_ssi"] = ["dublin core"]
     end
     # if no mods, pull some values from DC
-    if (solr_doc["title_display"].nil? or solr_doc["title_display"].length == 0)
+    if (solr_doc["title_ssm"].nil? or solr_doc["title_ssm"].length == 0)
       if self.dc.term_values(:dc_title).first
-        solr_doc["title_display"] = [self.dc.term_values(:dc_title).first]
+        solr_doc["title_ssm"] = [self.dc.term_values(:dc_title).first]
       else
-        solr_doc["title_display"] = [self.dc.term_values(:dc_identifier).first]
+        solr_doc["title_ssm"] = [self.dc.term_values(:dc_identifier).first]
       end
       if self.dc.term_values(:dc_relation).first
         self.dc.term_values(:dc_relation).each {|val|
           if val =~ /clio:/
-            solr_doc["clio_s"] ||= []
-            solr_doc["clio_s"] << val.split(':')[-1]
+            solr_doc["clio_ssim"] ||= []
+            solr_doc["clio_ssim"] << val.split(':')[-1]
           end
         }
       end
     end
-    if (solr_doc["title_display"].length > 1)
-      solr_doc["title_display"].uniq!
+    if (solr_doc["title_ssm"].length > 1)
+      solr_doc["title_ssm"].uniq!
     end
-    solr_doc["format"] = [self.route_as]
-    solr_doc["index_type_label_s"] = [self.index_type_label]
+    solr_doc["format_ssi"] = [self.route_as]
+    solr_doc["index_type_label_ssi"] = [self.index_type_label]
+    
+    solr_doc.each_pair {|key, value|
+      if value.is_a? Array
+        value.each {|v| v.strip! unless v.nil? }
+      elsif value.is_a? String
+        value.strip!
+      end
+    }
     solr_doc
   end
   

data/lib/cul_scv_hydra/active_fedora/model/resource.rb

@@ -63,6 +63,7 @@ module Resource
           end
           subject = RDF::URI(internal_uri)
           predicate = RDF::URI("#{node.namespace.href}#{node.name}")
+          puts "Adding a resource predicate : #{predicate}"
           query = RDF::Query.new({ :subject => {predicate => :object}})
           relationships(predicate).dup.each { |stmt|
             relationships.delete(stmt)

data/lib/cul_scv_hydra/om/dc_metadata.rb

@@ -3,54 +3,80 @@ module Cul
 module Scv
 module Hydra
 module Om
-  class DCMetadata < ::ActiveFedora::NokogiriDatastream
-    include OM::XML::Document
+  class DCMetadata < ::ActiveFedora::OmDatastream
+
     after_save :action_after_save
     set_terminology do |t|
       t.root(:path=>"dc", :namespace_prefix=>"oai_dc",
              "xmlns:oai_dc"=>"http://www.openarchives.org/OAI/2.0/oai_dc/",
              "xmlns:dc"=>"http://purl.org/dc/elements/1.1/",
              :schema=>"http://www.openarchives.org/OAI/2.0/oai_dc.xsd")
-      t.dc_contributor(:path=>"contributor", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_coverage(:path=>"coverage", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_creator(:path=>"creator", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_date(:path=>"date", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_description(:path=>"description", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_format(:path=>"format", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_identifier(:path=>"identifier", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_language(:path=>"language", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_publisher(:path=>"publisher", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_relation(:path=>"relation", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_rights(:path=>"rights", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_source(:path=>"source", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_subject(:path=>"subject", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_title(:path=>"title", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
-      t.dc_type(:path=>"type", :namespace_prefix=>"dc", :index_as=>[:displayable, :searchable])
+      t.dc_contributor(:path=>"contributor", 
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_coverage(:path=>"coverage",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_creator(:path=>"creator",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_date(:path=>"date",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_description(:path=>"description",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_format(:path=>"format",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_identifier(:path=>"identifier",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_language(:path=>"language",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_publisher(:path=>"publisher",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_relation(:path=>"relation",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_rights(:path=>"rights",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_source(:path=>"source",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_subject(:path=>"subject",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_title(:path=>"title",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
+      t.dc_type(:path=>"type",
+        :namespace_prefix=>"dc",
+        :index_as=>[:displayable, :searchable])
     end
   
     def self.xml_template
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.dc(
-           "xmlns:oai_dc"=>"http://www.openarchives.org/OAI/2.0/oai_dc/",
-           "xmlns:dc"=>"http://purl.org/dc/elements/1.1/",
-           "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance"){
-          xml.parent.namespace_definitions.each {|ns|
-            xml.parent.namespace = ns if ns.prefix == 'oai_dc'
-          }
-        }
-      end
-      builder.doc.encoding = 'UTF-8'
-      builder.doc.root["xsi:schemaLocation"] = 'http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd'
-      return builder.doc
+
+      Nokogiri::XML::Document.parse(<<-src
+<oai_dc:dc
+      xmlns:oai_dc='http://www.openarchives.org/OAI/2.0/oai_dc/'
+      xmlns:dc='http://purl.org/dc/elements/1.1/'
+      xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+      xsi:schemaLocation='http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd'></oai_dc:dc>
+src
+)
     end
     # Because FCRepo 3.5+ modifies DC on saves (to ensure that PID is a dc:identifier value),
     # this datastream's content must be reloaded after saves
     def action_after_save
-      self.dirty= false
       @content = nil
       @ng_xml = nil
-      self.xml_loaded = false
+      remove_instance_variable(:@ng_xml)
     end
+
     def method_missing method, *args
       query = false
       _mname = method.id2name

data/lib/cul_scv_hydra/om/scv_mods_document.rb

@@ -5,90 +5,102 @@ module Cul
 module Scv
 module Hydra
 module Om
-  class ModsDocument < ::ActiveFedora::NokogiriDatastream
-    include OM::XML::Document
+  class ModsDocument < ::ActiveFedora::OmDatastream
+    include ::OM::XML::TerminologyBasedSolrizer
     include Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer
 
-    after_save :action_after_save
-
     set_terminology do |t|
       t.root(:path=>"mods",
              :xmlns=>"http://www.loc.gov/mods/v3",
-             :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-4.xsd")
-             
-      t.main_title_info(:path=>'titleInfo', :index_as=>[:not_searchable], :attributes=>{:type=>:none}){
-        t.main_title(:path=>"title", :index_as=>[:not_searchable])
+             :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-4.xsd") {
+      }
+
+      t.main_title_info(:path=>'titleInfo', :index_as=>[], :attributes=>{:type=>:none}){
+        t.main_title(:path=>"title", :index_as=>[])
       }
-      t.title(:proxy=>[:mods, :main_title_info, :main_title], :index_as=>[:displayable, :searchable, :sortable])
       
-      t.search_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){
+      t.title(:proxy=>[:mods, :main_title_info, :main_title],
+       :index_as=>[:displayable, :searchable, :sortable, :textable])
+
+      t.search_title_info(:path=>'titleInfo', :index_as=>[]){
         t.search_title(:path=>'title', :index_as=>[:searchable])
       }
-      t.project(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Project"}, :index_as=>[:not_searchable]){
-        t.project_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){
-          t.lib_project(:path=>'title',:index_as=>[:displayable, :searchable])
-          t.lib_project_facet(:path=>'title', :index_as=>[:facetable, :not_searchable],:variant_of=>{:field_base=>'lib_project',:map=>:project_facet})
+      t.project(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Project"}, :index_as=>[]){
+        t.project_title_info(:path=>'titleInfo', :index_as=>[]){
+          t.lib_project(:path=>'title',:index_as=>[])
         }
       }
-      t.collection(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Collection"}, :index_as=>[:not_searchable]){
-        t.collection_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){
+      t.collection(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Collection"}, :index_as=>[]){
+        t.collection_title_info(:path=>'titleInfo', :index_as=>[]){
           t.lib_collection(:path=>'title', :index_as=>[:facetable, :displayable])
         }
       }
-      t.lib_project(:proxy=>[:project,:project_title_info, :lib_project])
+      t.lib_project(:proxy=>[:project,:project_title_info, :lib_project],
+        :index_as=>[:displayable, :searchable, :project_facetable, :textable])
       t.lib_collection(:proxy=>[:collection,:collection_title_info, :lib_collection])
 # pattern matches
-      t.identifier(:path=>"identifier", :attributes=>{:type=>"local"}, :data_type=>:symbol)
-      t.identifier_text(:ref=>:identifier, :index_as=>[:not_searchable, :textable])
+      t.identifier(:path=>"identifier", :attributes=>{:type=>"local"}, :index_as=>[:symbol, :textable])
       t.clio(:path=>"identifier", :attributes=>{:type=>"CLIO"}, :data_type=>:symbol, :index_as=>[:searchable, :displayable])
       t.abstract
       t.subject {
         t.topic
       }
-      t.type_of_resource(:path=>"typeOfResource", :index_as=>[:not_searchable,:displayable])
-      t.physical_description(:path=>"physicalDescription", :index_as=>[:not_searchable]){
-        t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:not_searchable,:displayable])
-        t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:not_searchable,:displayable])
-        t.form(:attributes=>{:authority=>:none}, :index_as=>[:not_searchable,:displayable])
-        t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[:not_searchable, :displayable, :facetable])
+      t.type_of_resource(:path=>"typeOfResource", :index_as=>[:displayable])
+      t.physical_description(:path=>"physicalDescription", :index_as=>[]){
+        t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:displayable])
+        t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable])
+        t.form(:attributes=>{:authority=>:none}, :index_as=>[:displayable])
+        t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[])
         t.extent(:path=>"extent", :index_as=>[:searchable, :displayable])
-        t.reformatting_quality(:path=>"reformattingQuality", :index_as=>[:not_searchable,:displayable])
-        t.internet_media_type(:path=>"internetMediaType", :index_as=>[:not_searchable,:displayable])
-        t.digital_origin(:path=>"digitalOrigin", :index_as=>[:not_searchable,:displayable])
+        t.reformatting_quality(:path=>"reformattingQuality", :index_as=>[:displayable])
+        t.internet_media_type(:path=>"internetMediaType", :index_as=>[:displayable])
+        t.digital_origin(:path=>"digitalOrigin", :index_as=>[:displayable])
       }
-      t.lib_format(:proxy=>[:physical_description, :form_nomarc])
-      t.location(:path=>"location", :index_as=>[:not_searchable]){
-        t.repo_text(:path=>"physicalLocation",:attributes=>{:authority=>:none},  :index_as=>[:not_searchable])
-        t.repo_code(:path=>"physicalLocation",:attributes=>{:authority=>"marcorg"}, :index_as=>[:not_searchable])
-        t.map_facet(:path=>"physicalLocation",:attributes=>{:authority=>"marcorg"}, :index_as=>[:facetable], :variant_of=>{:field_base=>'lib_repo',:map=>:marc_to_facet})
-        t.map_display(:path=>"physicalLocation",:attributes=>{:authority=>"marcorg"}, :index_as=>[:displayable, :not_searchable], :variant_of=>{:field_base=>'lib_repo',:map=>:marc_to_display})
-        t.shelf_locator(:path=>"shelfLocator", :index_as=>[:not_searchable, :textable])
+      t.lib_format(:proxy=>[:physical_description, :form_nomarc], :index_as=>[:displayable, :facetable])
+      t.location(:path=>"location", :index_as=>[]){
+        t.repo_text(:path=>"physicalLocation",:attributes=>{:authority=>:none},  :index_as=>[])
+        t.lib_repo(:path=>"physicalLocation",
+          :attributes=>{:authority=>"marcorg"},
+          :index_as=>[])
+        t.shelf_locator(:path=>"shelfLocator", :index_as=>[:textable])
       }
-      t.name_personal(:path=>'name',:attributes=>{:type=>'personal'}, :index_as=>[:not_searchable]){
-        t.name_part(:path=>'namePart', :index_as=>[:facetable, :displayable, :searchable], :variant_of=>{:field_base=>:lib_name})
+      t.lib_repo(:proxy=>[:location, :lib_repo],
+       :index_as=>[:marc_code_facetable, :marc_code_displayable,
+        :marc_code_textable])
+      t.lib_name(
+        :path=>'name',:attributes=>{:type=>'personal'},
+        :index_as=>[:facetable, :displayable, :searchable, :textable]){
+        t.name_part(:path=>'namePart', :index_as=>[])
       }
-      t.name_corporate(:path=>'name',:attributes=>{:type=>'corporate'}, :index_as=>[:not_searchable]){
-        t.name_part(:path=>'namePart', :index_as=>[:facetable, :displayable, :searchable], :variant_of=>{:field_base=>:lib_name})
+      t.name_corporate(
+        :path=>'name',:attributes=>{:type=>'corporate'}, 
+        :index_as=>[:facetable, :displayable, :searchable],
+        :variant_of=>{:field_base=>:lib_name}){
+        t.name_part(
+          :path=>'namePart',
+          :index_as=>[])
       }
-      t.note(:path=>"note", :index_as=>[:not_searchable, :textable])
-      t.access_condition(:path=>"accessCondition", :attributes=>{:type=>"useAndReproduction"}, :index_as => [:searchable], :data_type => :symbol)
-      t.record_info(:path=>"recordInfo", :index_as=>[:not_searchable]) {
-        t.record_creation_date(:path=>"recordCreationDate",:attributes=>{:encoding=>"w3cdtf"}, :index_as=>[:not_searchable])
-        t.record_content_source(:path=>"recordContentSource",:attributes=>{:authority=>"marcorg"}, :index_as=>[:not_searchable])
-        t.language_of_cataloging(:path=>"languageOfCataloging", :index_as=>[:not_searchable]){
-          t.language_term(:path=>"languageTerm", :index_as=>[:not_searchable], :attributes=>{:type=>:none})
-          t.language_code(:path=>"languageTerm",:attributes=>{:type=>'code',:authority=>"iso639-2b"}, :index_as=>[:not_searchable])
+      t.note(:path=>"note", :index_as=>[:textable])
+      t.access_condition(:path=>"accessCondition",
+       :attributes=>{:type=>"useAndReproduction"},
+       :index_as => [:searchable, :symbol])
+      t.record_info(:path=>"recordInfo", :index_as=>[]) {
+        t.record_creation_date(:path=>"recordCreationDate",:attributes=>{:encoding=>"w3cdtf"}, :index_as=>[])
+        t.record_content_source(:path=>"recordContentSource",:attributes=>{:authority=>"marcorg"}, :index_as=>[])
+        t.language_of_cataloging(:path=>"languageOfCataloging", :index_as=>[]){
+          t.language_term(:path=>"languageTerm", :index_as=>[], :attributes=>{:type=>:none})
+          t.language_code(:path=>"languageTerm",:attributes=>{:type=>'code',:authority=>"iso639-2b"}, :index_as=>[])
         }
-        t.record_origin(:path=>"recordOrigin", :index_as=>[:not_searchable])
+        t.record_origin(:path=>"recordOrigin", :index_as=>[])
       }
       t.language_term(:proxy=>[:record_info, :language_of_cataloging, :language_term])
       t.language_code(:proxy=>[:record_info, :language_of_cataloging, :language_code])
 
-      t.origin_info(:path=>"originInfo", :index_as=>[:not_searchable]){
-        t.date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf'}, :index_as=>[:not_searchable])
-        t.key_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes'}, :index_as=>[:not_searchable])
-        t.start_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes',:point=>'start'}, :index_as=>[:not_searchable])
-        t.end_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:point=>'end'}, :index_as=>[:not_searchable])
+      t.origin_info(:path=>"originInfo", :index_as=>[]){
+        t.date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf'}, :index_as=>[])
+        t.key_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes'}, :index_as=>[])
+        t.start_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes',:point=>'start'}, :index_as=>[])
+        t.end_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:point=>'end'}, :index_as=>[])
       }
     end
   
@@ -105,9 +117,7 @@ module Om
       builder.doc.root["xsi:schemaLocation"] = 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd'
       return builder.doc
     end
-    def action_after_save
-      self.dirty= false
-    end
+
     def method_missing method, *args
       query = false
       _mname = method.id2name

data/lib/cul_scv_hydra/om/standard_mods.rb

@@ -5,9 +5,7 @@ module Cul
 module Scv
 module Hydra
 module Om
-  class StandardMods
-    include OM::XML::Document
-    include ::Solrizer::XML::TerminologyBasedSolrizer
+  class StandardMods < ::ActiveFedora::OmDatastream
   
     set_terminology do |t|
       t.root(:path=>"mods",

data/lib/cul_scv_hydra/solrizer/field_mapper.rb

@@ -1,30 +1,94 @@
 require 'solrizer'
-module Cul::Scv::Hydra::Solrizer
-class FieldMapper < ::Solrizer::FieldMapper::Default
-  alias_method(:orig_solr_name_and_mappings, :solr_name_and_mappings)
+module Solrizer::DefaultDescriptors
+  def self.textable
+    @textable_type ||= TextableDescriptor.new(:text, :indexed, :multivalued)
+  end
+
+  def self.project_facetable
+    @project_facet_type ||= ProjectFacetDescriptor.new(:string, :indexed, :multivalued)
+  end
+
+  def self.marc_code_facetable
+    @marc_code_facet_type ||= MarcCodeFacetDescriptor.new(:string, :indexed, :multivalued)
+  end
+
+  def self.marc_code_displayable
+    @marc_code_type ||= MarcCodeDisplayDescriptor.new(:string, :stored, :indexed, :multivalued)
+  end
 
-  def self.default
-    if defined?(Rails.root) && !Rails.root.nil?
-      config_path = File.join(Rails.root, "config", "solr_mappings.yml")
+  def self.marc_code_textable
+    @marc_code_map_text_type ||= MarcCodeTextableDescriptor.new(:text, :indexed, :multivalued)
+  end
+
+  def self.load_value_maps(config_path=nil)
+    if config_path.nil?
+      if defined?(Rails.root) && !Rails.root.nil?
+        config_path = File.join(Rails.root, "config", "solr_value_maps.yml")
+      end
+      # Default to using the config file within the gem
+      if !File.exist?(config_path.to_s)
+        logger.warn("ValueMapper: no field value maps at #{config_path}")
+        config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr_value_maps.yml")
+      end
+      if !File.exist?(config_path.to_s)
+        logger.warn("ValueMapper: no field value maps at #{File.expand_path(config_path)}")
+        return {}
+      end
     end
-    # Default to using the config file within the gem 
-    if !File.exist?(config_path.to_s)
-      config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr_mappings.yml")
+    logger.info("ValueMapper: loading field value maps from #{File.expand_path(config_path)}")
+    YAML::load(File.open(config_path))
+  end
+
+  def self.value_maps
+    @@value_maps ||= load_value_maps
+  end
+
+
+  class TextableDescriptor < Solrizer::Descriptor 
+    def name_and_converter(field_name, field_type)
+      ['all_text_timv']
+    end
+  end
+
+  class ProjectFacetDescriptor < Solrizer::Descriptor
+    def converter(field_type)
+      map = Solrizer::DefaultDescriptors.value_maps[:project_to_facet] || {}
+      lambda {|value| (map.has_key? value) ? map[value] : value}
+    end 
+  end
+
+  class MarcCodeFacetDescriptor < Solrizer::Descriptor
+    def converter(field_type)
+      map = Solrizer::DefaultDescriptors.value_maps[:marc_to_facet] || {}
+      lambda {|value| (map.has_key? value) ? map[value] : value}
+    end 
+  end
+
+  class MarcCodeDisplayDescriptor < Solrizer::Descriptor
+    def converter(field_type)
+      map = Solrizer::DefaultDescriptors.value_maps[:marc_to_display] || {}
+      lambda {|value| (map.has_key? value) ? map[value] : value}
+    end 
+  end
+
+  class MarcCodeTextableDescriptor < Solrizer::Descriptor
+    def name_and_converter(field_name, field_type)
+      ['all_text_timv', converter(field_type)]
+    end
+    def converter(field_type)
+      fmap = Solrizer::DefaultDescriptors.value_maps[:marc_to_facet] || {}
+      dmap = Solrizer::DefaultDescriptors.value_maps[:marc_to_display] || {}
+      lambda do |value|
+        r = (fmap.has_key? value) ? [fmap[value]] : []
+        r << dmap[value] if (dmap.has_key? value)
+        r.join(' ')
+      end
     end
-    self.load_mappings(config_path)
-    logger.info("FieldMapper: loading field name mappings from #{File.expand_path(config_path)}")
-    self.new
-  end
-
-# This is an override of a private method in the base class, and will have to be monitored for changes
-  def solr_name_and_mappings(field_name, field_type, index_type)
-    if index_type == :textable
-      result = orig_solr_name_and_mappings(field_name, field_type, :searchable)
-      result[0]  = 'text'
-      return result
-    else
-      orig_solr_name_and_mappings(field_name, field_type, index_type)
+  end
+  class MarcCodeDisplayTextableDescriptor < MarcCodeDisplayDescriptor
+    def name_and_converter(field_name, field_type)
+      puts "MarcCodeDisplayTextableDescriptor"
+      ['all_text_timv', converter(field_type)]
     end
   end
-end
-end
+end

data/lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb

@@ -1,108 +1,48 @@
 require 'om'
 module Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer
 # copied from Solrizer::XML::TerminologyBasedSolrizer
-  def self.default_field_mapper
-    @@default_field_mapper ||= Cul::Scv::Hydra::Solrizer::FieldMapper.default
-  end
 
-  def self.default_value_mapper
-    @@value_mapper ||= Cul::Scv::Hydra::Solrizer::ValueMapper.new
+  def self.included(klass)
+    klass.send(:extend, ClassMethods)
   end
-
   
   # Module Methods
-  
-  # Build a solr document from +doc+ based on its terminology
-  # @param [OM::XML::Document] doc  
-  # @param [Hash] (optional) solr_doc (values hash) to populate
-  def self.solrize(doc, solr_doc=Hash.new, field_mapper = nil)
-    unless doc.class.terminology.nil?
-      doc.class.terminology.terms.each_pair do |term_name,term|
-        doc.solrize_term(term, solr_doc, field_mapper)
-        # self.solrize_by_term(accessor_name, accessor_info, :solr_doc=>solr_doc)
-      end
-    end
-
-    return solr_doc
-  end
-  
-  # Populate a solr document with fields based on nodes in +xml+ corresponding to the 
-  # term identified by +term_pointer+ within +terminology+
-  # @param [OM::XML::Document] doc xml document to extract values from
-  # @param [OM::XML::Term] term corresponding to desired xml values
-  # @param [Hash] (optional) solr_doc (values hash) to populate
-  # @param [Solrizer::FieldMapper] (optional) object that maps a term and its index options to solr field names
-  def self.solrize_term(doc, term, solr_doc = Hash.new, field_mapper = nil, opts={})
-    terminology = doc.class.terminology
-    parents = opts.fetch(:parents, [])
-
-    term_pointer = parents+[term.name]
-    nodeset = doc.find_by_terms(*term_pointer)
-    nodeset.each do |node|
-      # create solr fields
       
-      doc.solrize_node(node, term_pointer, term, solr_doc, field_mapper)
-      unless term.kind_of? OM::XML::NamedTermProxy
-        term.children.each_pair do |child_term_name, child_term|
-          doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node)}]})
+  module ClassMethods
+    # Build a solr document from +doc+ based on its terminology
+    # @param [OM::XML::Document] doc  
+    # @param [Hash] solr_doc (optional) solr_doc (values hash) to populate
+    def solrize(doc, solr_doc=Hash.new, field_mapper = nil)
+      unless doc.class.terminology.nil?
+        doc.class.terminology.terms.each_pair do |term_name,term|
+          doc.solrize_term(term, solr_doc, field_mapper) unless term.is_root_term?
         end
       end
+
+      return solr_doc
     end
-    solr_doc
-  end
-  
   # Populate a solr document with solr fields corresponding to the given xml node
   # Field names are generated using settings from the term in the +doc+'s terminology corresponding to +term_pointer+
   # @param [Nokogiri::XML::Node] node to solrize
   # @param [OM::XML::Document] doc document the node came from
   # @param [Array] term_pointer Array pointing to the term that should be used for solrization settings
   # @param [Hash] (optional) solr_doc (values hash) to populate
-  def self.solrize_node(node, doc, term_pointer, term, solr_doc = Hash.new, field_mapper = nil, opts = {})
-    terminology = doc.class.terminology
-    # term = terminology.retrieve_term(*term_pointer)
-    if term.path.kind_of?(Hash) && term.path.has_key?(:attribute)
-      node_value = node.value
-    else
-      node_value = node.text
-    end
-    generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
-    
-    self.insert_field_value(solr_doc, term, generic_field_name_base, node_value, field_mapper)
-    
-    if term_pointer.length > 1
-      hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
-      self.insert_field_value(solr_doc, term, hierarchical_field_name_base, node_value, field_mapper)
-    end
-    if term.variant_of and term.variant_of[:field_base]
-      self.insert_field_value(solr_doc, term, term.variant_of[:field_base], node_value, field_mapper, true)
+    def solrize_node(node_value, doc, term_pointer, term, solr_doc = Hash.new, field_mapper = nil, opts = {})
+      return solr_doc unless term.index_as && !term.index_as.empty?
+      generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
+      create_and_insert_terms(generic_field_name_base, node_value, term.index_as, solr_doc)
+      
+      if term_pointer.length > 1
+        #hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
+        #create_and_insert_terms(hierarchical_field_name_base, node_value, term.index_as, solr_doc)
+      end
+      if term.variant_of and term.variant_of[:field_base]
+        #create_and_insert_terms(term.variant_of[:field_base], node_value, term.index_as, solr_doc)
+        create_and_insert_terms(term.variant_of[:field_base], node_value, term.index_as, solr_doc)
+      end
+      solr_doc
     end
-    solr_doc
-  end
 
-  def self.insert_field_value(solr_doc, term, field_base_name, field_value, field_mapper=nil , unique=false)
-    field_mapper = self.default_field_mapper if field_mapper.nil?
-    field_mapper.solr_names_and_values(field_base_name, field_value, term.type, term.index_as).each { |field_name, field_value|
-        unless field_value.join("").strip.empty?
-          if term.variant_of and term.variant_of[:map]
-            field_value = default_value_mapper.solr_value(term.variant_of[:map], field_value)
-          end
-          Cul::Scv::Hydra::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value, (unique || (field_name == 'text')))
-        end
-    }
-  end
-# Instance Methods
-  
-  attr_accessor :field_mapper
-  
-  def to_solr(solr_doc = Hash.new, field_mapper = self.field_mapper) # :nodoc:
-    ::Solrizer::XML::TerminologyBasedSolrizer.solrize(self, solr_doc, field_mapper)
-  end
-  
-  def solrize_term(term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer.solrize_term(self, term, solr_doc, field_mapper, opts)    
   end
 
-  def solrize_node(node, term_pointer, term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, term, solr_doc, field_mapper, opts)
-  end
 end # module

data/lib/cul_scv_hydra/solrizer/value_mapper.rb

@@ -1,7 +1,7 @@
 module Cul::Scv::Hydra::Solrizer
 # This class uses a yaml map to translate field values for solr
 class ValueMapper
-def self.load_value_maps(config_path=nil)
+  def self.load_value_maps(config_path=nil)
     if config_path.nil?
       if defined?(Rails.root) && !Rails.root.nil?
         config_path = File.join(Rails.root, "config", "solr_value_maps.yml")

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.7.0'
+        VERSION = '0.8.0'
         def self.version
           VERSION
         end

data/lib/tasks/cmodel.rake

@@ -47,11 +47,21 @@ def content_for(pid)
 end
 
 def load_content(content, pid)
-  connection.ingest(:file=>StringIO.new(content), :pid=>pid)
+  begin
+    connection.ingest(:file=>StringIO.new(content), :pid=>pid)
+  rescue Exception => e 
+    puts "possible problem with ingest of #{pid}: #{e.message}"
+    raise e
+  end
 end
 
 def purge(pid)
-  connection.purge_object :pid=>pid
+  begin
+    connection.purge_object :pid=>pid
+  rescue Exception => e 
+    puts "possible problem with purge of #{pid}: #{e.message}"
+  end
+
 end
 
 def reload(pid)
@@ -86,6 +96,7 @@ namespace :cul_scv_hydra do
     task :reload_all => :environment do
       pattern = ENV["PATTERN"]
       pattern = Regexp.compile(pattern) if pattern
+      reload("ldpd:nullbind")
       each_cmodel do |pid|
         unless (pattern and not pid =~ pattern)
           puts "reloading #{pid}"

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.2.2
 - !ruby/object:Gem::Dependency
   name: active_fedora_finders
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +100,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +261,7 @@ files:
 - app/models/resource.rb
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
+- config/fedora.yml
 - config/predicate_mappings.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
@@ -298,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer