cul_scv_hydra 0.18.5 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a307bb5b7c512a3896b4de2b51c2cfcdff1f2c6
-  data.tar.gz: 6fc927e3bdc91a0373b47d3b91ee5e2fb5465b6e
+  metadata.gz: 34451fcabc90e9ac89be6eed09a7220eb2083da4
+  data.tar.gz: 67a8560c793304772b84e2d276c72ccfce0c9a42
 SHA512:
-  metadata.gz: 69fe65d4a6f3008321a9d50992d99e0367ca761ccbef2ae7db276fcd12f2c660891eea2b3607082f137757c63e11cdc9616a5dafb67f2daeb86d16291ee96500
-  data.tar.gz: f7c71dfab081dc337ac6119eb27e709059ad44759e3c2d1eab5982a33061bf5b56be64c70fca1de854a11376ff8a66c88297f1d305e337db0319bbf79c77fce8
+  metadata.gz: 28db11a406d299d886630272013790937cd2319de0d7fb32a0677950428e2559ecd804ad207a8b09a32e022a05518fafdddd0693e164cda1f9e56e370780fab3
+  data.tar.gz: 185b9756f75697271db9806c69c1fbc21f6b45c29a1bf692f2efb21aabecd5667b87e47284ec39850a65bba38184907f310d704df33d31ac24c8c6383c71963a

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

@@ -73,6 +73,11 @@ module Cul::Scv::Hydra::Models::Common
     has_desc
   end
 
+  # set the index type label and any RI-based fields 
+  def set_size_labels(solr_doc={})
+    solr_doc["index_type_label_ssi"] = [self.index_type_label]
+  end
+
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super(solr_doc, opts)
 
@@ -105,7 +110,8 @@ module Cul::Scv::Hydra::Models::Common
       solr_doc["title_display_ssm"].uniq!
     end
     solr_doc["format_ssi"] = [self.route_as]
-    solr_doc["index_type_label_ssi"] = [self.index_type_label]
+
+    set_size_labels(solr_doc)
 
     solr_doc.each_pair {|key, value|
       if value.is_a? Array

data/app/models/generic_aggregator.rb

@@ -16,25 +16,36 @@ class GenericAggregator < ::ActiveFedora::Base
   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 = Cul::Scv::Fedora.repository.find_by_itql riquery, limit: 2, format: 'count/json'
       docs = JSON.parse(docs)['results']
+      size = docs.first && docs.first['count'] && docs.first['count'].to_i
     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"
+    size ||= self.parts(response_format: :solr, limit: 2).size
+    type_label_for(size)
+  end
+
+  def type_label_for(size=nil)
+    if size == 0
+      return "EMPTY"
+    elsif size == 1
+      return "SINGLE PART"
     else
-      label = "MULTIPART"
+      return "MULTIPART"
     end
-    label
+  end
+
+  # set the index type label and any RI-based fields 
+  # overridde
+  def set_size_labels(solr_doc={})
+    count = Cul::Scv::Hydra::RisearchMembers.get_direct_member_count(pid)
+    solr_doc["index_type_label_ssi"] = [type_label_for(count)]
+    solr_doc["cul_number_of_members_isi"] = count
   end
 
   def to_solr(solr_doc = Hash.new, opts={})
     solr_doc = super(solr_doc, opts)
-    solr_doc["cul_number_of_members_isi"] = Cul::Scv::Hydra::RisearchMembers.get_direct_member_pids(pid).length
     solr_doc
   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/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"

data/lib/cul_scv_hydra/indexer.rb

@@ -1,7 +1,6 @@
 module Cul::Scv::Hydra::Indexer
 
-  def self.recursively_index_fedora_objects(pid, pids_to_omit=nil, skip_generic_resources=false, verbose_output=false)
-
+  def self.descend_from(pid, pids_to_omit=nil, verbose_output=false)
     if pid.blank?
       raise 'Please supply a pid (e.g. rake recursively_index_fedora_objects pid=ldpd:123)'
     end
@@ -11,24 +10,12 @@ module Cul::Scv::Hydra::Indexer
     end
 
     if pids_to_omit.present? && pids_to_omit.include?(pid)
-      puts 'Skipping indexing of topmost object in this set (' + pid + ') because it has been intentionally omitted...' if verbose_output
+      puts 'Skipping topmost object in this set (' + pid + ') because it has been intentionally omitted...' if verbose_output
     else
       puts 'Indexing topmost object in this set (' + pid + ')...' if verbose_output
       puts 'If this is a BagAggregator with a lot of members, this may take a while...' if verbose_output
 
-      # We found an object with the desired PID. Let's reindex it
-      active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
-
-      if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
-        puts 'Top level object was skipped because GenericResources are being skipped and it is a GenericResource.'
-      else
-        begin
-          active_fedora_object.update_index
-        rescue Exception => e
-          puts 'Encountered problem.  Skipping record.  Exception: ' + e.message
-        end
-        puts 'Done indexing topmost object (' + pid + '). Took ' + (Time.now - START_TIME).to_s + ' seconds' if verbose_output
-      end
+      yield pid
 
     end
 
@@ -49,27 +36,36 @@ module Cul::Scv::Hydra::Indexer
     if total_number_of_members > 0
       unique_pids.each {|pid|
 
-        print 'Indexing ' + i.to_s + ' of ' + total_number_of_members.to_s + ' members (' + pid + ')...' if verbose_output
+        puts 'Recursing on ' + i.to_s + ' of ' + total_number_of_members.to_s + ' members (' + pid + ')...' if verbose_output
 
-        active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
-
-        if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
-          puts "skipped (because we're skipping GenericResources." if verbose_output
-        else
-          begin
-            active_fedora_object.update_index
-          rescue Exception => e
-            puts 'Encountered problem.  Skipping record.  Exception: ' + e.message
-          end
-          # Display progress
-          puts 'done.' if verbose_output
-        end
+        yield pid
 
         i += 1
       }
     end
 
-    puts 'Indexing complete!  Took ' + (Time.now - START_TIME).to_s + ' seconds'
+    puts 'Recursion complete!'
+
+  end
+  def self.recursively_index_fedora_objects(top_pid, pids_to_omit=nil, skip_generic_resources=false, verbose_output=false)
+
+    descend_from(top_pid, pids_to_omit, verbose_output) do |pid|
+
+      # We found an object with the desired PID. Let's reindex it
+      active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
+
+      if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
+        puts 'Top level object was skipped because GenericResources are being skipped and it is a GenericResource.'
+      else
+        begin
+          active_fedora_object.update_index
+          puts 'done.' if verbose_output
+        rescue Exception => e
+          puts 'Encountered problem.  Skipping record.  Exception: ' + e.message
+        end
+      end
+
+    end
 
   end
 

data/lib/cul_scv_hydra/risearch_members.rb

@@ -3,13 +3,12 @@ module Cul::Scv::Hydra::RisearchMembers
   def self.get_recursive_member_pids(pid, verbose_output=false, cmodel_type='all')
 
     recursive_member_query =
-      'select $child $parent $cmodel from <#ri>
+      'select $child $parent from <#ri>
       where
-      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)
-      and
-      $child <fedora-model:hasModel> $cmodel'
+      walk($child <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '> and $child <http://purl.oclc.org/NET/CUL/memberOf> $parent)'      
 
     unless cmodel_type == 'all'
+      recursive_member_query += ' and $child <fedora-model:hasModel> $cmodel'
       recursive_member_query += ' and $cmodel <mulgara:is> <info:fedora/ldpd:' + cmodel_type + '>'
     end
 
@@ -29,27 +28,32 @@ module Cul::Scv::Hydra::RisearchMembers
 
   end
 
-  def self.get_direct_member_pids(pid, verbose_output=false)
+  def self.get_direct_member_results(pid, verbose_output=false, format='json')
 
     direct_member_query =
-      'select $pid $cmodel from <#ri>
-      where $pid <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '>
-      and $pid <fedora-model:hasModel> $cmodel'
+      'select $pid from <#ri>
+      where $pid <http://purl.oclc.org/NET/CUL/memberOf> <fedora:' + pid + '>'
 
     puts 'Performing query:' if verbose_output
     puts direct_member_query if verbose_output
 
     search_response = JSON(Cul::Scv::Fedora.repository.find_by_itql(direct_member_query, {
       :type => 'tuples',
-      :format => 'json',
+      :format => format,
       :limit => '',
       :stream => 'on'
     }))
 
-    unique_pids = search_response['results'].map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
-
-    return unique_pids
-
+    return search_response['results']
   end
 
+  def self.get_direct_member_pids(pid, verbose_output=false)
+    unique_pids = get_direct_member_results(pid,verbose_output,'json')
+    unique_pids.map{|result| result['pid'].gsub('info:fedora/', '') }.uniq
+  end
+  
+  def self.get_direct_member_count(pid, verbose_output=false)
+    count = get_direct_member_results(pid,verbose_output,'count/json')
+    return count.blank? ? 0 : count[0]['count'].to_i
+  end
 end

data/lib/cul_scv_hydra/solrizer/scv_mods_fieldable.rb

@@ -274,9 +274,6 @@ module Cul::Scv::Hydra::Solrizer
         places_without_uri << ScvModsFieldable.normalize(n.text, true)
       end
 
-			puts 'places_with_uri: ' + places_with_uri.inspect
-			puts 'places_without_uri: ' + places_without_uri.inspect
-
 			return (places_without_uri.length > 0 ? places_without_uri : places_with_uri)
 		end
 

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.18.5'
+        VERSION = '0.19.0'
         def self.version
           VERSION
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.19.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -254,10 +254,11 @@ files:
 - config/fedora.yml
 - config/jetty.yml
 - config/locales/ldpd_hydra.en.yml
+- config/locales/nnc.ntriples
 - config/predicate_mappings.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
+- config/subs.yml
 - lib/cul_scv_fedora/dummy_object.rb
 - lib/cul_scv_fedora/rubydora_patch.rb
 - lib/cul_scv_fedora/url_helper_behavior.rb
@@ -293,7 +294,6 @@ files:
 - lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb
 - lib/cul_scv_hydra/solrizer/value_mapper.rb
 - lib/cul_scv_hydra/version.rb
-- lib/cul_scv_hydra/version.rb~
 - lib/tasks/cmodel.rake
 - lib/tasks/cul_hydra_dev.rake
 - lib/tasks/index.rake

data/config/solr.yml

@@ -1,5 +0,0 @@
-development:
-  url: http://localhost:8983/solr/test
-  
-test:
-  url: http://localhost:8983/solr/test

data/lib/cul_scv_hydra/version.rb~

@@ -1,11 +0,0 @@
-
-module Cul
-  module Scv
-    module Hydra
-        VERSION = '0.18.4'
-        def self.version
-          VERSION
-        end
-    end
-  end
-end