dor-services 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 220d7103c61a4210c39dd0a7d7f92f08c1fc3b16
-  data.tar.gz: 7ed5456b52b9d10a701b36a3c82e02189589e806
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGQ5ZWQ0NWFjYTg0ZDc0YTFiNmMwMjM2ZmEzYzJjYTA4NzA5NmUwOA==
+  data.tar.gz: !binary |-
+    MDJmMmQ5ZGNmNzU5OWQxNmMwNjJlOWY2MTgwMTc4NWM4ZmI3YWNhYg==
 SHA512:
-  metadata.gz: c419b64ebe780589176fa5bd7a9b77bc4b8dbade3899710e9984af0d42469327bfa62efda0d7565e9f59a9792ba82238f9e4a59d4410865c5871bbaa84c488a7
-  data.tar.gz: 074921fed0d04103962f77d87e96d39235ff693a04c7d439b0f76e906f8977a8f47a9c71b37e43607164bfdebc5bffdded6f622b026811329bc36e7685222f03
+  metadata.gz: !binary |-
+    MzcxNDU3MjQ4NjQwODgwZTQyM2Q1OGQ4ZGYzYjdhOTI3ZTY1MzA3OGEzZjc2
+    MWJiYjkzN2VjNzVmYWI1NWRhMDBjMTE4MDZhMjM5Y2QzOTIwNGRlY2IwYWYy
+    YmQyZDc5YjY4N2I3ODcwMDZkZDE3ODRlOTM3NTY4MDY3ODhmNzI=
+  data.tar.gz: !binary |-
+    OTZiMzAzNjg3NDFlZTM3NzYwYmVmNjljMzcxYjA4YzE2Y2MwYmQ3ZjA2Zjdh
+    ZjY0MWVhNDlmMWE3ZWE2ZWUxNWUwN2JkNWU2NDlhZGNiYWZkZTg3MmUzZWQx
+    Y2FhM2I3MGFhMjc4OTk2YTk3MGU5N2YwYjkzYTQyOTQxMTIxNjY=

data/config/dev_console_env.rb

@@ -1,18 +1,13 @@
-# Copied from common-accessioning config/environments
-
-cert_dir = File.join(File.dirname(__FILE__), ".", "certs")
+cert_dir = File.join(File.dirname(__FILE__), "certs")
 
 Dor::Config.configure do
-  fedora do
-    url 'https://sul-dor-dev.stanford.edu/fedora'
-  end
 
   ssl do
     cert_file File.join(cert_dir,"robots-dor-dev.crt")
-    key_file File.join(cert_dir,"robots-dor-dev.key")
-    key_pass ''
+    key_file  File.join(cert_dir,"robots-dor-dev.key")
+    key_pass  ''
   end
-
+  
   suri do
     mint_ids true
     id_namespace 'druid'
@@ -20,46 +15,64 @@ Dor::Config.configure do
     user 'labware'
     pass 'lyberteam'
   end
-
+  
   metadata do
-    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    exist.url   'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
     catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
   end
-
+  
   stacks do
     document_cache_host 'purl-dev.stanford.edu'
-    document_cache_user 'lyberadmin'
-    local_workspace_root '/dor/workspace'
-    storage_root '/stacks'
-    host 'stacks-dev.stanford.edu'
-    user 'lyberadmin'
-    local_stacks_root '/stacks'
+    local_stacks_root         '/stacks'
     local_document_cache_root '/purl/document_cache'
+    local_workspace_root      '/dor/workspace'
   end
-
-  gsearch.url 'https://sul-dor-dev.stanford.edu/solr/gsearch'
-  solrizer.url 'https://sul-dor-dev.stanford.edu/solr'
-  workflow.url 'https://lyberservices-dev.stanford.edu/workflow/'
-  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor/v1'
+ 
+  solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
+  fedora.url       'https://sul-dor-test.stanford.edu/fedora'
+  workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
 
   cleanup do
     local_workspace_root '/dor/workspace'
-    local_export_home '/dor/export'
+    local_export_home    '/dor/export'
   end
 
   sdr do
+    url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
     local_workspace_root '/dor/workspace'
-    local_export_home '/dor/export'
+    local_export_home    '/dor/export'
     datastreams do
-      contentMetadata 'required'
-      descMetadata 'required'
-      identityMetadata 'required'
-      provenanceMetadata 'required'
-      relationshipMetadata 'required'
-      rightsMetadata 'optional'
-      sourceMetadata 'optional'
+      administrativeMetadata 'optional'
+      contentMetadata        'optional'
+      descMetadata           'required'
+      defaultObjectRights    'optional'
+      events                 'optional'
+      embargoMetadata        'optional'
+      identityMetadata       'required'
+      provenanceMetadata     'required'
+      relationshipMetadata   'required'
+      rightsMetadata         'optional'
+      roleMetadata           'optional'
+      sourceMetadata         'optional'
+      technicalMetadata      'optional'
+      versionMetadata        'required'
+      workflows              'optional'
     end
   end
 
+  accessioning_robot_sleep_time 30
+
 end
 
+
+#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+
+# Constants for Dor::WorkflowService
+#module Dor
+#  CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
+#  WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
+#end
+
+# External application locations
+JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')

data/lib/dor-services.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 module Dor
   @@registered_classes = {}
   mattr_reader :registered_classes
-  INDEX_VERSION_FIELD = 'dor_services_version_facet'
+  INDEX_VERSION_FIELD = 'dor_services_version_ssi'
 
   class << self
 
@@ -40,7 +40,7 @@ module Dor
       resp.docs.collect do |solr_doc|
         doc_version = solr_doc[INDEX_VERSION_FIELD].first rescue '0.0.0'
         doc_version = Gem::Version.new(doc_version)
-        object_type = Array(solr_doc[ActiveFedora::SolrService.solr_name('objectType',:facetable)]).first
+        object_type = Array(solr_doc[ActiveFedora::SolrService.solr_name('objectType', :symbol)]).first
         object_class = registered_classes[object_type] || ActiveFedora::Base
         if opts[:lightweight] and doc_version >= Gem::Version.new('3.1.0')
           begin
@@ -78,63 +78,66 @@ module Dor
   require 'druid-tools'
 
   # datastreams
-  autoload :AdministrativeMetadataDS,  'dor/datastreams/administrative_metadata_ds'
-  autoload :ContentMetadataDS, 'dor/datastreams/content_metadata_ds'
-  autoload :DescMetadataDS,  'dor/datastreams/desc_metadata_ds'
-  autoload :EmbargoMetadataDS, 'dor/datastreams/embargo_metadata_ds'
-  autoload :EventsDS,  'dor/datastreams/events_ds'
-  autoload :GeoMetadataDS,  'dor/datastreams/geo_metadata_ds'
-  autoload :IdentityMetadataDS,  'dor/datastreams/identity_metadata_ds'
-  autoload :RoleMetadataDS,  'dor/datastreams/role_metadata_ds'
-  autoload :WorkflowDefinitionDs,  'dor/datastreams/workflow_definition_ds'
-  autoload :WorkflowDs,  'dor/datastreams/workflow_ds'
-  autoload :VersionMetadataDS,  'dor/datastreams/version_metadata_ds'
-  autoload :DefaultObjectRightsDS,  'dor/datastreams/default_object_rights_ds'
-  autoload :SimpleDublinCoreDs, 'dor/datastreams/simple_dublin_core_ds'
+  autoload :AdministrativeMetadataDS,    'dor/datastreams/administrative_metadata_ds'
+  autoload :ContentMetadataDS,           'dor/datastreams/content_metadata_ds'
+  autoload :DescMetadataDS,              'dor/datastreams/desc_metadata_ds'
+  autoload :EmbargoMetadataDS,           'dor/datastreams/embargo_metadata_ds'
+  autoload :EventsDS,                    'dor/datastreams/events_ds'
+  autoload :GeoMetadataDS,               'dor/datastreams/geo_metadata_ds'
+  autoload :IdentityMetadataDS,          'dor/datastreams/identity_metadata_ds'
+  autoload :RightsMetadataDS,            'dor/datastreams/rights_metadata_ds'
+  autoload :RoleMetadataDS,              'dor/datastreams/role_metadata_ds'
+  autoload :WorkflowDefinitionDs,        'dor/datastreams/workflow_definition_ds'
+  autoload :WorkflowDs,                  'dor/datastreams/workflow_ds'
+  autoload :VersionMetadataDS,           'dor/datastreams/version_metadata_ds'
+  autoload :DefaultObjectRightsDS,       'dor/datastreams/default_object_rights_ds'
+  autoload :SimpleDublinCoreDs,          'dor/datastreams/simple_dublin_core_ds'
 
   # DOR Concerns
   autoload :Identifiable, 'dor/models/identifiable'
-  autoload :Itemizable, 'dor/models/itemizable'
-  autoload :Processable, 'dor/models/processable'
-  autoload :Governable, 'dor/models/governable'
-  autoload :Describable, 'dor/models/describable'
-  autoload :Publishable, 'dor/models/publishable'
-  autoload :Shelvable, 'dor/models/shelvable'
-  autoload :Embargoable, 'dor/models/embargoable'
-  autoload :Preservable, 'dor/models/preservable'
+  autoload :Itemizable,   'dor/models/itemizable'
+  autoload :Processable,  'dor/models/processable'
+  autoload :Governable,   'dor/models/governable'
+  autoload :Describable,  'dor/models/describable'
+  autoload :Publishable,  'dor/models/publishable'
+  autoload :Shelvable,    'dor/models/shelvable'
+  autoload :Embargoable,  'dor/models/embargoable'
+  autoload :Preservable,  'dor/models/preservable'
   autoload :Assembleable, 'dor/models/assembleable'
-  autoload :Upgradable, 'dor/models/upgradable'
-  autoload :Eventable, 'dor/models/eventable'
-  autoload :Versionable, 'dor/models/versionable'
-  autoload :Contentable, 'dor/models/contentable'
-  autoload :Editable, 'dor/models/editable'
-  autoload :Geoable, 'dor/models/geoable'
-  autoload :Presentable, 'dor/models/presentable'
-  autoload :Releasable, 'dor/models/releasable'
+  autoload :Upgradable,   'dor/models/upgradable'
+  autoload :Eventable,    'dor/models/eventable'
+  autoload :Versionable,  'dor/models/versionable'
+  autoload :Contentable,  'dor/models/contentable'
+  autoload :Editable,     'dor/models/editable'
+  autoload :Discoverable, 'dor/models/discoverable'
+  autoload :Geoable,      'dor/models/geoable'
+  autoload :Presentable,  'dor/models/presentable'
+  autoload :Releaseable,   'dor/models/releaseable'
+  autoload :Rightsable,   'dor/models/rightsable'
 
 
   # ActiveFedora Classes
-  autoload :Abstract, 'dor/models/item'
-  autoload :Item, 'dor/models/item'
-  autoload :Set, 'dor/models/set'
+  autoload :Abstract,   'dor/models/item'
+  autoload :Item,       'dor/models/item'
+  autoload :Set,        'dor/models/set'
   autoload :Collection, 'dor/models/collection'
   autoload :AdminPolicyObject, 'dor/models/admin_policy_object'
-  autoload :WorkflowObject, 'dor/models/workflow_object'
+  autoload :WorkflowObject,    'dor/models/workflow_object'
 
   # Services
-  autoload :SearchService, 'dor/services/search_service'
-  autoload :MetadataService, 'dor/services/metadata_service'
-  autoload :RegistrationService, 'dor/services/registration_service'
-  autoload :SuriService, 'dor/services/suri_service'
-  autoload :WorkflowService, 'dor/services/workflow_service'
-  autoload :DigitalStacksService, 'dor/services/digital_stacks_service'
-  autoload :SdrIngestService, 'dor/services/sdr_ingest_service'
-  autoload :CleanupService, 'dor/services/cleanup_service'
+  autoload :SearchService,             'dor/services/search_service'
+  autoload :MetadataService,           'dor/services/metadata_service'
+  autoload :RegistrationService,       'dor/services/registration_service'
+  autoload :SuriService,               'dor/services/suri_service'
+  autoload :WorkflowService,           'dor/services/workflow_service'
+  autoload :DigitalStacksService,      'dor/services/digital_stacks_service'
+  autoload :SdrIngestService,          'dor/services/sdr_ingest_service'
+  autoload :CleanupService,            'dor/services/cleanup_service'
   autoload :ProvenanceMetadataService, 'dor/services/provenance_metadata_service'
-  autoload :TechnicalMetadataService, 'dor/services/technical_metadata_service'
-  autoload :MergeService, 'dor/services/merge_service'
-  autoload :ResetWorkspaceService, 'dor/services/reset_workspace_service'
-  autoload :CleanupResetService, 'dor/services/cleanup_reset_service'
+  autoload :TechnicalMetadataService,  'dor/services/technical_metadata_service'
+  autoload :MergeService,              'dor/services/merge_service'
+  autoload :ResetWorkspaceService,     'dor/services/reset_workspace_service'
+  autoload :CleanupResetService,       'dor/services/cleanup_reset_service'
 
   # Versioning Classes
   module Versioning
@@ -143,8 +146,8 @@ module Dor
 
   # Workflow Classes
   module Workflow
-    autoload :Graph, 'dor/workflow/graph'
-    autoload :Process, 'dor/workflow/process'
+    autoload :Graph,    'dor/workflow/graph'
+    autoload :Process,  'dor/workflow/process'
     autoload :Document, 'dor/workflow/document'
   end
 end

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -17,14 +17,14 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
     t.registration :index_as => [:not_searchable] do
       t.agreementId
       t.itemTag
-      t.workflow_id :path => 'workflow/@id', :index_as => [:symbol, :facetable]
+      t.workflow_id :path => 'workflow/@id', :index_as => [:symbol]
       t.default_collection :path => 'collection/@id'
     end
     t.workflow :path => 'registration/workflow'
     t.deposit :index_as => [:not_searchable]
 
     t.accessioning :index_as => [:not_searchable] do
-      t.workflow_id :path => 'workflow/@id', :index_as => [:facetable]
+      t.workflow_id :path => 'workflow/@id', :index_as => [:symbol]
     end
 
     t.preservation :index_as => [:not_searchable]

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -1,26 +1,26 @@
 module Dor
-  class ContentMetadataDS < ActiveFedora::OmDatastream 
+  class ContentMetadataDS < ActiveFedora::OmDatastream
     include Upgradable
     include SolrDocHelper
 
     set_terminology do |t|
-      t.root :path => 'contentMetadata', :index_as => [:not_searchable]
-      t.contentType :path => '/contentMetadata/@type', :index_as => [:not_searchable]
-      t.stacks :path=> '/contentMetadata/@stacks', :index_as => [:not_searchable]
+      t.root        :path => 'contentMetadata',          :index_as => [:not_searchable]
+      t.contentType :path => '/contentMetadata/@type',   :index_as => [:not_searchable]
+      t.stacks      :path => '/contentMetadata/@stacks', :index_as => [:not_searchable]
       t.resource(:index_as => [:not_searchable]) do
-        t.id_ :path => { :attribute => 'id' }
-        t.sequence :path => { :attribute => 'sequence' }#, :data_type => :integer
-        t.type_ :path => { :attribute => 'type' }, :index_as => [:displayable]
+        t.id_       :path => { :attribute => 'id' }
+        t.sequence  :path => { :attribute => 'sequence' }#, :data_type => :integer
+        t.type_     :path => { :attribute => 'type' }, :index_as => [:displayable]
         t.attribute(:path => 'attr', :index_as => [:not_searchable]) do
-          t.name :path => { :attribute => 'name' }, :index_as => [:not_searchable]
+          t.name    :path => { :attribute => 'name' }, :index_as => [:not_searchable]
         end
         t.file(:index_as => [:not_searchable]) do
-          t.id_ :path => { :attribute => 'id' }
+          t.id_      :path => { :attribute => 'id' }
           t.mimeType :path => { :attribute => 'mimeType' }, :index_as => [:displayable]
           t.dataType :path => { :attribute => 'dataType' }, :index_as => [:displayable]
-          t.size :path => { :attribute => 'size' }, :index_as => [:displayable]#, :data_type => :long
-          t.shelve :path => { :attribute => 'shelve' }, :index_as => [:not_searchable]#, :data_type => :boolean
-          t.publish :path => { :attribute => 'publish' }, :index_as => [:not_searchable]#, :data_type => :boolean
+          t.size     :path => { :attribute => 'size'     }, :index_as => [:displayable]#, :data_type => :long
+          t.shelve   :path => { :attribute => 'shelve'   }, :index_as => [:not_searchable]#, :data_type => :boolean
+          t.publish  :path => { :attribute => 'publish'  }, :index_as => [:not_searchable]#, :data_type => :boolean
           t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable]#, :data_type => :boolean
           t.checksum do
             t.type_ :path => { :attribute => 'type' }
@@ -35,69 +35,50 @@ module Dor
 
     def public_xml
       result = self.ng_xml.clone
-      result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")])]').each { |n| n.remove }
-      result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]').each { |n| n.remove }
+      result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")])]'   ).each { |n| n.remove }
+      result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]'      ).each { |n| n.remove }
       result.xpath('/contentMetadata/resource/file').xpath('@preserve|@shelve|@publish|@deliver').each { |n| n.remove }
-      result.xpath('/contentMetadata/resource/file/checksum').each { |n| n.remove }
+      result.xpath('/contentMetadata/resource/file/checksum'                                    ).each { |n| n.remove }
       result
     end
     def add_file(file, resource_name)
       xml=self.ng_xml
       resource_nodes = xml.search('//resource[@id=\''+resource_name+'\']')
-      if resource_nodes.length==0
-        raise 'resource doesnt exist.'
-      end
+      raise 'resource doesnt exist.' if resource_nodes.length==0
       node=resource_nodes.first
       file_node=Nokogiri::XML::Node.new('file',xml)
       file_node['id']=file[:name]
-      file_node['shelve']=file[:shelve] ? file[:shelve] : ''
-      file_node['publish']=file[:publish] ? file[:publish] : ''
-      file_node['preserve']=file[:preserve] ? file[:preserve] : ''
+      file_node['shelve'  ] = file[:shelve  ] ? file[:shelve  ] : ''
+      file_node['publish' ] = file[:publish ] ? file[:publish ] : ''
+      file_node['preserve'] = file[:preserve] ? file[:preserve] : ''
       node.add_child(file_node)
 
-      if file[:md5]
-        checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-        checksum_node['type']='md5'
-        checksum_node.content=file[:md5]
-        file_node.add_child(checksum_node)
-      end
-      if file[:sha1]
-        checksum_node=Nokogiri::XML::Node.new('checksum',xml)
-        checksum_node['type']='sha1'
-        checksum_node.content=file[:sha1]
+      [:md5, :sha1].each do |algo|
+        next unless file[algo]
+        checksum_node = Nokogiri::XML::Node.new('checksum',xml)
+        checksum_node['type'] = algo.to_s
+        checksum_node.content = file[algo]
         file_node.add_child(checksum_node)
       end
-      if file[:size]
-        file_node['size']=file[:size]
-      end
-      if file[:mime_type]
-        file_node['mimetype']=file[:mime_type]
-      end
+      file_node['size'    ] = file[:size     ] if file[:size     ]
+      file_node['mimetype'] = file[:mime_type] if file[:mime_type]
       self.content=xml.to_s
       self.save
     end
 
-    def add_resource(files,resource_name, position,type="file") 
+    def add_resource(files,resource_name, position,type="file")
       xml=self.ng_xml
       if xml.search('//resource[@id=\''+resource_name+'\']').length>0
         raise 'resource '+resource_name+' already exists'
       end
       node=nil
 
-      max=-1
-      xml.search('//resource').each do |node|
-        if node['sequence'].to_i>max
-          max=node['sequence'].to_i
-        end
-      end
+      max = xml.search('//resource').map{ |node| node['sequence'].to_i }.max
       #renumber all of the resources that will come after the newly added one
       while max>position do
         node=xml.search('//resource[@sequence=\'' + position + '\']')
-        if node.length>0
-          node=node.first
-          node[sequence]=max+1
-        end
-        max=max-1
+        node.first[sequence]=max+1 if node.length>0
+        max-=1
       end
       node=Nokogiri::XML::Node.new('resource',xml)
       node['sequence']=position.to_s
@@ -117,7 +98,7 @@ module Dor
           file_node.add_child(checksum_node)
         }
         file_node['size'] = file[:size] if file[:size]
-      end    
+      end
       xml.search('//contentMetadata').first.add_child(node)
       self.content=xml.to_s
       self.save
@@ -125,20 +106,12 @@ module Dor
 
     def remove_resource resource_name
       xml=self.ng_xml
-      position=-1
-
-      resources=xml.search('//resource[@id=\''+resource_name+'\']')
-      if resources.length!=1
-        raise 'Resource is missing or duplicated!'
-      end
-      position=resources.first['sequence']
-      resources.first.remove
-      position=position.to_i+1
+      node = singular_node('//resource[@id=\''+resource_name+'\']')
+      position = node['sequence'].to_i+1
+      node.remove
       while true
         res=xml.search('//resource[@sequence=\''+position.to_s+'\']')
-        if(res.length==0)
-          break
-        end
+        break if res.length==0
         res['sequence']=position.to_s
         position=position+1
       end
@@ -184,54 +157,50 @@ module Dor
       self.content=xml.to_s
       self.save
     end
+
     # Terminology-based solrization is going to be painfully slow for large
     # contentMetadata streams. Just select the relevant elements instead.
+    # TODO: Call super()?
     def to_solr(solr_doc=Hash.new, *args)
       doc = self.ng_xml
-      if doc.root['type']
-        shelved_file_count=0
-        content_file_count=0
-        resource_type_counts={}
-        resource_count=0
-        preserved_size=0
-        first_shelved_image=nil
-        add_solr_value(solr_doc, "content_type", doc.root['type'], :string, [:facetable, :symbol])
-        doc.xpath('contentMetadata/resource').sort { |a,b| a['sequence'].to_i <=> b['sequence'].to_i }.each do |resource|
-          resource_count+=1
-          if(resource['type'])
-            if resource_type_counts[resource['type']]
-              resource_type_counts[resource['type']]+=1
-            else
-              resource_type_counts[resource['type']]=1
-            end
-          end
-          resource.xpath('file').each do |file|
-            content_file_count+=1
-            if file['shelve'] == 'yes'
-              shelved_file_count+=1
-              if first_shelved_image.nil? && file['id'].match(/jp2$/)
-                first_shelved_image=file['id']
-              end
-            end
-            if file['preserve'] == 'yes'
-              preserved_size += file['size'].to_i
+      return solr_doc unless doc.root['type']
+
+      preserved_size=0
+      counts = Hash.new(0)                # default count is zero
+      resource_type_counts = Hash.new(0)  # default count is zero
+      first_shelved_image=nil
+
+      doc.xpath('contentMetadata/resource').sort { |a,b| a['sequence'].to_i <=> b['sequence'].to_i }.each do |resource|
+        counts['resource']+=1
+        resource_type_counts[resource['type']]+=1 if resource['type']
+        resource.xpath('file').each do |file|
+          counts['content_file']+=1
+          preserved_size += file['size'].to_i if file['preserve'] == 'yes'
+          if file['shelve'] == 'yes'
+            counts['shelved_file']+=1
+            if first_shelved_image.nil? && file['id'].match(/jp2$/)
+              first_shelved_image=file['id']
             end
           end
         end
-        add_solr_value(solr_doc, "content_file_count", content_file_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "shelved_content_file_count", shelved_file_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "resource_count", resource_count.to_s, :string, [:searchable, :displayable])
-        add_solr_value(solr_doc, "preserved_size", preserved_size.to_s, :string, [:searchable, :displayable])
-        resource_type_counts.each do |key, count|
-          add_solr_value(solr_doc, "resource_types", key, :string, [:symbol])
-          add_solr_value(solr_doc, key+"_resource_count", count.to_s, :string, [:searchable, :displayable])
-        end
-        unless first_shelved_image.nil?
-          add_solr_value(solr_doc, "first_shelved_image", first_shelved_image, :string, [:displayable])
-        end
       end
+      solr_doc["content_type_ssim"              ] = doc.root['type']
+      solr_doc["content_file_count_itsi"        ] = counts['content_file']
+      solr_doc["shelved_content_file_count_itsi"] = counts['shelved_file']
+      solr_doc["resource_count_itsi"            ] = counts['resource']
+      solr_doc["preserved_size_dbtsi"           ] = preserved_size        # double (trie) to support very large sizes
+      solr_doc["resource_types_ssim"            ] = resource_type_counts.keys if resource_type_counts.size > 0
+      resource_type_counts.each do |key, count|
+        solr_doc["#{key}_resource_count_itsi"] = count
+      end
+      # first_shelved_image is neither indexed nor multiple
+      solr_doc["first_shelved_image_ss"] = first_shelved_image unless first_shelved_image.nil?
       solr_doc
     end
+
+    #@param old_name [String] unique id attribute of the file element
+    #@param new_name [String] new unique id value being assigned
+    #@return [Nokogiri::XML::Element] the file node
     def rename_file old_name, new_name
       xml=self.ng_xml
       file_node=xml.search('//file[@id=\''+old_name+'\']').first
@@ -240,63 +209,52 @@ module Dor
       self.save
     end
 
+    #Updates old label OR creates a new one if necessary
+    #@param resource_name [String] unique id attribute of the resource
+    #@param new_label [String] label value being assigned
+    #@return [Nokogiri::XML::Element] the resource node
     def update_resource_label resource_name, new_label
-      xml=self.ng_xml
-      resource_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(resource_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      labels=xml.search('//resource[@id=\''+resource_name+'\']/label')
+      node = singular_node('//resource[@id=\''+resource_name+'\']')
+      labels = node.xpath('./label')
       if(labels.length==0)
         #create a label
-        label_node = Nokogiri::XML::Node.new('label',xml)
+        label_node = Nokogiri::XML::Node.new('label',self.ng_xml)
         label_node.content=new_label
-        resource_node.first.add_child(label_node)
+        node.add_child(label_node)
       else
         labels.first.content=new_label
       end
+      return node
     end
-    def update_resource_type resource, new_type
-      xml=self.ng_xml
-      resource_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(resource_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      resource_node.first['type']=new_type
+
+    #@param resource_name [String] unique id attribute of the resource
+    #@param new_type [String] type value being assigned
+    def update_resource_type resource_name, new_type
+      singular_node('//resource[@id=\''+resource_name+'\']')['type']=new_type
     end
 
+    #You just *had* to have ordered lists in XML, didn't you?
+    #Re-enumerate the sequence numbers affected
+    #@param resource_name [String] unique id attribute of the resource
+    #@param new_position [Integer, String] new sequence number of the resource, or a string that looks like one
+    #@return [Nokogiri::XML::Element] the resource node
     def move_resource resource_name, new_position
-      xml=self.ng_xml
-      file_node=xml.search('//resource[@id=\''+resource_name+'\']')
-      if(file_node.length!=1)
-        raise 'Resource not found or duplicate found.'
-      end
-      position=file_node.first['sequence'].to_i
-      #is the resource being moved earlier in the sequence or later?
-      new_position=new_position.to_i
-      if new_position>position
-        counter=position
-        while true
-          if counter == position
-            break
-          end
-          item=xml.search('/resource[@id=\''+counter.to_s+'\']').first
-          counter=counter+1
-          item['sequence']=counter.to_s
-        end
-      else
-        counter=position
-        while true
-          if counter == new_position
-            break
-          end
-          item=xml.search('/resource[@id=\''+counter.to_s+'\']').first
-          counter=counter-1
-          item['sequence']=counter.to_s
-        end
+      node = singular_node('//resource[@id=\''+resource_name+'\']')
+      position = node['sequence'].to_i
+      new_position = new_position.to_i              # tolerate strings as a Legacy behavior
+      return node if position == new_position
+      #otherwise, is the resource being moved earlier in the sequence or later?
+      up = new_position>position
+      others = new_position..(up ? position-1 : position+1)  # a range
+      others.each do |i|
+        item = self.ng_xml.at_xpath('/resource[@sequence=\''+i.to_s+'\']')
+        item['sequence'] = (up ? i-1 : i+1).to_s    # if you're going up, everything else comes down and vice versa
       end
+      node['sequence'] = new_position.to_s          # set the node we already had last, so we don't hit it twice!
+      return node
     end
-    #Set the content type to and the resource types for all resources
+
+    #Set the content type and the resource types for all resources
     #@param new_type [String] the new content type, ex book
     #@param new_resource_type [String] the new type for all resources, ex book
     def set_content_type old_type, old_resource_type, new_type, new_resource_type
@@ -309,6 +267,18 @@ module Dor
       end
       self.content=xml.to_s
     end
+
+    # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node
+    # is found.  Otherwise just use .xpath, .at_xpath or .search.
+    #@param xpath [String] accessor invocation for Nokogiri xpath
+    #@return [Nokogiri::XML::Element] the matched element
+    def singular_node xpath
+      node = self.ng_xml.search(xpath)
+      len  = node.length
+      raise "#{xpath} not found" if len < 1
+      raise "#{xpath} duplicated: #{len} found" if len != 1
+      node.first
+    end
   end
 
 end