cul_scv_hydra 0.3.0 → 0.4.0

data/config/fedora.yml

@@ -1,6 +1,12 @@
 development:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  :url: http://127.0.0.1:8983/fedora
+  :user: fedoraAdmin
+  :password: fedoraAdmin
 test:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  :url: http://127.0.0.1:8983/fedora
+  :user: fedoraAdmin
+  :password: fedoraAdmin
 default:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  :url: http://127.0.0.1:8983/fedora
+  :user: fedoraAdmin
+  :password: fedoraAdmin

data/config/solr.yml

@@ -1,15 +1,6 @@
 development:
-  default:
-    url: http://127.0.0.1:8983/solr/development
-  full_text:
-    url: http://127.0.0.1:8983/solr/development
+  url: http://127.0.0.1:8983/solr/development
 test:
-  default:
-    url: http://127.0.0.1:8983/solr/test
-  full_text:
-    url: http://127.0.0.1:8983/solr/test
+  url: http://127.0.0.1:8983/solr/test
 default:
-  default:
-    url: http://127.0.0.1:8983/solr/test
-  full_text:
-    url: http://127.0.0.1:8983/solr/test
+  url: http://127.0.0.1:8983/solr/test

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

@@ -6,40 +6,39 @@ module Aggregator
     has_relationship "parts", :cul_member_of, :inbound => true
     after_create :aggregator!
   end
-  module InstanceMethods
-    def aggregator!
-      add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::AGGREGATOR_TYPE.to_s)
-      @metadata_is_dirty = true
-      update
-    end
 
-    def add_member(member, container=self)
-      if container.respond_to?:internal_uri
-        container = container.internal_uri
-      end
-      if container =~ /\A[\w\-]+:[\w\-]+\Z/
-        container = "info:fedora/#{container}"
-      end
-      member.add_relationship(:cul_member_of, container)
-      member.datastreams["RELS-EXT"].dirty = true
-      member.save
+  def aggregator!
+    add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::AGGREGATOR_TYPE.to_s)
+    @metadata_is_dirty = true
+    update
+  end
+
+  def add_member(member, container=self)
+    if container.respond_to?:internal_uri
+      container = container.internal_uri
     end
+    if container =~ /\A[\w\-]+:[\w\-]+\Z/
+      container = "info:fedora/#{container}"
+    end
+    member.add_relationship(:cul_member_of, container)
+    member.datastreams["RELS-EXT"].dirty = true
+    member.save
+  end
 
-    def remove_member(member, container=self)
-      if container.respond_to?:internal_uri
-        container = container.internal_uri
-      end
-      if container =~ /\A[\w\-]+:[\w\-]+\Z/
-        container = "info:fedora/#{container}"
-      end
-      rel = ActiveFedora::Relationship.new()
-      rel.subject_pid= :self
-      rel.object = container
-      rel.predicate = :cul_member_of
-      member.remove_relationship(rel)
-      member.datastreams["RELS-EXT"].dirty = true
-      member.save
+  def remove_member(member, container=self)
+    if container.respond_to?:internal_uri
+      container = container.internal_uri
+    end
+    if container =~ /\A[\w\-]+:[\w\-]+\Z/
+      container = "info:fedora/#{container}"
     end
+    rel = ActiveFedora::Relationship.new()
+    rel.subject_pid= :self
+    rel.object = container
+    rel.predicate = :cul_member_of
+    member.remove_relationship(rel)
+    member.datastreams["RELS-EXT"].dirty = true
+    member.save
   end
 end
 end

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

@@ -1,42 +1,41 @@
 require "active-fedora"
 require 'uri'
 module Cul::Scv::Hydra::ActiveFedora::Model
-  module Common
-    extend ActiveSupport::Concern
+module Common
+  extend ActiveSupport::Concern
     
-    included do
-      define_model_callbacks :create
+  included do
+    define_model_callbacks :create
 
-      has_relationship "containers", :cul_member_of
-      has_relationship "rdf_type", :rdf_type
-      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::RightsMetadata, :versionable => true
-    end
+    has_relationship "containers", :cul_member_of
+    has_relationship "rdf_type", :rdf_type
+    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::RightsMetadata, :versionable => true
+  end
     
-    module ClassMethods
-      def pid_namespace
-        "ldpd"
-      end
-    end  
+  module ClassMethods
+    def pid_namespace
+      "ldpd"
+    end
+  end  
     
-    module InstanceMethods
-      def initialize(attrs = nil)
-        attrs = {} if attrs.nil?
-        attrs[:namespace] = self.class.pid_namespace unless attrs[:namespace]
-        super
-      end
+  def initialize(attrs = nil)
+    attrs = {} if attrs.nil?
+    attrs[:namespace] = self.class.pid_namespace unless attrs[:namespace]
+    super
+  end
     
-      def create
-        run_callbacks :create do
-          super
-        end
-      end
+  def create
+    run_callbacks :create do
+      super
+    end
+  end
 
-      def resources(opts={})
-        if self.respond_to? :parts # aggregator
-          opts = {:rows=>25,:response_format=>:solr}.merge(opts)
-          self.parts(opts)
+  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])
@@ -55,167 +54,166 @@ module Cul::Scv::Hydra::ActiveFedora::Model
           #    return ::ActiveFedora::SolrService.reify_solr_results(solr_result)
           #  end
           #end
-       else
-          logger.warn "parts not defined; was this an Aggregator?"
-          []
-        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 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]
-      end
+  def cmodel_pid(klass)
+    klass.pid_namespace + ":" + klass.name.split("::")[-1]
+  end
 
-      def datastreams_in_fedora
-        mds = {}
-        self.datastreams_xml['datastream'].each do |ds|
-          dsid = ds["dsid"]
-          ds.merge!({:pid => self.pid, :dsID => dsid, :dsLabel => ds["label"]})
-          if dsid == "RELS-EXT" 
-            mds.merge!({dsid => ActiveFedora::RelsExtDatastream.new(ds)})
-          else
-            if self.class.ds_specs.has_key? dsid
-              mds.merge!({dsid => self.class.ds_specs[dsid][0].new(ds)})
-            else
-              mds.merge!({dsid => ActiveFedora::Datastream.new(ds)})
-            end
-          end
-          mds[dsid].new_object = false
+  def datastreams_in_fedora
+    mds = {}
+    self.datastreams_xml['datastream'].each do |ds|
+      dsid = ds["dsid"]
+      ds.merge!({:pid => self.pid, :dsID => dsid, :dsLabel => ds["label"]})
+      if dsid == "RELS-EXT" 
+        mds.merge!({dsid => ActiveFedora::RelsExtDatastream.new(ds)})
+      else
+        if self.class.ds_specs.has_key? dsid
+          mds.merge!({dsid => self.class.ds_specs[dsid][0].new(ds)})
+        else
+          mds.merge!({dsid => ActiveFedora::Datastream.new(ds)})
         end
-        mds
       end
+      mds[dsid].new_object = false
     end
+    mds
+  end
+
+  def route_as
+    "default"
+  end
   
-    def route_as
-      "default"
+  def index_type_label
+    riquery = Cul::Scv::Hydra::ActiveFedora::MEMBER_QUERY.gsub(/%PID%/, self.pid)
+    begin
+      docs = ::ActiveFedora::RubydoraConnection.instance.connection.find_by_sparql riquery
+    rescue
+      docs = self.parts
     end
-  
-    def index_type_label
-      riquery = Cul::Scv::Hydra::ActiveFedora::MEMBER_QUERY.gsub(/%PID%/, self.pid)
-      begin
-        docs = ::ActiveFedora::RubydoraConnection.instance.connection.find_by_sparql riquery
-      rescue
-        docs = self.parts
-      end
-      if docs.length == 0
-        label = "EMPTY"
-      elsif docs.length == 1
-        label = "SINGLE PART"
-      else
-        label = "MULTIPART"
-      end
-      label
+    if docs.length == 0
+      label = "EMPTY"
+    elsif docs.length == 1
+      label = "SINGLE PART"
+    else
+      label = "MULTIPART"
     end
-  
-    def has_desc?
+    label
+  end
+
+  def has_desc?
+    has_desc = false
+    begin
+      has_desc = self.datastreams.include? "descMetadata"
+      has_desc = has_desc and self.inner_object.datastreams["descMetadata"].content.length > 0
+      has_desc = self.datastreams["descMetadata"].term_values(:identifier).length > 0
+    rescue
       has_desc = false
-      begin
-        has_desc = self.datastreams.include? "descMetadata"
-        has_desc = has_desc and self.inner_object.datastreams["descMetadata"].content.length > 0
-        has_desc = self.datastreams["descMetadata"].term_values(:identifier).length > 0
-      rescue
-        has_desc = false
-      end
-      has_desc
     end
-  
-    def to_solr(solr_doc = Hash.new, opts={})
-      super
-      if has_desc?
-        solr_doc["descriptor_s"] = ["mods"]
+    has_desc
+  end
+
+  def to_solr(solr_doc = Hash.new, opts={})
+    super
+    if has_desc?
+      solr_doc["descriptor_s"] = ["mods"]
+    else
+      solr_doc["descriptor_s"] = ["dublin core"]
+    end
+    # if no mods, pull some values from DC
+    if not (solr_doc["title_display"] and solr_doc["title_display"].length > 0)
+      if self.dc.term_values(:title).first
+        solr_doc["title_display"] = [self.dc.term_values(:title).first]
       else
-        solr_doc["descriptor_s"] = ["dublin core"]
+        solr_doc["title_display"] = [self.dc.term_values(:identifier).first]
       end
-      # if no mods, pull some values from DC
-      if not (solr_doc["title_display"] and solr_doc["title_display"].length > 0)
-        if self.dc.term_values(:title).first
-          solr_doc["title_display"] = [self.dc.term_values(:title).first]
-        else
-          solr_doc["title_display"] = [self.dc.term_values(:identifier).first]
-        end
-        if self.dc.term_values(:relation).first
-          self.dc.term_values(:relation).each {|val|
-            if val =~ /clio:/
-              solr_doc["clio_s"] ||= []
-              solr_doc["clio_s"] << val.split(':')[-1]
-            end
-          }
-        end
+      if self.dc.term_values(:relation).first
+        self.dc.term_values(:relation).each {|val|
+          if val =~ /clio:/
+            solr_doc["clio_s"] ||= []
+            solr_doc["clio_s"] << val.split(':')[-1]
+          end
+        }
       end
-      solr_doc["format"] = [self.route_as]
-      solr_doc["index_type_label_s"] = [self.index_type_label]
-      solr_doc
     end
+    solr_doc["format"] = [self.route_as]
+    solr_doc["index_type_label_s"] = [self.index_type_label]
+    solr_doc
+  end
   
-    def update_datastream_attributes(params={}, opts={})
-      logger.debug "Common.update_datastream_attributes"
-      result = params.dup
-      params.each_pair do |dsid, ds_params| 
-        if datastreams.include?(dsid)
-          verify_params = ds_params.dup
-          current_indexed_attributes = {}
-          changed = false
-          verify_params.each { |pointer, values|
-            changed ||= value_changed?(datastreams[dsid],pointer,values)
-          }
-          if changed
-            logger.debug "Common.update_datastream_attributes calling update_indexed_attributes"
-            result[dsid] = datastreams[dsid].update_indexed_attributes(ds_params)
-          else
-            result[dsid] = no_update(ds_params)
-          end
-          logger.debug "change detected? #{changed} digital_object? #{datastreams[dsid].changed?}"
+  def update_datastream_attributes(params={}, opts={})
+    logger.debug "Common.update_datastream_attributes"
+    result = params.dup
+    params.each_pair do |dsid, ds_params| 
+      if datastreams.include?(dsid)
+        verify_params = ds_params.dup
+        current_indexed_attributes = {}
+        changed = false
+        verify_params.each { |pointer, values|
+          changed ||= value_changed?(datastreams[dsid],pointer,values)
+        }
+        if changed
+          logger.debug "Common.update_datastream_attributes calling update_indexed_attributes"
+          result[dsid] = datastreams[dsid].update_indexed_attributes(ds_params)
         else
-          result.delete(dsid)
+          result[dsid] = no_update(ds_params)
         end
+        logger.debug "change detected? #{changed} digital_object? #{datastreams[dsid].changed?}"
+      else
+        result.delete(dsid)
       end
-      return result
     end
-  
-    private
-    def value_changed?(ds,pointer,values)
+    return result
+  end
+
+  private
+  def value_changed?(ds,pointer,values)
+    if values.is_a? Hash
+      values = values.dup
+    else
+      values = {"0"=>values}
+    end
+    logger.debug "submitted values for #{pointer.inspect} : #{values.inspect}"
+    return true if values["-1"]
+    changed = false
+    old_values = ds.get_values(pointer)
+    indexed_values = {}
+    old_values.each_index {|ix| indexed_values[ix.to_s] = old_values[ix] }
+    indexed_values.each {|k,v|
+      new_val = values.delete(k)
+      puts "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
+      logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
+      changed ||= !(v.eql? new_val)
+    }
+    puts "remaining values! #{values.inspect}" if values.length > 0
+    changed || (values.length > 0)
+  end
+ 
+  def no_update(ds_params)
+    response = {}
+    ds_params.each{|pointer, values|
+      returned = []
       if values.is_a? Hash
-        values = values.dup
+        keys = values.keys.sort {|x,y| x.to_i <=> y.to_i}
+        keys.each {|key| returned << values[key]}
       else
-        values = {"0"=>values}
+        returned << values
       end
-      logger.debug "submitted values for #{pointer.inspect} : #{values.inspect}"
-      return true if values["-1"]
-      changed = false
-      old_values = ds.get_values(pointer)
-      indexed_values = {}
-      old_values.each_index {|ix| indexed_values[ix.to_s] = old_values[ix] }
-      indexed_values.each {|k,v|
-        new_val = values.delete(k)
-        puts "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
-        logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
-        changed ||= !(v.eql? new_val)
-      }
-      puts "remaining values! #{values.inspect}" if values.length > 0
-      changed || (values.length > 0)
-    end
-  
-    def no_update(ds_params)
-      response = {}
-      ds_params.each{|pointer, values|
-        returned = []
-        if values.is_a? Hash
-          keys = values.keys.sort {|x,y| x.to_i <=> y.to_i}
-          keys.each {|key| returned << values[key]}
-        else
-          returned << values
-        end
-        response[OM::XML::Terminology.term_hierarchical_name(pointer)] = returned
-      }
-    end
+      response[OM::XML::Terminology.term_hierarchical_name(pointer)] = returned
+    }
   end
-end
+end
+end

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

@@ -25,55 +25,54 @@ module Resource
       has_datastream :name => "CONTENT", :type=>::ActiveFedora::Datastream, :versionable => true
     end
   end
-  module InstanceMethods
-    def resource!
-      add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
-      @metadata_is_dirty = true
-      update
-    end
 
-    def add_content_blob(blob, opts)
-      file_name = opts[:file_name]
-      mime = opts[:mime_type].nil? ? mime_type(file_name) : opts[:mime_type]
-      add_file_datastream(blob, :label=>file_name, :mimeType=>mime, :dsid => 'CONTENT')
-      set_title_and_label( file_name, :only_if_blank=>true )
-      if IMAGE_MIME_TYPES.include? mime
-        blob.rewind
-        # retrieve Nokogiri of image property RDF
-        image_prop_nodes = Cul::Image::Properties.identify(blob).nodeset
-        relsext = datastreams['RELS-EXT']
-        image_prop_nodes.each { |node|
-          if node["resource"]
-            is_literal = false
-            object = RDF::URI.new(node["resource"])
-          else
-            is_literal = true
-            object = RDF::Literal(node.text)
-          end
-          subject = RDF::URI(internal_uri)
-          predicate = RDF::URI("#{node.namespace.href}#{node.name}")
-          query = RDF::Query.new({ :subject => {predicate => :object}})
-          relationships(predicate).dup.each { |stmt|
-            relationships.delete(stmt)
-          }
-          add_relationship(predicate,object, is_literal)
-          relationships_are_dirty=true
-        }
-        # add mimetype to DC:format values
-        self.datastreams['DC'].update_values({[:format] => mime})
-      end
+  def resource!
+    add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
+    @metadata_is_dirty = true
+    update
+  end
+
+  def add_content_blob(blob, opts)
+    file_name = opts[:file_name]
+    mime = opts[:mime_type].nil? ? mime_type(file_name) : opts[:mime_type]
+    add_file_datastream(blob, :label=>file_name, :mimeType=>mime, :dsid => 'CONTENT')
+    set_title_and_label( file_name, :only_if_blank=>true )
+    if IMAGE_MIME_TYPES.include? mime
       blob.rewind
+      # retrieve Nokogiri of image property RDF
+      image_prop_nodes = Cul::Image::Properties.identify(blob).nodeset
+      relsext = datastreams['RELS-EXT']
+      image_prop_nodes.each { |node|
+        if node["resource"]
+          is_literal = false
+          object = RDF::URI.new(node["resource"])
+        else
+          is_literal = true
+          object = RDF::Literal(node.text)
+        end
+        subject = RDF::URI(internal_uri)
+        predicate = RDF::URI("#{node.namespace.href}#{node.name}")
+        query = RDF::Query.new({ :subject => {predicate => :object}})
+        relationships(predicate).dup.each { |stmt|
+          relationships.delete(stmt)
+        }
+        add_relationship(predicate,object, is_literal)
+        relationships_are_dirty=true
+      }
+      # add mimetype to DC:format values
+      self.datastreams['DC'].update_values({[:format] => mime})
     end
+    blob.rewind
+  end
 
-   private
+ private
 
-    # Return the mimeType for a given file name
-    # @param [String] file_name The filename to use to get the mimeType
-    # @return [String] mimeType for filename passed in. Default: application/octet-stream if mimeType cannot be determined
-    def mime_type file_name
-      mime_types = MIME::Types.of(file_name)
-      mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-    end
+  # Return the mimeType for a given file name
+  # @param [String] file_name The filename to use to get the mimeType
+  # @return [String] mimeType for filename passed in. Default: application/octet-stream if mimeType cannot be determined
+  def mime_type file_name
+    mime_types = MIME::Types.of(file_name)
+    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
   end
 end
 end

data/lib/cul_scv_hydra/controllers/terms.rb

@@ -22,6 +22,7 @@ module Terms
     render :action=>params[:action], :layout=>layout
   end
 
+  # this method should be overridden to use the appropriate terminology
   def solr_name(term_id)
     if term_id.nil?
       raise "Cannot provide suggestions without a term name"
@@ -48,7 +49,6 @@ module Terms
       solr_params['terms.sort'] = params.fetch(:sort,'count')
       solr_params['terms.limit'] = -1
     end
-    logger.debug solr_params.inspect
     solr_response = Blacklight.solr.get 'terms', {:params => solr_params}
     result = []
     hash = {}
@@ -58,7 +58,6 @@ module Terms
         result << [_t[jx], _t[jx + 1]]
       }
     }
-    logger.debug result.inspect
     return result
   end
 
@@ -71,19 +70,73 @@ module Terms
 #   end
 #  end
 
-  def field_key_from(field_name, terminology)
-    # this is a hack, but necessary until/unless OM generates names differently
-   candidates = field_name.split('__')
+  def field_key_from(hier_field_name, t)
+   candidates = hier_field_name.split('_')
    field_key = []
-   candidates.each_with_index { |candidate, ix|
-     if (candidates[ix + 1] and candidates[ix + 1].match(/\d+/))
-       field_key << {OM.destringify(candidate) => Integer(candidates.delete_at(ix + 1))}
+   candidates.inject(field_key) { |ptrs, term|
+     if term =~ /\d+/
+       ptr = {ptrs.pop=>term.to_i}
      else
-       field_key << OM.destringify(candidate)
+       ptr = (ptrs.empty? or ptrs.last.is_a? Hash) ? term.to_sym : (ptrs.pop.to_s + "_" + term).to_sym
      end
+     ptrs.push ptr   
    }
-   logger.debug field_key.inspect
-   field_key
+   return field_key if t.has_term? *field_key
+   # pointers are probably from ambiguous underscores
+   amb = field_key.dup
+   field_key = []
+   amb.each do |candidate|
+     key = (candidate.is_a? Hash) ? candidate.keys.first : candidate # no indexes should be included
+     parts = key.to_s.split('_')
+     ptrs = parts_to_terms(parts, t, field_key)
+     if ptrs.nil? or !t.has_term? *ptrs
+       raise "Couldn't generate pointer from term name going forward for \"" + hier_field_name + "\" (no matched term sequence)"
+     else 
+       if candidate.is_a? Hash
+         ptr_key = ptrs.pop
+         ptrs.push({ptr_key => candidate[candidate.keys.first] })
+       end
+       field_key = ptrs
+     end
+   end
+   return field_key if t.has_term? *field_key
+   raise "Couldn't generate pointer from term name going forward for \"" + hier_field_name + "\", tried " + field_key.inspect
+  end
+  
+  def parts_to_terms(parts, t, prefix=[])
+    return nil if parts.length == 0 # this should be short-circuited in the loop below rather than recurring
+    if parts.length == 1
+      new_term_ptr = prefix.dup.push parts[0].to_sym
+      if t.has_term? *new_term_ptr
+        return new_term_ptr 
+      else
+        return nil
+      end
+    end
+
+    results = []
+    parts.each_index do |ix|
+      term_ptr = prefix.dup.push parts[0...(parts.length - ix)].join('_').to_sym
+
+      if t.has_term? *term_ptr
+        case ix
+        when 0
+          results.push term_ptr
+        when 1
+          new_term_ptr = term_ptr.concat [parts.last.to_sym]
+          results.push new_term_ptr if t.has_term? *new_term_ptr
+        else
+          new_term_ptr = parts_to_terms(parts[parts.length - ix, ix], t, term_ptr)
+          results.push new_term_ptr if !new_term_ptr.nil?
+        end
+      end
+    end
+
+    if results.length == 1
+      return results[0]
+    else
+      return nil
+    end
   end
 
   # ** largely copied from ActiveFedora::NokogiriDatastream.get_values **

data/lib/cul_scv_hydra/om/scv_mods_document.rb

@@ -17,7 +17,7 @@ module Om
              :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=>[:displayable,:searchable])
+        t.main_title(:path=>"title", :index_as=>[:displayable,:searchable, :sortable])
       }
       
       t.search_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){

data/lib/cul_scv_hydra/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Benjamin Armintor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cul_image_props
@@ -39,11 +39,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 21
         segments: 
         - 3
+        - 4
         - 1
-        version: "3.1"
+        version: 3.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 2
+        version: "3.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -69,42 +70,42 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 27
         segments: 
-        - 3
-        - 3
-        version: "3.3"
+        - 4
+        - 0
+        version: "4.0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hydra-head
+  name: rubydora
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 27
         segments: 
-        - 3
-        - 3
-        version: "3.3"
+        - 0
+        - 5
+        - 8
+        version: 0.5.8
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rubydora
+  name: hydra-head
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
+        - 4
         - 0
-        - 2
-        - 6
-        version: 0.2.6
+        version: "4.0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -129,14 +130,14 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
-        - 2
-        - 4
-        version: 1.2.4
+        - 6
+        - 0
+        version: 1.6.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -145,14 +146,14 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -163,12 +164,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 39
         segments: 
         - 2
-        - 8
+        - 10
         - 0
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -179,12 +180,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 39
         segments: 
         - 2
-        - 8
-        - 1
-        version: 2.8.1
+        - 10
+        - 0
+        version: 2.10.0
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency