bplmodels 0.0.91 → 0.0.93

data/app/models/bplmodels/mods_desc_metadata.rb

@@ -77,6 +77,18 @@ module Bplmodels
         }
       }
 
+      #CLASSIFICATION--------------------------------------------------------
+      t.classification(:path => 'classification') {
+        t.displayLabel :path=>{:attribute=>'displayLabel'}
+        t.edition :path =>{:attribute=>"edition"}
+        ::Mods::AUTHORITY_ATTRIBS.each { |attr_name|
+          t.send attr_name, :path =>{:attribute=>"#{attr_name}"}
+        }
+        ::Mods::LANG_ATTRIBS.each { |attr_name|
+          t.send attr_name, :path =>{:attribute=>"#{attr_name}"}
+        }
+      }
+
 =begin
       # CLASSIFICATION -------------------------------------------------------------------------
       t.classification(:path => 'mods/oxns:classification') {
@@ -289,6 +301,8 @@ module Bplmodels
         t.authorityURI(:path=>{:attribute=>"authorityURI"})
         t.valueURI(:path=>{:attribute=>"valueURI"})
         t.subtitle(:path=>"subTitle", :label=>"subtitle")
+        t.part_number(:path=>"partNumber", :label=>"partNumber")
+        t.part_name(:path=>"partName", :label=>"partName")
       }
       t.title(:proxy=>[:title_info, :main_title])
 
@@ -322,6 +336,14 @@ module Bplmodels
         t.issuance(:path=>"issuance")
         t.edition(:path=>"edition")
         t.event_type(:path=>{:attribute=>"eventType"})
+        t.frequency(:path=>"frequency") {
+          t.authority(:path=>{:attribute=>"authority"})
+        }
+      }
+
+      t.target_audience(:path=>"targetAudience") {
+        t.authority(:path=>{:attribute=>"authority"})
+        t.display_label(:path=>{:attribute=>"displayLabel"})
       }
 
       t.item_location(:path=>"location") {
@@ -353,6 +375,7 @@ module Bplmodels
       t.local_accession :path => 'identifier', :attributes => { :type => "local-accession" }
       t.local_call :path => 'identifier', :attributes => { :type => "local-call" }
       t.local_barcode :path => 'identifier', :attributes => { :type => "local-barcode" }
+      t.ia_id :path => 'identifier', :attributes => { :type => "internet-archive" }
       t.identifier_uri :path => 'identifier', :attributes => { :type => "uri" }
 
       t.physical_description(:path=>"physicalDescription") {
@@ -556,7 +579,9 @@ module Bplmodels
       }
 
 
-      t.table_of_contents(:path=>'tableOfContents')
+      t.table_of_contents(:path=>'tableOfContents') {
+        t.href(:path=>{:attribute=>'xlink:href'})
+      }
 
 
     end
@@ -688,6 +713,13 @@ module Bplmodels
       self.mods(0).accessCondition(access_index).displayLabel = displayLabel unless displayLabel.blank?
     end
 
+    def insert_target_audience(value=nil, authority=nil, display_label=nil)
+      audience_index = self.mods(0).target_audience.count
+      self.mods(0).target_audience(audience_index, value) unless value.blank?
+      self.mods(0).target_audience(audience_index).authority = authority unless authority.blank?
+      self.mods(0).target_audience(audience_index).display_label = display_label unless display_label.blank?
+    end
+
 
     def insert_type_of_resource(value=nil, manuscript=nil)
       resource_index = self.mods(0).type_of_resource.count
@@ -824,6 +856,13 @@ module Bplmodels
       self.mods(0).origin_info(origin_index).event_type = event_type unless event_type.blank?
     end
 
+    def insert_origin_frequency(frequency, authority)
+      #Currently only supporting one elements...
+      origin_index = 0
+      self.mods(0).origin_info(origin_index).frequency = frequency unless frequency.blank?
+      self.mods(0).origin_info(origin_index).frequency.authority = authority unless authority.blank?
+    end
+
     def insert_tgn(tgn_id)
       puts 'TGN ID is: ' + tgn_id
 
@@ -947,7 +986,7 @@ module Bplmodels
     end
 
     #usage=nil,  supplied=nil, subtitle=nil, language=nil, type=nil, authority=nil, authorityURI=nil, valueURI=nil
-    def insert_title(nonSort=nil, main_title=nil, usage=nil, supplied=nil, type=nil, subtitle=nil, language=nil, display_label=nil, args={})
+    def insert_title(nonSort=nil, main_title=nil, usage=nil, supplied=nil, type=nil, subtitle=nil, language=nil, display_label=nil, part_number=nil, part_name=nil, args={})
       title_index = self.mods(0).title_info.count
 
       self.mods(0).title_info(title_index).nonSort = nonSort unless nonSort.blank?
@@ -976,6 +1015,10 @@ module Bplmodels
 
       self.mods(0).title_info(title_index).display_label = display_label unless display_label.blank?
 
+      self.mods(0).title_info(title_index).part_number = part_number unless part_number.blank?
+
+      self.mods(0).title_info(title_index).part_name = part_name unless part_name.blank?
+
       if args.present?
         raise 'broken args in Active Fedora 7'
       end
@@ -1104,6 +1147,66 @@ module Bplmodels
 
 
 
+      self.insert_note(converted[:date_note],"date") unless !converted.has_key?(:date_note)
+
+    end
+
+    def insert_oai_date_copyright(date)
+      #converted = Bplmodels::DatastreamInputFuncs.convert_to_mods_date(date)
+      converted = BplEnrich::Dates.standardize(date)
+
+      #date_index =  self.date.length
+      date_index = 0
+      dup_found = false
+
+      #Prevent duplicate entries... Using a flag as keep the potential note?
+      (self.mods(0).date(date_index).dates_copyright.length-1).times do |index|
+        if converted.has_key?(:single_date)
+          if self.mods(0).date(date_index).dates_copyright(index).point.blank? && self.mods(0).date(date_index).dates_copyright(index).first == converted[:single_date]
+            dup_found = true
+          end
+        elsif converted.has_key?(:date_range)
+          if self.mods(0).date(date_index).dates_copyright(index).point == 'start' && self.mods(0).date(date_index).dates_copyright(index).first == converted[:date_range][:start]
+            if self.mods(0).date(date_index).dates_copyright(index+1).point == 'end' && self.mods(0).date(date_index).dates_copyright(index+1).first == converted[:date_range][:end]
+              dup_found = true
+            end
+
+          end
+        end
+      end
+
+      if !dup_found
+        if converted.has_key?(:single_date) && !self.date.dates_copyright.include?(converted[:single_date])
+          date_created_index = self.date(date_index).dates_copyright.length
+          self.date(date_index).dates_copyright(date_created_index, converted[:single_date])
+          self.date(date_index).dates_copyright(date_created_index).encoding = 'w3cdtf'
+          if date_created_index == 0
+            self.date(date_index).dates_copyright(date_created_index).key_date = 'yes'
+          end
+
+          if converted.has_key?(:date_qualifier)
+            self.date(date_index).dates_copyright(date_created_index).qualifier =  converted[:date_qualifier]
+          end
+        elsif converted.has_key?(:date_range)
+          date_created_index = self.date(date_index).dates_copyright.length
+          self.date(date_index).dates_copyright(date_created_index, converted[:date_range][:start])
+          self.date(date_index).dates_copyright(date_created_index).encoding = 'w3cdtf'
+          if date_created_index == 0
+            self.date(date_index).dates_copyright(date_created_index).key_date = 'yes'
+          end
+          self.date(date_index).dates_copyright(date_created_index).point = 'start'
+          self.date(date_index).dates_copyright(date_created_index).qualifier = converted[:date_qualifier]
+
+          date_created_index = self.date(date_index).dates_copyright.length
+          self.date(date_index).dates_copyright(date_created_index, converted[:date_range][:end])
+          self.date(date_index).dates_copyright(date_created_index).encoding = 'w3cdtf'
+          self.date(date_index).dates_copyright(date_created_index).point = 'end'
+          self.date(date_index).dates_copyright(date_created_index).qualifier = converted[:date_qualifier]
+        end
+      end
+
+
+
       self.insert_note(converted[:date_note],"date") unless !converted.has_key?(:date_note)
 
     end
@@ -1639,9 +1742,10 @@ module Bplmodels
       self.find_by_terms(:subject_cartographic).slice(index.to_i).remove
     end
 
-    def insert_table_of_contents(value)
+    def insert_table_of_contents(text_value, url=nil)
       contents_index = self.mods(0).table_of_contents.count
-      self.mods(0).table_of_contents(contents_index, value) unless value.blank?
+      self.mods(0).table_of_contents(contents_index, text_value) unless text_value.blank?
+      self.mods(0).table_of_contents(contents_index).href = url unless url.blank?
     end
 
     def remove_table_of_contents(index)
@@ -1765,16 +1869,28 @@ module Bplmodels
     def insert_identifier(identifier=nil, type=nil, display_label=nil, invalid=nil)
       identifier_index = self.mods(0).identifier.count
 
-      self.mods(0).identifier(identifier_index, identifier) unless identifier.blank?
-      self.mods(0).identifier(identifier_index).type_at = type unless type.blank?
-      self.mods(0).identifier(identifier_index).displayLabel = display_label unless display_label.blank?
-      self.mods(0).identifier(identifier_index).invalid = 'yes' if (invalid.present? && invalid == 'yes')
+      if identifier.present?
+        self.mods(0).identifier(identifier_index, identifier) unless identifier.blank?
+        self.mods(0).identifier(identifier_index).type_at = type unless type.blank?
+        self.mods(0).identifier(identifier_index).displayLabel = display_label unless display_label.blank?
+        self.mods(0).identifier(identifier_index).invalid = 'yes' if (invalid.present? && invalid == 'yes')
+      end
     end
 
     def remove_identifier(index)
       self.find_by_terms(:identifier).slice(index.to_i).remove
     end
 
+    def insert_classification(value=nil, edition=nil, authority=nil, display_label=nil)
+      classification_index = self.mods(0).classification.count
+      if value.present?
+        self.mods(0).classification(classification_index, value)
+        self.mods(0).classification(classification_index).edition = edition unless edition.blank?
+        self.mods(0).classification(classification_index).authority = authority unless authority.blank?
+        self.mods(0).classification(classification_index).displayLabel = display_label unless display_label.blank?
+      end
+    end
+
 
   define_template :mcgreevy do |xml|
     xml.recordInfo {

data/app/models/bplmodels/object_base.rb

@@ -13,20 +13,33 @@ module Bplmodels
 
     has_many :document_files, :class_name => "Bplmodels::DocumentFile", :property=> :is_document_of
 
+    has_many :ereader_files, :class_name => "Bplmodels::EreaderFile", :property=> :is_ereader_of
+
     has_many :files, :class_name => "Bplmodels::File", :property=> :is_file_of
 
 
 
     belongs_to :institution, :class_name => 'Bplmodels::Institution', :property => :is_member_of
 
-    belongs_to :collection, :class_name => 'Bplmodels::Collection', :property => :is_member_of_collection
+    has_and_belongs_to_many :collection, :class_name => 'Bplmodels::Collection', :property => :is_member_of_collection
+
+    #has_and_belongs_to_many :organization, :class_name => 'Bplmodels::Collection', :property => :is_member_of_collection
+
+    belongs_to :admin_set, :class_name => 'Bplmodels::Collection', :property => :administrative_set
 
-    belongs_to :organization, :class_name => 'Bplmodels::Collection', :property => :is_member_of_collection
     has_and_belongs_to_many :members, :class_name=> "Bplmodels::Collection", :property=> :hasSubset
 
     has_metadata :name => "descMetadata", :type => ModsDescMetadata
     has_metadata :name => "workflowMetadata", :type => WorkflowMetadata
 
+    has_file_datastream 'marc', versionable: false, label: 'MARC metadata'
+    has_file_datastream 'marcXML', versionable: false, label: 'MARC XML metadata'
+    has_file_datastream 'iaMeta', versionable: false, label: 'Internet Archive metadata'
+    has_file_datastream 'scanData', versionable: false, label: 'Internet Archive scanData metadata'
+    has_file_datastream 'plainText', versionable: false, label: 'Plain Text representation of this object'
+    has_file_datastream 'djvuXML', versionable: false, label: 'XML version of DJVU output'
+    has_file_datastream 'abbyy', versionable: false, label: 'Abbyy OCR of this object'
+
     # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
     has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
 
@@ -69,6 +82,10 @@ module Bplmodels
       self.add_relationship(:oai_item_id, "oai:digitalcommonwealth.org:" + self.pid, true)
     end
 
+    def remove_oai_relationships
+      self.remove_relationship(:oai_item_id, "oai:digitalcommonwealth.org:" + self.pid, true)
+    end
+
     #alias :limited_delete :delete
 
 =begin
@@ -86,6 +103,55 @@ module Bplmodels
           }
         end
       end
+
+      #FIXME: What if this is interuppted? Need to do this better...
+      #Broken so no match for now
+      if self.class.name == "Bplmodels::Volume2"
+        next_object = nil
+        previous_object = nil
+        #volume_object = Bplmodels::Finder.getVolumeObjects(self.pid)
+        self.relationships.each_statement do |statement|
+          puts statement.predicate
+          if statement.predicate == "http://projecthydra.org/ns/relations#isPrecedingVolumeOf"
+            next_object = ActiveFedora::Base.find(statement.object.to_s.split('/').last).adapt_to_cmodel
+          elsif statement.predicate == "http://projecthydra.org/ns/relations#isFollowingVolumeOf"
+            previous_object = ActiveFedora::Base.find(statement.object.to_s.split('/').last).adapt_to_cmodel
+          end
+        end
+
+        if next_object.present? and previous_object.present?
+          next_object.relationships.each_statement do |statement|
+            if statement.predicate == "http://projecthydra.org/ns/relations#isFollowingVolumeOf"
+              next_object.remove_relationship(:is_following_volume_of, statement.object)
+            end
+          end
+
+          previous_object.relationships.each_statement do |statement|
+            if statement.predicate == "http://projecthydra.org/ns/relations#isPrecedingVolumeOf"
+              previous_object.remove_relationship(:is_preceding_volume_of, statement.object)
+            end
+          end
+
+          next_object.add_relationship(:is_following_volume_of, "info:fedora/#{previous_object.pid}", true)
+          previous_object.add_relationship(:is_preceding_volume_of, "info:fedora/#{next_object.pid}", true)
+          next_object.save
+          previous_object.save
+        elsif next_object.present? and previous_object.blank?
+          next_object.relationships.each_statement do |statement|
+            if statement.predicate == "http://projecthydra.org/ns/relations#isFollowingVolumeOf"
+              next_object.remove_relationship(:is_following_volume_of, statement.object)
+            end
+          end
+
+        elsif  next_object.blank? and previous_object.present?
+          previous_object.relationships.each_statement do |statement|
+            if statement.predicate == "http://projecthydra.org/ns/relations#isPrecedingVolumeOf"
+              previous_object.remove_relationship(:is_preceding_volume_of, statement.object)
+            end
+          end
+        end
+       self.collection.first.update_index
+      end
       super()
     end
 
@@ -95,9 +161,10 @@ module Bplmodels
       #if !self.instance_of?(klass)
       adapted_object = self.adapt_to(klass)
 
-      self.relationships.each_statement do |statement|
+      adapted_object.relationships.each_statement do |statement|
         if statement.predicate == "info:fedora/fedora-system:def/model#hasModel"
-          self.remove_relationship(:has_model, statement.object)
+          adapted_object.remove_relationship(:has_model, statement.object)
+          #puts statement.object
         end
       end
 
@@ -124,7 +191,8 @@ module Bplmodels
 
 
       doc['label_ssim'] = self.label.to_s
-      #1995-12-31T23:59:59.999Z
+
+      # dates
       doc['date_start_dtsi'] = []
       doc['date_start_tsim'] = []
       doc['date_end_dtsi'] = []
@@ -132,16 +200,23 @@ module Bplmodels
       doc['date_facet_ssim'] = []
       doc['date_type_ssm'] = []
       doc['date_start_qualifier_ssm'] = []
+      doc['note_date_tsim'] = []
       dates_static = []
       dates_start = []
       dates_end = []
 
+      # these values get appended to dates in _dtsi Solr format
+      start_date_suffix_for_yyyy = '-01-01T00:00:00.000Z'
+      start_date_suffix_for_yyyymm = '-01T01:00:00.000Z'
+      start_date_suffix_for_yyyymmdd = 'T00:00:00.000Z'
+      end_date_suffix_for_yyyy = '-12-31T23:59:59.999Z'
+      end_date_suffix_for_yyyymm = '-28T23:59:59.999Z' # TODO: end DD value should depend on MM value ('31' for Jan., '28' for Feb., etc.)
+      end_date_suffix_for_yyyymmdd = 'T23:59:59.999Z'
+
       # dateOther
-      if self.descMetadata.date(0).date_other[0] != nil && self.descMetadata.date(0).date_other.length > 0
-        if self.descMetadata.date(0).date_other[0] == 'undated'
-          # do nothing -- don't want to index this
-        else
-          # TODO insert code for date_other values here
+      if self.descMetadata.date(0).date_other[0]
+        self.descMetadata.date(0).date_other.each do |date_other|
+          doc['note_date_tsim'] << date_other
         end
       end
 
@@ -151,8 +226,8 @@ module Bplmodels
         #dateCreated
         if self.descMetadata.date(0).dates_created[0]
           self.descMetadata.date(0).dates_created.each_with_index do |date,index|
-          #FIXME: Has to add "date.present" and the when '' case for oai-test:h415pc718
-           if date.present?
+            #FIXME: Has to add "date.present" and the when '' case for oai-test:h415pc718
+            if date.present?
               case self.descMetadata.date(0).dates_created(index).point[0]
                 when nil, ''
                   dates_static << date
@@ -216,48 +291,63 @@ module Bplmodels
         end
 
         # set the date ranges for date-time fields and decade faceting
-        earliest_date = (dates_static + dates_start).sort[0]
+        sorted_start_dates = (dates_static + dates_start).sort
+        earliest_date = sorted_start_dates[0]
         date_facet_start = earliest_date[0..3].to_i
-
-        if earliest_date.length == 4
-          doc['date_start_dtsi'].append(earliest_date + '-01-01T00:00:00.000Z')
-        elsif earliest_date.length == 7
-          doc['date_start_dtsi'].append(earliest_date + '-01T01:00:00.000Z')
-        elsif earliest_date.length > 11
-          doc['date_start_dtsi'].append(earliest_date)
-        else
-          doc['date_start_dtsi'].append(earliest_date + 'T00:00:00.000Z')
+        latest_date = dates_end.sort.reverse[0]
+
+        # set earliest date
+        if earliest_date =~ /[0-9]{4}[0-9-]*\z/ # rough date format matching
+          if earliest_date.length == 4
+            doc['date_start_dtsi'].append(earliest_date + start_date_suffix_for_yyyy)
+          elsif earliest_date.length == 7
+            doc['date_start_dtsi'].append(earliest_date + start_date_suffix_for_yyyymm)
+          elsif earliest_date.length > 11
+            doc['date_start_dtsi'].append(earliest_date)
+          else
+            doc['date_start_dtsi'].append(earliest_date + start_date_suffix_for_yyyymmdd)
+          end
         end
 
-        if dates_end[0]
-          latest_date = dates_end.reverse[0]
+        # set latest date
+        if latest_date && latest_date =~ /[0-9]{4}[0-9-]*\z/
           date_facet_end = latest_date[0..3].to_i
           if latest_date.length == 4
-            doc['date_end_dtsi'].append(latest_date + '-12-31T23:59:59.999Z')
+            doc['date_end_dtsi'].append(latest_date + end_date_suffix_for_yyyy)
           elsif latest_date.length == 7
-            # TODO: DD value should be dependent on MM value
-            # e.g., '31' for January, but '28' for February, etc.
-            doc['date_end_dtsi'].append(latest_date + '-28T23:59:59.999Z')
+            doc['date_end_dtsi'].append(latest_date + end_date_suffix_for_yyyymm)
           elsif latest_date.length > 11
             doc['date_end_dtsi'].append(latest_date)
           else
-            doc['date_end_dtsi'].append(latest_date + 'T23:59:59.999Z')
+            doc['date_end_dtsi'].append(latest_date + end_date_suffix_for_yyyymmdd)
           end
         else
           date_facet_end = 0
+          latest_start_date = sorted_start_dates[-1]
+          if latest_start_date =~ /[0-9]{4}[0-9-]*\z/
+            if latest_start_date.length == 4
+              doc['date_end_dtsi'].append(latest_start_date + end_date_suffix_for_yyyy)
+            elsif latest_start_date.length == 7
+              doc['date_end_dtsi'].append(latest_start_date + end_date_suffix_for_yyyymm)
+            elsif latest_start_date.length > 11
+              doc['date_end_dtsi'].append(latest_start_date)
+            else
+              doc['date_end_dtsi'].append(latest_start_date + end_date_suffix_for_yyyymmdd)
+            end
+          end
         end
 
         # decade faceting
-        (1500..2020).step(10) do |index|
-          if ((date_facet_start >= index && date_facet_start < index+10) || (date_facet_end != -1 && index > date_facet_start && date_facet_end >= index))
+        (1100..2020).step(10) do |index|
+          if (date_facet_start >= index && date_facet_start < index+10) || (date_facet_end != -1 && index > date_facet_start && date_facet_end >= index)
             doc['date_facet_ssim'].append(index.to_s + 's')
           end
         end
 
         doc['date_facet_yearly_ssim'] = []
         # yearly faceting
-        (1500..2020).step(1) do |index|
-          if ((date_facet_start >= index && date_facet_start < index+1) || (date_facet_end != -1 && index > date_facet_start && date_facet_end >= index))
+        (1100..2020).step(1) do |index|
+          if (date_facet_start >= index && date_facet_start < index+1) || (date_facet_end != -1 && index > date_facet_start && date_facet_end >= index)
             doc['date_facet_yearly_ssim'].append(index.to_s + 's')
           end
         end
@@ -293,26 +383,48 @@ module Bplmodels
       doc['identifier_local_barcode_tsim'] = self.descMetadata.local_barcode
       doc['identifier_isbn_tsim'] = self.descMetadata.isbn
       doc['identifier_lccn_tsim'] = self.descMetadata.lccn
+      doc['identifier_ia_id_ssi'] = self.descMetadata.ia_id
 
       doc['identifier_ark_ssi'] = ''
 
       doc['local_accession_id_tsim'] = self.descMetadata.local_accession[0].to_s
-      if self.collection
-        doc['collection_name_ssim'] = self.collection.label.to_s
-        doc['collection_name_tsim'] = self.collection.label.to_s
-        doc['collection_pid_ssm'] = self.collection.pid
-
-        if self.collection
-          if self.collection.institutions
-            doc['institution_name_ssim'] = self.collection.institutions.label.to_s
-            doc['institution_name_tsim'] = self.collection.institutions.label.to_s
-            doc['institution_pid_ssi'] = self.collection.institutions.pid
-          end
+
+      #Assign collection, admin, and institution labels
+      doc['collection_name_ssim'] = []
+      doc['collection_name_tsim'] = []
+      doc['collection_pid_ssm'] = []
+
+      object_institution_pid = nil
+      object_collections = self.relationships(:is_member_of_collection)
+      object_collections.each do |collection_ident|
+        solr_response_collection = ActiveFedora::Base.find_with_conditions("id"=>collection_ident.gsub('info:fedora/','')).first
+        doc['collection_name_ssim'] << solr_response_collection["label_ssim"].first.to_s
+        doc['collection_name_tsim'] << solr_response_collection["label_ssim"].first.to_s
+        doc['collection_pid_ssm'] << solr_response_collection["id"].to_s
+
+        if object_institution_pid.blank?
+          object_institution_pid = solr_response_collection['institution_pid_ssi']
+          solr_response_institution = ActiveFedora::Base.find_with_conditions("id"=>object_institution_pid).first
+          doc['institution_name_ssim'] = solr_response_institution["label_ssim"].first.to_s
+          doc['institution_name_tsim'] = solr_response_institution["label_ssim"].first.to_s
+          doc['institution_pid_ssi'] = solr_response_institution["id"].to_s
+          doc['institution_pid_si'] = solr_response_institution["id"].to_s
         end
+      end
 
+      object_admin_set = self.relationships(:administrative_set).first
+      if object_admin_set.present?
+        solr_response_admin = ActiveFedora::Base.find_with_conditions("id"=>object_admin_set.gsub('info:fedora/','')).first
+        doc['admin_set_name_ssim'] = solr_response_admin["label_ssim"].first.to_s
+        doc['admin_set_name_tsim'] = solr_response_admin["label_ssim"].first.to_s
+        doc['admin_set_pid_ssm'] = solr_response_admin["id"].to_s
+      else
+        raise "Potential problem setting administrative set?"
       end
 
 
+
+
       #self.descMetadata.identifier_uri.each do |identifier|
       #if idenfifier.include?("ark")
       #doc['identifier_uri_ss']  =  self.descMetadata.identifier_uri
@@ -333,6 +445,8 @@ module Bplmodels
 
       doc['issuance_tsim'] = self.descMetadata.origin_info.issuance
 
+      doc['classification_tsim'] = self.descMetadata.classification
+
       doc['lang_term_ssim'] = self.descMetadata.language.language_term
       #doc['lang_val_uri_ssim'] = self.descMetadata.language.language_term.lang_val_uri
 
@@ -396,7 +510,7 @@ module Bplmodels
             doc['name_personal_tsim'].append(self.descMetadata.mods(0).name(index).namePart[0])
           end
           if self.descMetadata.mods(0).name(index).role.length > 1
-            doc['name_personal_role_tsim'].append(self.descMetadata.mods(0).name(0).role.join('||').gsub(/[\n]\s*/,''))
+            doc['name_personal_role_tsim'].append(self.descMetadata.mods(0).name(index).role.join('||').gsub(/[\n]\s*/,''))
           else
             doc['name_personal_role_tsim'].append(self.descMetadata.mods(0).name(index).role.text[0])
           end
@@ -411,7 +525,7 @@ module Bplmodels
             doc['name_corporate_tsim'].append(corporate_name)
           end
           if self.descMetadata.mods(0).name(index).role.length > 1
-            doc['name_corporate_role_tsim'].append(self.descMetadata.mods(0).name(0).role.join('||').gsub(/[\n]\s*/,''))
+            doc['name_corporate_role_tsim'].append(self.descMetadata.mods(0).name(index).role.join('||').gsub(/[\n]\s*/,''))
           else
             doc['name_corporate_role_tsim'].append(self.descMetadata.mods(0).name(index).role.text[0])
           end
@@ -423,7 +537,7 @@ module Bplmodels
             doc['name_generic_tsim'].append(self.descMetadata.mods(0).name(index).namePart[0])
           end
           if self.descMetadata.mods(0).name(index).role.length > 1
-            doc['name_generic_role_tsim'].append(self.descMetadata.mods(0).name(0).role.join('||').gsub(/[\n]\s*/,''))
+            doc['name_generic_role_tsim'].append(self.descMetadata.mods(0).name(index).role.join('||').gsub(/[\n]\s*/,''))
           else
             doc['name_generic_role_tsim'].append(self.descMetadata.mods(0).name(index).role.text[0])
           end
@@ -440,12 +554,12 @@ module Bplmodels
       doc['digital_origin_ssi']  = self.descMetadata.physical_description(0).digital_origin[0]
       doc['internet_media_type_ssim']  = self.descMetadata.physical_description(0).internet_media_type
 
-      doc['physical_location_ssim']  = self.descMetadata.item_location(0).physical_location
-      doc['physical_location_tsim']  = self.descMetadata.item_location(0).physical_location
+      doc['physical_location_ssim']  = self.descMetadata.item_location.physical_location
+      doc['physical_location_tsim']  = self.descMetadata.item_location.physical_location
 
-      doc['sub_location_tsim']  = self.descMetadata.item_location(0).holding_simple(0).copy_information(0).sub_location
+      doc['sub_location_tsim']  = self.descMetadata.item_location.holding_simple.copy_information.sub_location
 
-      doc['shelf_locator_tsim']  = self.descMetadata.item_location(0).holding_simple(0).copy_information(0).shelf_locator
+      doc['shelf_locator_tsim']  = self.descMetadata.item_location.holding_simple.copy_information.shelf_locator
 
       doc['subject_topic_tsim'] = self.descMetadata.subject.topic
 
@@ -608,52 +722,6 @@ module Bplmodels
 
       end
 
-=begin
-      new_logger = Logger.new('log/geo_log')
-      new_logger.level = Logger::ERROR
-
-      #Blacklight-maps esque placename_coords
-      0.upto self.descMetadata.subject.length-1 do |subject_index|
-       if self.descMetadata.mods(0).subject(subject_index).cartographics.present? && self.descMetadata.mods(0).subject(subject_index).cartographics.scale.blank?
-         place_name = "Results"
-
-         if self.descMetadata.mods(0).subject(subject_index).authority == ['tgn'] && self.descMetadata.mods(0).subject(subject_index).hierarchical_geographic[0].blank?
-           new_logger.error "Weird Geography for: " + self.pid
-         end
-
-         if self.descMetadata.mods(0).subject(subject_index).authority == ['tgn'] && self.descMetadata.mods(0).subject(subject_index).hierarchical_geographic[0].present?
-           place_locations = []
-           self.descMetadata.mods(0).subject(subject_index).hierarchical_geographic[0].split("\n").each do |split_geo|
-             split_geo = split_geo.strip
-             place_locations << split_geo if split_geo.present? && !split_geo.include?('North and Central America') && !split_geo.include?('United States')
-           end
-           place_name = place_locations.reverse.join(', ')
-         elsif self.descMetadata.mods(0).subject(subject_index).geographic.present?
-           place_name = self.descMetadata.mods(0).subject(subject_index).geographic.first
-         end
-
-         doc['subject_blacklight_maps_ssim'] = "#{place_name}-|-#{self.descMetadata.mods(0).subject(subject_index).cartographics.coordinates[0].split(',').first}-|-#{self.descMetadata.mods(0).subject(subject_index).cartographics.coordinates[0].split(',').last}"
-       end
-      end
-=end
-      #Blacklight-maps coords only
-=begin
-      best_coords_found = false
-      0.upto self.descMetadata.subject.length-1 do |subject_index|
-        if self.descMetadata.mods(0).subject(subject_index).cartographics.present?
-          if self.descMetadata.mods(0).subject(subject_index).authority.present? && self.descMetadata.mods(0).subject(subject_index).authority != ['tgn']
-            best_coords_found = true
-            doc['subject_blacklight_maps_coords_ssim'] = self.descMetadata.mods(0).subject(subject_index).cartographics.coordinates[0]
-          end
-        end
-      end
-      0.upto self.descMetadata.subject.length-1 do |subject_index|
-        if self.descMetadata.mods(0).subject(subject_index).cartographics.present? && !best_coords_found
-            doc['subject_blacklight_maps_coords_ssim'] = self.descMetadata.mods(0).subject(subject_index).cartographics.coordinates[0]
-        end
-      end
-=end
-
       # name subjects
       doc['subject_name_personal_tsim'] = []
       doc['subject_name_corporate_tsim'] = []
@@ -687,59 +755,79 @@ module Bplmodels
 
       end
 
-      #doc['subject_facet_ssim'] = self.descMetadata.subject.topic  +  self.descMetadata.subject.corporate_name.name_part + self.descMetadata.subject.personal_name.name_part
-
       doc['subject_facet_ssim'].concat(self.descMetadata.subject.topic)
 
       # temporal subjects
       if self.descMetadata.subject.temporal.length > 0
+
         doc['subject_temporal_start_tsim'] = []
         doc['subject_temporal_start_dtsim'] = []
         doc['subject_temporal_facet_ssim'] = []
+        doc['subject_temporal_end_tsim'] = []
+        doc['subject_temporal_end_dtsim'] = []
         subject_date_range_start = []
         subject_date_range_end = []
+
         self.descMetadata.subject.temporal.each_with_index do |value,index|
           if self.descMetadata.subject.temporal.point[index] != 'end'
-            subject_temporal_start = value
-            doc['subject_temporal_start_tsim'].append(subject_temporal_start)
-            subject_date_range_start.append(subject_temporal_start)
-            # subject_temporal_start.length > 4 ? subject_date_range_start.append(subject_temporal_start[0..3]) : subject_date_range_start.append(subject_temporal_start)
-            if subject_temporal_start.length == 4
-              doc['subject_temporal_start_dtsim'].append(subject_temporal_start + '-01-01T00:00:00.000Z')
-            elsif subject_temporal_start.length == 7
-              doc['subject_temporal_start_dtsim'].append(subject_temporal_start + '-01T01:00:00.000Z')
-            else
-              doc['subject_temporal_start_dtsim'].append(subject_temporal_start + 'T00:00:00.000Z')
+            doc['subject_temporal_start_tsim'] << value
+            subject_date_range_start << value
+            # if there is no accompanying end date, create nil value placeholders
+            unless self.descMetadata.subject.temporal.point[index+1] == 'end'
+              subject_date_range_end << nil
+              doc['subject_temporal_end_tsim'] << 'nil'
             end
           else
-            doc['subject_temporal_end_tsim'] = []
-            doc['subject_temporal_end_dtsim'] = []
-            subject_temporal_end = value
-            doc['subject_temporal_end_tsim'].append(subject_temporal_end)
-            subject_date_range_end.append(subject_temporal_end)
-            # subject_temporal_end.length > 4 ? subject_date_range_end.append(subject_temporal_end[0..3]) : subject_date_range_end.append(subject_temporal_end)
-            if subject_temporal_end.length == 4
-              doc['subject_temporal_end_dtsim'].append(subject_temporal_end + '-01-01T00:00:00.000Z')
-            elsif subject_temporal_end.length == 7
-              doc['subject_temporal_end_dtsim'].append(subject_temporal_end + '-01T01:00:00.000Z')
-            else
-              doc['subject_temporal_end_dtsim'].append(subject_temporal_end + 'T00:00:00.000Z')
-            end
+            doc['subject_temporal_end_tsim'] << value
+            subject_date_range_end << value
           end
         end
 
         if subject_date_range_start.length > 0
           subject_date_range_start.each_with_index do |date_start,index|
-            if subject_date_range_end.present?
-              doc['subject_temporal_facet_ssim'].append(date_start[0..3] + '-' + subject_date_range_end[index][0..3])
+            formatted_date_subject_start = false
+            formatted_date_subject_end = false
+            if date_start =~ /[0-9]{4}[0-9-]*\z/ # rough check for date formatting
+              formatted_date_subject_start = true
+              if date_start.length == 7
+                doc['subject_temporal_start_dtsim'] << date_start + start_date_suffix_for_yyyymm
+              elsif date_start.length == 10
+                doc['subject_temporal_start_dtsim'] << date_start + start_date_suffix_for_yyyymmdd
+              else
+                doc['subject_temporal_start_dtsim'] << date_start[0..3] + start_date_suffix_for_yyyy
+              end
+            end
+            if subject_date_range_end[index]
+              doc['subject_temporal_facet_ssim'] << date_start[0..3] + '-' + subject_date_range_end[index][0..3]
+              if formatted_date_subject_start
+                if subject_date_range_end[index] =~ /[0-9]{4}[0-9-]*\z/ # rough check for date formatting
+                  formatted_date_subject_end = true
+                  if subject_date_range_end[index].length == 7
+                    doc['subject_temporal_end_dtsim'] << subject_date_range_end[index] + end_date_suffix_for_yyyymm
+                  elsif subject_date_range_end[index].length == 10
+                    doc['subject_temporal_end_dtsim'] << subject_date_range_end[index] + end_date_suffix_for_yyyymmdd
+                  else
+                    doc['subject_temporal_end_dtsim'] << subject_date_range_end[index][0..3] + end_date_suffix_for_yyyy
+                  end
+                end
+              end
             else
-              doc['subject_temporal_facet_ssim'].append(date_start)
+              doc['subject_temporal_facet_ssim'] << date_start
+            end
+            if formatted_date_subject_start && !formatted_date_subject_end
+              if date_start.length == 7
+                doc['subject_temporal_end_dtsim'] << date_start + end_date_suffix_for_yyyymm
+              elsif date_start.length == 10
+                doc['subject_temporal_end_dtsim'] << date_start + end_date_suffix_for_yyyymmdd
+              else
+                doc['subject_temporal_end_dtsim'] << date_start[0..3] + end_date_suffix_for_yyyy
+              end
             end
           end
         end
 
+        # add temporal subject values to subject facet field
         doc['subject_facet_ssim'].concat(doc['subject_temporal_facet_ssim'])
-
       end
 
       # title subjects
@@ -762,7 +850,8 @@ module Bplmodels
       if doc['subject_geo_nonhier_ssim'] && doc['subject_hiergeo_geojson_ssm']
         doc['subject_geo_nonhier_ssim'].each do |non_hier_geo_subj|
           doc['subject_hiergeo_geojson_ssm'].each do |hiergeo_geojson_feature|
-            if hiergeo_geojson_feature.match(/#{non_hier_geo_subj}/)
+            #if hiergeo_geojson_feature.match(/#{non_hier_geo_subj}/)
+            if hiergeo_geojson_feature.include?(non_hier_geo_subj)
               doc['subject_geo_nonhier_ssim'].delete(non_hier_geo_subj)
             end
           end
@@ -786,12 +875,12 @@ module Bplmodels
 
       doc['note_tsim'] = []
       doc['note_resp_tsim'] = []
-      doc['note_date_tsim'] = []
       doc['note_performers_tsim'] = []
       doc['note_acquisition_tsim'] = []
       doc['note_ownership_tsim'] = []
       doc['note_citation_tsim'] = []
       doc['note_reference_tsim'] = []
+      doc['note_physical_tsim'] = []
 
       0.upto self.descMetadata.note.length-1 do |index|
         if self.descMetadata.note(index).type_at.first == 'statement of responsibility'
@@ -813,11 +902,10 @@ module Bplmodels
         end
       end
 
-
       0.upto self.descMetadata.physical_description.length-1 do |physical_index|
         0.upto self.descMetadata.physical_description(physical_index).note.length-1 do |note_index|
           if self.descMetadata.physical_description(physical_index).note(note_index).first != nil
-            doc['note_tsim'].append(self.descMetadata.physical_description(physical_index).note(note_index).first)
+            doc['note_physical_tsim'].append(self.descMetadata.physical_description(physical_index).note(note_index).first)
           end
         end
       end
@@ -833,12 +921,16 @@ module Bplmodels
             if self.descMetadata.mods(0).title_info(index).display_label[0] == 'primary_display'
               doc['title_info_primary_tsi'] = title_prefix + title_value
               doc['title_info_primary_ssort'] = title_value
+              doc['title_info_partnum_tsi'] = self.descMetadata.mods(0).title_info(index).part_number
+              doc['title_info_partname_tsi'] = self.descMetadata.mods(0).title_info(index).part_name
             else
               doc['title_info_primary_trans_tsim'] << title_prefix + title_value
             end
           else
             doc['title_info_primary_tsi'] = title_prefix + title_value
             doc['title_info_primary_ssort'] = title_value
+            doc['title_info_partnum_tsi'] = self.descMetadata.mods(0).title_info(index).part_number
+            doc['title_info_partname_tsi'] = self.descMetadata.mods(0).title_info(index).part_name
           end
           if self.descMetadata.mods(0).title_info(index).supplied[0] == 'yes'
             doc['supplied_title_bs'] = 'true'
@@ -858,11 +950,6 @@ module Bplmodels
 
       doc['subtitle_tsim'] = self.descMetadata.title_info.subtitle
 
-      if self.collection
-        if self.collection.institutions
-          doc['institution_pid_si'] = self.collection.institutions.pid
-        end
-      end
 
       if self.workflowMetadata
         doc['workflow_state_ssi'] = self.workflowMetadata.item_status.state
@@ -875,6 +962,57 @@ module Bplmodels
         }
       end
 
+=begin
+      ocr_text_normal = ''
+      ocr_text_squished = ''
+      ActiveFedora::Base.find_in_batches('is_image_of_ssim'=>"info:fedora/#{self.pid}") do |group|
+        group.each { |image_file|
+          if image_file['has_ocr_master_ssi'] == 'true'
+            ocr_text_normal += image_file['full_ocr_ssi']
+            ocr_text_squished += image_file['compressed_ocr_ssi']
+          end
+
+        }
+      end
+
+      doc['full_ocr_si'] = ocr_text_normal[0..10000] if ocr_text_normal.present?
+      doc['full_ocr_ssi'] = ocr_text_normal[0..10000] if ocr_text_normal.present?
+      doc['compressed_ocr_si'] = ocr_text_squished[0..10000] if ocr_text_squished.present?
+      doc['compressed_ocr_ssi'] = ocr_text_squished[0..10000] if ocr_text_squished.present?
+=end
+
+      if self.plainText.present?
+        doc['ocr_tiv'] = self.plainText.content.squish
+
+        pages_ocr_check = Bplmodels::ImageFile.find_with_conditions({"is_image_of_ssim"=>"info:fedora/#{self.pid}","has_ocr_text_bsi"=>"true"}, rows: '1', fl: 'id,has_ocr_text_bsi' )
+        doc['has_searchable_text_bsi'] = true if pages_ocr_check.present?
+      end
+
+      if self.scanData.present?
+        scan_data_xml = Nokogiri::XML(self.scanData.content)
+        #See http://archive.org/download/handbookforkitch00neel (created in 2009) for a record lacking this
+        doc['text_direction_ssi'] = scan_data_xml.xpath("//globalHandedness/page-progression").first.text if scan_data_xml.xpath("//globalHandedness/page-progression").first.present?
+      end
+
+      #Handle the case of multiple volumes...
+      if self.class.name == 'Bplmodels::Book'
+        volume_check = Bplmodels::Finder.getVolumeObjects(self.pid)
+        if volume_check.present?
+          doc['ocr_tiv'] = ''
+          volume_check.each do |volume|
+            #FIXME!!!
+            volume_object = ActiveFedora::Base.find(volume['id']).adapt_to_cmodel
+            doc['ocr_tiv'] += volume_object.plainText.content.squish + ' ' if volume_object.plainText.present?
+          end
+        end
+      end
+
+
+      if self.workflowMetadata.volume_match_md5s.present?
+        doc['marc_md5_sum_ssi'] = self.workflowMetadata.volume_match_md5s.marc.first
+        doc['iaMeta_matcher_md5_ssi'] = self.workflowMetadata.volume_match_md5s.iaMeta.first
+      end
+
       if self.workflowMetadata.marked_for_deletion.present?
         doc['marked_for_deletion_bsi']  =  self.workflowMetadata.marked_for_deletion.first
         doc['marked_for_deletion_reason_ssi']  =  self.workflowMetadata.marked_for_deletion.reason.first
@@ -898,14 +1036,28 @@ module Bplmodels
     #local_id_type => type of that local ID
     #label => label of the object
     #institution_pid => instituional access of this file
+    #secondary_parent_pids => optional array of additional parent pids
     def self.mint(args)
 
+      expected_aguments = [:parent_pid, :local_id, :local_id_type, :institution_pid, :secondary_parent_pids]
+      expected_aguments.each do |arg|
+        if !args.keys.include?(arg)
+          raise "Mint called but missing parameter: #{arg}"
+        end
+      end
+
       #TODO: Duplication check here to prevent over-writes?
 
       args[:namespace_id] ||= ARK_CONFIG_GLOBAL['namespace_commonwealth_pid']
+      args[:secondary_parent_pids] ||= []
 
-      response = Typhoeus::Request.post(ARK_CONFIG_GLOBAL['url'] + "/arks.json", :params => {:ark=>{:parent_pid=>args[:parent_pid], :namespace_ark => ARK_CONFIG_GLOBAL['namespace_commonwealth_ark'], :namespace_id=>args[:namespace_id], :url_base => ARK_CONFIG_GLOBAL['ark_commonwealth_base'], :model_type => self.name, :local_original_identifier=>args[:local_id], :local_original_identifier_type=>args[:local_id_type]}})
-      as_json = JSON.parse(response.body)
+      response = Typhoeus::Request.post(ARK_CONFIG_GLOBAL['url'] + "/arks.json", :params => {:ark=>{:parent_pid=>args[:parent_pid], :secondary_parent_pids=>args[:secondary_parent_pids], :namespace_ark => ARK_CONFIG_GLOBAL['namespace_commonwealth_ark'], :namespace_id=>args[:namespace_id], :url_base => ARK_CONFIG_GLOBAL['ark_commonwealth_base'], :model_type => self.name, :local_original_identifier=>args[:local_id], :local_original_identifier_type=>args[:local_id_type]}})
+
+      begin
+        as_json = JSON.parse(response.body)
+      rescue => ex
+        raise('Error in JSON response for minting an object pid.')
+      end
 
       puts as_json['pid']
 
@@ -926,6 +1078,12 @@ module Bplmodels
       object = self.new(:pid=>as_json["pid"])
 
       object.add_relationship(:is_member_of_collection, "info:fedora/" + args[:parent_pid])
+      object.add_relationship(:administrative_set, "info:fedora/" + args[:parent_pid])
+
+      args[:secondary_parent_pids].each do |other_collection_pid|
+        object.add_relationship(:is_member_of_collection, "info:fedora/" + other_collection_pid)
+      end
+
       object.add_oai_relationships
 
       object.label = args[:label] if args[:label].present?
@@ -952,41 +1110,121 @@ module Bplmodels
       return ARK_CONFIG_GLOBAL['url'] + '/ark:/' + ARK_CONFIG_GLOBAL["namespace_commonwealth_ark"].to_s + "/" + self.pid.split(':').last.to_s
     end
 
+    def insert_marc(file_content)
+      self.marc.content = file_content
+      self.marc.mimeType = 'application/marc'
+    end
+
+    def insert_marc_xml(file_content)
+      self.marcXML.content = file_content
+      self.marcXML.mimeType = 'application/xml'
+    end
+
+    def insert_ia_meta(file_content)
+      self.iaMeta.content = file_content
+      self.iaMeta.mimeType = 'application/xml'
+    end
+
+    def insert_scan_data(file_content)
+      self.scanData.content = file_content
+      self.scanData.mimeType = 'application/xml'
+    end
+
+    def insert_plain_text(file_content)
+      self.plainText.content = file_content
+      self.plainText.mimeType = 'text/plain'
+    end
+
+    def insert_djvu_xml(file_content)
+      self.djvuXML.content = file_content
+      self.djvuXML.mimeType = 'application/xml'
+    end
+
+    def insert_abbyy(file_content)
+      self.abbyy.content = file_content
+      self.abbyy.mimeType = 'application/xml'
+    end
+
+    def simple_insert_file(file_path, file_name, ingest_source, institution_pid, original_file_location=nil, set_exemplary=nil)
+      files_hash = []
+      file_hash = {}
+      file_hash[:datastream] = 'productionMaster'
+      file_hash[:file_path] = file_path
+      file_hash[:file_name] = file_name
+      file_hash[:original_file_location] = original_file_location
+      files_hash << file_hash
+
+      insert_new_file(files_hash, ingest_source, institution_pid, set_exemplary)
+    end
+
     # Expects a hash of the following keys
     # :file_path -> The path to the file
     # :datastream -> The datastream for the file
     # :file_name -> The name of the file
-    def insert_new_file(files_hash, file_ingest_source, institution_pid)
+    def insert_new_file(files_hash, file_ingest_source, institution_pid, set_exemplary=nil)
       puts files_hash.to_s
 
       raise 'Missing insert_new_file params' if files_hash.first[:file_path].blank? || files_hash.first[:datastream].blank? || files_hash.first[:file_name].blank?
 
       production_master = files_hash.select{ |hash| hash[:datastream] == 'productionMaster' }.first
 
-      if production_master[:file_name].include?('.tif')
+      if production_master[:file_name].downcase.include?('.tif')
         self.descMetadata.insert_media_type('image/tiff')
         self.descMetadata.insert_media_type('image/jpeg')
         self.descMetadata.insert_media_type('image/jp2')
-        self.insert_new_image_file(files_hash, institution_pid)
-      elsif production_master[:file_name].include?('.mp3')
+        inserted_obj = self.insert_new_image_file(files_hash, institution_pid,set_exemplary)
+      elsif production_master[:file_name].downcase.include?('.jp2')
+          self.descMetadata.insert_media_type('image/jpeg')
+          self.descMetadata.insert_media_type('image/jp2')
+          inserted_obj = self.insert_new_image_file(files_hash, institution_pid,set_exemplary)
+      elsif production_master[:file_name].downcase.include?('.png')
+        self.descMetadata.insert_media_type('image/png')
+        self.descMetadata.insert_media_type('image/jpeg')
+        self.descMetadata.insert_media_type('image/jp2')
+        inserted_obj = self.insert_new_image_file(files_hash, institution_pid,set_exemplary)
+      elsif production_master[:file_name].downcase.include?('.mp3')
         self.descMetadata.insert_media_type('audio/mpeg')
-        self.insert_new_audio_file(files_hash, institution_pid)
-      elsif production_master[:file_name].include?('.pdf')
+        inserted_obj = self.insert_new_audio_file(files_hash, institution_pid)
+      elsif production_master[:file_name].downcase.include?('.wav')
+        self.descMetadata.insert_media_type('audio/x-wav')
+        inserted_obj = self.insert_new_audio_file(files_hash, institution_pid)
+      elsif production_master[:file_name].downcase.include?('.aif')
+        self.descMetadata.insert_media_type('audio/x-aiff')
+        inserted_obj = self.insert_new_audio_file(files_hash, institution_pid)
+      elsif production_master[:file_name].downcase.include?('.pdf')
         self.descMetadata.insert_media_type('application/pdf')
-        self.insert_new_document_file(files_hash, institution_pid)
+        ocr_preproduction_master = files_hash.select{ |hash| hash[:datastream] == 'preProductionNegativeMaster' }.first
+=begin
+        if ocr_preproduction_master.present?
+          self.descMetadata.insert_media_type('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
+        end
+=end
+        inserted_obj = self.insert_new_document_file(files_hash, institution_pid,set_exemplary)
+      elsif production_master[:file_name].downcase.include?('.epub')
+        self.descMetadata.insert_media_type('application/epub+zip')
+        inserted_obj = self.insert_new_ereader_file(files_hash, institution_pid)
+      elsif production_master[:file_name].downcase.include?('.mobi')
+        self.descMetadata.insert_media_type('application/x-mobipocket-ebook')
+        inserted_obj = self.insert_new_ereader_file(files_hash, institution_pid)
+      elsif production_master[:file_name].downcase.include?('daisy.zip')
+        self.descMetadata.insert_media_type('application/zip')
+        inserted_obj = self.insert_new_ereader_file(files_hash, institution_pid)
       else
         self.descMetadata.insert_media_type('image/jpeg')
         self.descMetadata.insert_media_type('image/jp2')
-        self.insert_new_image_file(files_hash, institution_pid)
+        inserted_obj = self.insert_new_image_file(files_hash, institution_pid,set_exemplary)
       end
 
-      self.workflowMetadata.item_source.ingest_origin = file_ingest_source
+      self.workflowMetadata.item_source.ingest_origin = file_ingest_source if self.workflowMetadata.item_source.ingest_origin.blank?
       files_hash.each do |file|
-        self.workflowMetadata.insert_file_source(file[:file_path],file[:file_name],file[:datastream])
+        original_file_location = file[:original_file_location]
+        original_file_location ||= file[:file_path]
+        self.workflowMetadata.insert_file_source(original_file_location,file[:file_name],file[:datastream])
       end
+      inserted_obj
     end
 
-    def insert_new_image_file(files_hash, institution_pid)
+    def insert_new_image_file(files_hash, institution_pid, set_exemplary)
       #raise 'insert new image called with no files or more than one!' if file.blank? || file.is_a?(Array)
 
       puts 'processing image of: ' + self.pid.to_s + ' with file_hash: ' + files_hash.to_s
@@ -1002,7 +1240,8 @@ module Bplmodels
       if image_file.is_a?(String)
         #Bplmodels::ImageFile.find(last_image_file).delete
         #last_image_file = Bplmodels::ImageFile.mint(:parent_pid=>self.pid, :local_id=>final_file_name, :local_id_type=>'File Name', :label=>final_file_name, :institution_pid=>institution_pid)
-        return true
+        #return true
+        return Bplmodels::ImageFile.find(image_file)
       end
 
       files_hash.each_with_index do |file, file_index|
@@ -1015,175 +1254,359 @@ module Bplmodels
           image_file.send(datastream).mimeType = 'image/tiff'
         elsif file[:file_name].split('.').last.downcase == 'jpg'
           image_file.send(datastream).mimeType = 'image/jpeg'
+        elsif file[:file_name].split('.').last.downcase == 'jp2'
+          image_file.send(datastream).mimeType = 'image/jp2'
+        elsif file[:file_name].split('.').last.downcase == 'png'
+          image_file.send(datastream).mimeType = 'image/png'
+        elsif file[:file_name].split('.').last.downcase == 'txt'
+          image_file.send(datastream).mimeType = 'text/plain'
         else
-          image_file.send(datastream).mimeType = 'image/jpeg'
+          #image_file.send(datastream).mimeType = 'image/jpeg'
+          raise "Could not find a mimeType for #{file[:file_name].split('.').last.downcase}"
         end
 
-        image_file.send(datastream).dsLabel = file[:file_name].gsub('.tif', '').gsub('.jpg', '').gsub('.jpeg', '')
+        image_file.send(datastream).dsLabel = file[:file_name].gsub(/\.(tif|TIF|jpg|JPG|jpeg|JPEG|jp2|JP2|png|PNG|txt|TXT)$/, '')
 
         #FIXME!!!
-        image_file.workflowMetadata.insert_file_source(file[:file_path],file[:file_name],datastream)
+        original_file_location = file[:original_file_location]
+        original_file_location ||= file[:file_path]
+        image_file.workflowMetadata.insert_file_source(original_file_location,file[:file_name],datastream)
         image_file.workflowMetadata.item_status.state = "published"
         image_file.workflowMetadata.item_status.state_comment = "Added via the ingest image object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
 
 
       end
 
-
         other_images_exist = false
         Bplmodels::ImageFile.find_in_batches('is_image_of_ssim'=>"info:fedora/#{self.pid}", 'is_preceding_image_of_ssim'=>'') do |group|
           group.each { |image_id|
-            other_images_exist = true
-            preceding_image = Bplmodels::ImageFile.find(image_id['id'])
-            preceding_image.add_relationship(:is_preceding_image_of, "info:fedora/#{image_file.pid}", true)
-            preceding_image.save
-            image_file.add_relationship(:is_following_image_of, "info:fedora/#{image_id['id']}", true)
+            if other_images_exist
+              raise 'This object has an error... likely was interupted during a previous ingest so multiple starting files. Pid: ' + self.pid
+            else
+              other_images_exist = true
+              preceding_image = Bplmodels::ImageFile.find(image_id['id'])
+              preceding_image.add_relationship(:is_preceding_image_of, "info:fedora/#{image_file.pid}", true)
+              preceding_image.save
+              image_file.add_relationship(:is_following_image_of, "info:fedora/#{image_id['id']}", true)
+            end
+
           }
         end
 
       image_file.add_relationship(:is_image_of, "info:fedora/" + self.pid)
       image_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
-      image_file.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid) unless other_images_exist
+
+      if set_exemplary.nil? || set_exemplary
+        if ActiveFedora::Base.find_with_conditions("is_exemplary_image_of_ssim"=>"info:fedora/#{self.pid}").blank?
+          image_file.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid)
+        end
+      end
+
 
       image_file.save
 
       image_file
     end
 
-    #FIXME: NOT UPDATED!
-    def insert_new_audio_file(audio_file, institution_pid)
-      raise 'audio file missing!' if audio_file.blank?
+    def insert_new_ereader_file(files_hash, institution_pid)
+      puts 'processing ereader of: ' + self.pid.to_s + ' with file_hash: ' + files_hash.to_s
+
+      production_master = files_hash.select{ |hash| hash[:datastream] == 'productionMaster' }.first
+
+      epub_file = Bplmodels::EreaderFile.mint(:parent_pid=>self.pid, :local_id=>production_master[:file_name], :local_id_type=>'File Name', :label=>production_master[:file_name], :institution_pid=>institution_pid)
+
+      if epub_file.is_a?(String)
+        #Bplmodels::ImageFile.find(last_image_file).delete
+        #last_image_file = Bplmodels::ImageFile.mint(:parent_pid=>self.pid, :local_id=>final_file_name, :local_id_type=>'File Name', :label=>final_file_name, :institution_pid=>institution_pid)
+        #return true
+        return Bplmodels::EreaderFile.find(epub_file)
+      end
+
+      files_hash.each_with_index do |file, file_index|
+        datastream = file[:datastream]
+
+
+        epub_file.send(datastream).content = ::File.open(file[:file_path])
+
+        if file[:file_name].split('.').last.downcase == 'epub'
+          epub_file.send(datastream).mimeType = 'application/epub+zip'
+        elsif file[:file_name].split('.').last.downcase == 'mobi'
+          epub_file.send(datastream).mimeType = 'application/x-mobipocket-ebook'
+        elsif file[:file_name].split('.').last.downcase == 'zip'
+          epub_file.send(datastream).mimeType = 'application/zip'
+        elsif file[:file_name].split('.').last.downcase == 'txt'
+          epub_file.send(datastream).mimeType = 'text/plain'
+        else
+          epub_file.send(datastream).mimeType = 'application/epub+zip'
+        end
+
+        epub_file.send(datastream).dsLabel = file[:file_name].gsub(/\.(epub|EPUB|mobi|MOBI|zip|ZIP|txt|TXT)$/, '')
+
+        #FIXME!!!
+        original_file_location = file[:original_file_location]
+        original_file_location ||= file[:file_path]
+        epub_file.workflowMetadata.insert_file_source(original_file_location,file[:file_name],datastream)
+        epub_file.workflowMetadata.item_status.state = "published"
+        epub_file.workflowMetadata.item_status.state_comment = "Added via the ingest image object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
+
 
-      uri_file_part = audio_file
-      #Fix common url errors
-      if uri_file_part.match(/^http/)
-        #uri_file_part = uri_file_part.gsub(' ', '%20')
-        uri_file_part = URI::escape(uri_file_part)
       end
 
-      final_audio_name =  audio_file.gsub('\\', '/').split('/').last
-      current_audio_file = Bplmodels::AudioFile.mint(:parent_pid=>self.pid, :local_id=>final_audio_name, :local_id_type=>'File Name', :label=>final_audio_name, :institution_pid=>institution_pid)
-      if current_audio_file.is_a?(String)
-        Bplmodels::AudioFile.find(current_audio_file).delete
-        current_audio_file = Bplmodels::AudioFile.mint(:parent_pid=>self.pid, :local_id=>final_audio_name, :local_id_type=>'File Name', :label=>final_audio_name, :institution_pid=>institution_pid)
+
+      Bplmodels::EreaderFile.find_in_batches('is_ereader_of_ssim'=>"info:fedora/#{self.pid}", 'is_preceding_ereader_of_ssim'=>'') do |group|
+        group.each { |ereader_id|
+          other_images_exist = true
+          preceding_ereader = Bplmodels::EreaderFile.find(ereader_id['id'])
+          preceding_ereader.add_relationship(:is_preceding_ereader_of, "info:fedora/#{epub_file.pid}", true)
+          preceding_ereader.save
+          epub_file.add_relationship(:is_following_ereader_of, "info:fedora/#{ereader_id['id']}", true)
+        }
       end
 
+      epub_file.add_relationship(:is_ereader_of, "info:fedora/" + self.pid)
+      epub_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
 
-      current_audio_file.productionMaster.content = open(uri_file_part)
-      if audio_file.split('.').last.downcase == 'mp3'
-        current_audio_file.productionMaster.mimeType = 'audio/mpeg'
-      else
-        current_audio_file.productionMaster.mimeType = 'audio/mpeg'
+      epub_file.save
+
+      epub_file
+    end
+
+    def insert_new_audio_file(files_hash, institution_pid, set_exemplary=false)
+      production_master = files_hash.select{ |hash| hash[:datastream] == 'productionMaster' }.first
+      audio_file = Bplmodels::AudioFile.mint(:parent_pid=>self.pid, :local_id=>production_master[:file_name], :local_id_type=>'File Name', :label=>production_master[:file_name], :institution_pid=>institution_pid)
+
+      if audio_file.is_a?(String)
+        #Bplmodels::ImageFile.find(last_image_file).delete
+        #last_image_file = Bplmodels::ImageFile.mint(:parent_pid=>self.pid, :local_id=>final_file_name, :local_id_type=>'File Name', :label=>final_file_name, :institution_pid=>institution_pid)
+        #return true
+        return Bplmodels::AudioFile.find(image_file)
       end
 
+      files_hash.each_with_index do |file, file_index|
+        datastream = file[:datastream]
+
+
+        audio_file.send(datastream).content = ::File.open(file[:file_path])
+
+        if file[:file_name].split('.').last.downcase == 'mp3'
+          audio_file.send(datastream).mimeType = 'audio/mpeg'
+        elsif file[:file_name].split('.').last.downcase == 'wav'
+          audio_file.send(datastream).mimeType = 'audio/x-wav'
+        elsif file[:file_name].split('.').last.downcase == 'aif'
+          audio_file.send(datastream).mimeType = 'audio/x-aiff'
+        elsif file[:file_name].split('.').last.downcase == 'txt'
+          audio_file.send(datastream).mimeType = 'text/plain'
+        else
+          raise "Could not find a mimeType for #{file[:file_name].split('.').last.downcase}"
+        end
+
+        audio_file.send(datastream).dsLabel = file[:file_name].gsub(/\.(mp3|MP3|wav|WAV|aif|AIF|txt|TXT)$/, '')
+
+        #FIXME!!!
+        original_file_location = file[:original_file_location]
+        original_file_location ||= file[:file_path]
+        audio_file.workflowMetadata.insert_file_source(original_file_location,file[:file_name],datastream)
+        audio_file.workflowMetadata.item_status.state = "published"
+        audio_file.workflowMetadata.item_status.state_comment = "Added via the ingest image object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
+
+
+      end
 
       other_audio_exist = false
       Bplmodels::AudioFile.find_in_batches('is_audio_of_ssim'=>"info:fedora/#{self.pid}", 'is_preceding_audio_of_ssim'=>'') do |group|
         group.each { |audio|
-          other_audio_exist = true
-          preceding_audio = Bplmodels::AudioFile.find(audio['id'])
-          preceding_audio.add_relationship(:is_preceding_audio_of, "info:fedora/#{current_audio_file.pid}", true)
-          preceding_audio.save
-          current_audio_file.add_relationship(:is_following_audio_of, "info:fedora/#{audio['id']}", true)
+          if other_audio_exist
+            raise 'This object has an error... likely was interupted during a previous ingest so multiple starting files. Pid: ' + self.pid
+          else
+            other_images_exist = true
+            preceding_audio = Bplmodels::AudioFile.find(audio['id'])
+            preceding_audio.add_relationship(:is_preceding_image_of, "info:fedora/#{audio_file.pid}", true)
+            preceding_audio.save
+            audio_file.add_relationship(:is_following_image_of, "info:fedora/#{audio['id']}", true)
+          end
+
         }
       end
 
-      current_audio_file.add_relationship(:is_audio_of, "info:fedora/" + self.pid)
-      current_audio_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
-
-      current_audio_file.workflowMetadata.insert_file_path(audio_file)
-      current_audio_file.workflowMetadata.insert_file_name(final_audio_name)
-      current_audio_file.workflowMetadata.item_status.state = "published"
-      current_audio_file.workflowMetadata.item_status.state_comment = "Added via the ingest audio object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
+      audio_file.add_relationship(:is_audio_of, "info:fedora/" + self.pid)
+      audio_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
 
-      current_audio_file.save
+      audio_file.save
 
-      current_audio_file
+      audio_file
     end
 
-    #FIXME: NOT UPDATED!
-    #FIXME: Cases of images and PDF?
-    def insert_new_document_file(document_file, institution_pid)
-      raise 'document file missing!' if document_file.blank?
-
-      puts 'processing document of: ' + self.pid.to_s + ' with file: ' + document_file
-
-      uri_file_part = document_file
+    def insert_new_document_file(files_hash, institution_pid, set_exemplary)
+      production_master = files_hash.select{ |hash| hash[:datastream] == 'productionMaster' }.first
 
+      #uri_file_part = file
       #Fix common url errors
-      if uri_file_part.match(/^http/)
-        #uri_file_part = uri_file_part.gsub(' ', '%20')
-        uri_file_part = URI::escape(uri_file_part)
-      end
+      #uri_file_part = URI::escape(uri_file_part) if uri_file_part.match(/^http/)
 
-      final_document_name =  document_file.gsub('\\', '/').split('/').last
-      current_document_file = Bplmodels::DocumentFile.mint(:parent_pid=>self.pid, :local_id=>final_document_name, :local_id_type=>'File Name', :label=>final_document_name, :institution_pid=>institution_pid)
-      if current_document_file.is_a?(String)
-        Bplmodels::DocumentFile.find(current_document_file).delete
-        current_document_file = Bplmodels::DocumentFile.mint(:parent_pid=>self.pid, :local_id=>final_document_name, :local_id_type=>'File Name', :label=>final_document_name, :institution_pid=>institution_pid)
+      document_file = Bplmodels::DocumentFile.mint(:parent_pid=>self.pid, :local_id=>production_master[:file_name], :local_id_type=>'File Name', :label=>production_master[:file_name], :institution_pid=>institution_pid)
+
+      if document_file.is_a?(String)
+        #Bplmodels::ImageFile.find(last_image_file).delete
+        #last_image_file = Bplmodels::ImageFile.mint(:parent_pid=>self.pid, :local_id=>final_file_name, :local_id_type=>'File Name', :label=>final_file_name, :institution_pid=>institution_pid)
         #return true
+        return Bplmodels::DocumentFile.find(document_file)
       end
 
-      current_document_file.productionMaster.content = open(uri_file_part)
-      if document_file.split('.').last.downcase == 'pdf'
-        current_document_file.productionMaster.mimeType = 'application/pdf'
-      else
-        current_document_file.productionMaster.mimeType = 'application/pdf'
-      end
+      files_hash.each_with_index do |file, file_index|
+        datastream = file[:datastream]
 
-      current_page = 0
-      total_colors = 0
-      until total_colors > 1 do
-        img = Magick::Image.read(uri_file_part + '[' + current_page.to_s + ']'){
-          self.quality = 100
-          self.density = 200
-        }.first
-        total_colors = img.total_colors
-        current_page = current_page + 1
-      end
+        #Fix common url errors
+        if file[:file_path].match(/^http/)
+          document_file.send(datastream).content = ::File.open(URI::escape(file[:file_path]))
+        else
+          document_file.send(datastream).content = ::File.open(file[:file_path])
+        end
 
-      #This is horrible. But if you don't do this, some PDF files won't come out right at all.
-      #Multiple attempts have failed to fix this but perhaps the bug will be patched in ImageMagick.
-      #To duplicate, one can use the PDF files at: http://libspace.uml.edu/omeka/files/original/7ecb4dc9579b11e2b53ccc2040e58d36.pdf
-      img = Magick::Image.from_blob( img.to_blob { self.format = "jpg" } ).first
 
-      thumb = img.resize_to_fit(300,300)
+        if file[:file_name].split('.').last.downcase == 'pdf'
+          document_file.send(datastream).mimeType = 'application/pdf'
+        elsif file[:file_name].split('.').last.downcase == 'docx'
+          document_file.send(datastream).mimeType = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+        elsif file[:file_name].split('.').last.downcase == 'doc'
+          document_file.send(datastream).mimeType = 'application/msword'
+        elsif file[:file_name].split('.').last.downcase == 'txt'
+          document_file.send(datastream).mimeType = 'text/plain'
+        else
+          raise "Could not find a mimeType for #{file[:file_name].split('.').last.downcase}"
+        end
+
+        document_file.send(datastream).dsLabel = file[:file_name].gsub(/\.(pdf|PDF|docx|DOCX|doc|DOC|txt|TXT)$/, '')
+
+        #FIXME!!!
+        original_file_location = file[:original_file_location]
+        original_file_location ||= file[:file_path]
+        document_file.workflowMetadata.insert_file_source(original_file_location,file[:file_name],datastream)
+        document_file.workflowMetadata.item_status.state = "published"
+        document_file.workflowMetadata.item_status.state_comment = "Added via the ingest document object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
+
+
+      end
 
-      current_document_file.thumbnail300.content = thumb.to_blob { self.format = "jpg" }
-      current_document_file.thumbnail300.mimeType = 'image/jpeg'
 
       Bplmodels::DocumentFile.find_in_batches('is_document_of_ssim'=>"info:fedora/#{self.pid}", 'is_preceding_document_of_ssim'=>'') do |group|
-        group.each { |document_solr|
-          other_document_exist = true
-          preceding_document = Bplmodels::DocumentFile.find(document_solr['id'])
-          preceding_document.add_relationship(:is_preceding_document_of, "info:fedora/#{current_document_file.pid}", true)
+        group.each { |document_id|
+          preceding_document = Bplmodels::DocumentFile.find(document_id['id'])
+          preceding_document.add_relationship(:is_preceding_document_of, "info:fedora/#{document_file.pid}", true)
           preceding_document.save
-          current_document_file.add_relationship(:is_following_document_of, "info:fedora/#{document_solr['id']}", true)
+          preceding_document.add_relationship(:is_following_document_of, "info:fedora/#{document_id['id']}", true)
         }
       end
 
-      #TODO: Fix this in the image file object?
-      other_exemplary_exist = false
-      Bplmodels::File.find_in_batches('is_exemplary_image_of_ssim'=>"info:fedora/#{self.pid}") do |group|
-        group.each { |exemplary_solr|
-          other_exemplary_exist = true
-        }
+      document_file.add_relationship(:is_image_of, "info:fedora/" + self.pid)
+      document_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
+
+      if set_exemplary.nil? || set_exemplary
+        if ActiveFedora::Base.find_with_conditions("is_exemplary_image_of_ssim"=>"info:fedora/#{self.pid}").blank?
+          document_file.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid)
+        end
       end
 
-      current_document_file.add_relationship(:is_document_of, "info:fedora/" + self.pid)
-      current_document_file.add_relationship(:is_file_of, "info:fedora/" + self.pid)
 
-      current_document_file.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid) unless other_exemplary_exist
+      document_file.save
+
+      document_file
+    end
+
+    def add_new_volume(pid)
+      #raise 'insert new image called with no files or more than one!' if file.blank? || file.is_a?(Array)
+      volume = Bplmodels::Volume.find(pid).adapt_to_cmodel
+      placement_location = volume.descMetadata.title_info.part_number.first.match(/\d+/).to_s.to_i
+
+      other_volumes_exist = false
+      volume_placed = false
+      queryed_placement_start_val = 0
+
+      volume_objects = Bplmodels::Finder.getVolumeObjects(self.pid)
+      volume_objects.each do |volume_id|
+        if !volume_placed
+          queryed_placement_end_val = volume_id['title_info_partnum_tsi'].match(/\d+/).to_s.to_i
+          queryed_placement_start_val ||= queryed_placement_end_val
+          other_volumes_exist = true
+
+          #Case of insert at end
+          if volume_id['is_preceding_volume_of_ssim'].blank? && queryed_placement_end_val < placement_location
+            preceding_volume = Bplmodels::Volume.find(volume_id['id'])
+            preceding_volume.add_relationship(:is_preceding_volume_of, "info:fedora/#{pid}", true)
+            preceding_volume.save
+            volume.add_relationship(:is_following_volume_of, "info:fedora/#{volume_id['id']}", true)
+            volume_placed = true
+            #Case of only 1 element of volume 2... insert at beginning
+          elsif volume_id['is_preceding_volume_of_ssim'].blank?
+            following_volume = Bplmodels::Volume.find(volume_id['id'])
+            following_volume.add_relationship(:is_following_volume_of, "info:fedora/#{pid}", true)
+
+            volume.add_relationship(:is_preceding_volume_of, "info:fedora/#{volume_id['id']}", true)
+            following_volume.save
+            volume_placed = true
+            #Case of multiple but insert at front
+          elsif volume_id['is_following_volume_of_ssim'].blank? && queryed_placement_start_val < placement_location and queryed_placement_end_val > placement_location
+            following_volume = Bplmodels::Volume.find(volume_id['id'])
+            following_volume.add_relationship(:is_following_volume_of, "info:fedora/#{pid}", true)
+
+            volume.add_relationship(:is_preceding_volume_of, "info:fedora/#{volume_id['id']}", true)
+            following_volume.save
+            volume_placed = true
+            #Normal case
+          elsif queryed_placement_start_val < placement_location and queryed_placement_end_val > placement_location
+            following_volume = Bplmodels::Volume.find(volume_id['id'])
+            preceding_volume = Bplmodels::Volume.find(volume_id['is_preceding_volume_of_ssim'].gsub('info:fedora/', ''))
+
+            following_volume.remove_relationship(:is_following_volume_of, "info:fedora/#{preceding_volume.pid}", true)
+            preceding_volume.remove_relationship(:is_preceding_volume_of, "info:fedora/#{following_volume.pid}", true)
+
+
+            following_volume.add_relationship(:is_following_volume_of, "info:fedora/#{pid}", true)
+            preceding_volume.add_relationship(:is_preceding_volume_of, "info:fedora/#{pid}", true)
+
+
+            volume.add_relationship(:is_following_volume_of, "info:fedora/#{preceding_volume.pid}", true)
+            volume.add_relationship(:is_preceding_volume_of, "info:fedora/#{following_volume.pid}", true)
+            preceding_volume.save
+            following_volume.save
+            volume_placed = true
+          end
+        end
+
+        queryed_placement_start_val = queryed_placement_end_val
+      end
+
+      volume.add_relationship(:is_volume_of, "info:fedora/" + self.pid)
+
+      #FIXME: Doesn't work with PDF?
+      #FIXME: Do this better?
+      if !other_volumes_exist
+        ActiveFedora::Base.find_in_batches('is_exemplary_image_of_ssim'=>"info:fedora/#{pid}") do |group|
+          group.each { |exemplary_solr|
+            exemplary_image = Bplmodels::File.find(exemplary_solr['id']).adapt_to_cmodel
+            exemplary_image.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid)
+            exemplary_image.save
+          }
+        end
+      elsif placement_location == 1
+        if ActiveFedora::Base.find_with_conditions("is_exemplary_image_of_ssim"=>"info:fedora/#{self.pid}").present?
+          exemplary_to_remove_id = ActiveFedora::Base.find_with_conditions("is_exemplary_image_of_ssim"=>"info:fedora/#{self.pid}").first['id']
+          exemplary_to_remove = ActiveFedora::Base.find(exemplary_to_remove_id).adapt_to_cmodel
+          exemplary_to_remove.remove_relationship(:is_exemplary_image_of, "info:fedora/" + exemplary_to_remove_id)
+        end
+
+        ActiveFedora::Base.find_in_batches('is_exemplary_image_of_ssim'=>"info:fedora/#{pid}") do |group|
+          group.each { |exemplary_solr|
+            exemplary_image = Bplmodels::File.find(exemplary_solr['id']).adapt_to_cmodel
+            exemplary_image.add_relationship(:is_exemplary_image_of, "info:fedora/" + self.pid)
+            exemplary_image.save
+          }
+        end
+      end
 
-      current_document_file.workflowMetadata.insert_file_path(document_file)
-      current_document_file.workflowMetadata.insert_file_name(final_document_name)
-      current_document_file.workflowMetadata.item_status.state = "published"
-      current_document_file.workflowMetadata.item_status.state_comment = "Added via the ingest document object base method on " + Time.new.year.to_s + "/" + Time.new.month.to_s + "/" + Time.new.day.to_s
 
-      current_document_file.save
+      volume.save
 
-      img.destroy!
-      current_document_file
+      volume
     end
 
     def deleteAllFiles
@@ -1237,5 +1660,22 @@ module Bplmodels
       return true
     end
 
+    def cache_invalidate
+      response = Typhoeus::Request.post(DERIVATIVE_CONFIG_GLOBAL['url'] + "/processor/objectcacheinvalidation.json", :params => {:object_pid=>self.pid, :environment=>Bplmodels.environment})
+      as_json = JSON.parse(response.body)
+
+      if as_json['result'] == "false"
+        raise "Error Deleting the Cache! Server error!"
+      end
+
+      return true
+    end
+
+
+    def calculate_volume_match_md5s
+      self.workflowMetadata.volume_match_md5s.marc = Digest::MD5.hexdigest(self.marc.content)
+      self.workflowMetadata.volume_match_md5s.iaMeta = Digest::MD5.hexdigest(self.iaMeta.content.gsub(/<\/page_progression>.+$/, '').gsub(/<volume>.+<\/volume>/, ''))
+    end
+
   end
 end