active-fedora 1.1.13 → 1.2.0

data/.gitignore

@@ -13,6 +13,10 @@ tmtags
 ## VIM
 *.swp
 
+##SVN
+.svn
+.svn/*
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/README.textile

@@ -43,9 +43,16 @@ cd /wherever/active_fedora/is
 rake spec
 </pre>
 
+h2. Acknowledgements
+
+Creator: Matt Zumwalt ("MediaShelf":http://yourmediashelf.com)
+
+Developers: 
+McClain Looney & Eddie Shin ("MediaShelf":http://yourmediashelf.com), Rick Johnson (Notre Dame)
+
 h2. LICENSE:
 
-Copyright (c) 2009-2010 Matt Zumwalt
+Copyright (c) 2009-2010 Matt Zumwalt & MediaShelf, LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (LGPL) as 

data/Rakefile

@@ -1,5 +1,4 @@
 require 'rake/clean'
-require 'lib/active_fedora'#to get VERSION
 require 'rubygems'
 load 'tasks/rspec.rake'
 $: << 'lib'
@@ -21,11 +20,13 @@ begin
     gem.add_dependency('mime-types', '>= 1.16')
     gem.add_dependency('multipart-post')
     gem.add_dependency('nokogiri')
-    gem.add_dependency('om', '>= 0.1.9')
+    # gem.add_dependency('om', '>= 0.1.9')
+    gem.add_dependency('om', '>= 1.0')
+    gem.add_dependency('solrizer', '>=0.1.4')
     # gem.add_dependency('yaml')
 
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "mocha", ">= 1.2.9"
+    gem.add_development_dependency "mocha", ">= 0.9.8"
     gem.add_development_dependency "ruby-debug"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-1.1.13
+1.2.0

data/active-fedora.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.13"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-07-17}
+  s.date = %q{2010-09-15}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
      "README.textile"
   ]
   s.files = [
@@ -175,7 +174,6 @@ Gem::Specification.new do |s|
      "License.txt",
      "Manifest.txt",
      "PostInstall.txt",
-     "README.rdoc",
      "README.textile",
      "Rakefile",
      "VERSION",
@@ -199,7 +197,6 @@ Gem::Specification.new do |s|
      "lib/active_fedora/relationship.rb",
      "lib/active_fedora/rels_ext_datastream.rb",
      "lib/active_fedora/semantic_node.rb",
-     "lib/active_fedora/solr_mapper.rb",
      "lib/active_fedora/solr_service.rb",
      "lib/fedora/base.rb",
      "lib/fedora/connection.rb",
@@ -227,6 +224,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/test_12.foxml.xml",
      "spec/hydrangea_fixture_mods_article1.foxml.xml",
      "spec/integration/base_file_management_spec.rb",
+     "spec/integration/base_find_by_fields_spec.rb",
      "spec/integration/base_loader_spec.rb",
      "spec/integration/base_spec.rb",
      "spec/integration/bug_spec.rb",
@@ -234,6 +232,7 @@ Gem::Specification.new do |s|
      "spec/integration/datastreams_crud_spec.rb",
      "spec/integration/fedora_object_spec.rb",
      "spec/integration/full_featured_model_spec.rb",
+     "spec/integration/metadata_datastream_helper_spec.rb",
      "spec/integration/model_spec.rb",
      "spec/integration/mods_article_integration_spec.rb",
      "spec/integration/rels_ext_datastream_spec.rb",
@@ -256,6 +255,7 @@ Gem::Specification.new do |s|
      "spec/unit/base_datastream_management_spec.rb",
      "spec/unit/base_extra_spec.rb",
      "spec/unit/base_file_management_spec.rb",
+     "spec/unit/base_named_datastream_spec.rb",
      "spec/unit/base_spec.rb",
      "spec/unit/connection_spec.rb",
      "spec/unit/content_model_spec.rb",
@@ -274,7 +274,6 @@ Gem::Specification.new do |s|
      "spec/unit/rf_datastream_spec.rb",
      "spec/unit/semantic_node_spec.rb",
      "spec/unit/solr_config_options_spec.rb",
-     "spec/unit/solr_mapper_spec.rb",
      "spec/unit/solr_service_spec.rb",
      "tasks/hoe.rake",
      "tasks/rspec.rake"
@@ -287,6 +286,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.}
   s.test_files = [
     "spec/integration/base_file_management_spec.rb",
+     "spec/integration/base_find_by_fields_spec.rb",
      "spec/integration/base_loader_spec.rb",
      "spec/integration/base_spec.rb",
      "spec/integration/bug_spec.rb",
@@ -294,6 +294,7 @@ Gem::Specification.new do |s|
      "spec/integration/datastreams_crud_spec.rb",
      "spec/integration/fedora_object_spec.rb",
      "spec/integration/full_featured_model_spec.rb",
+     "spec/integration/metadata_datastream_helper_spec.rb",
      "spec/integration/model_spec.rb",
      "spec/integration/mods_article_integration_spec.rb",
      "spec/integration/rels_ext_datastream_spec.rb",
@@ -313,6 +314,7 @@ Gem::Specification.new do |s|
      "spec/unit/base_datastream_management_spec.rb",
      "spec/unit/base_extra_spec.rb",
      "spec/unit/base_file_management_spec.rb",
+     "spec/unit/base_named_datastream_spec.rb",
      "spec/unit/base_spec.rb",
      "spec/unit/connection_spec.rb",
      "spec/unit/content_model_spec.rb",
@@ -331,7 +333,6 @@ Gem::Specification.new do |s|
      "spec/unit/rf_datastream_spec.rb",
      "spec/unit/semantic_node_spec.rb",
      "spec/unit/solr_config_options_spec.rb",
-     "spec/unit/solr_mapper_spec.rb",
      "spec/unit/solr_service_spec.rb"
   ]
 
@@ -345,9 +346,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<om>, [">= 0.1.9"])
+      s.add_runtime_dependency(%q<om>, [">= 1.0"])
+      s.add_runtime_dependency(%q<solrizer>, [">= 0.1.4"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<mocha>, [">= 1.2.9"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<solr-ruby>, [">= 0.0.6"])
@@ -355,9 +357,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<om>, [">= 0.1.9"])
+      s.add_dependency(%q<om>, [">= 1.0"])
+      s.add_dependency(%q<solrizer>, [">= 0.1.4"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<mocha>, [">= 1.2.9"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
@@ -366,9 +369,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<om>, [">= 0.1.9"])
+    s.add_dependency(%q<om>, [">= 1.0"])
+    s.add_dependency(%q<solrizer>, [">= 0.1.4"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<mocha>, [">= 1.2.9"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end

data/lib/active_fedora.rb

@@ -4,9 +4,9 @@ gem 'solr-ruby'
 $: << 'lib'
 require 'logger'
 require 'active_fedora/solr_service.rb'
-require 'active_fedora/solr_mapper.rb'
+require 'solrizer/field_name_mapper'
 
-SOLR_DOCUMENT_ID = ActiveFedora::SolrService.mappings["id"] unless defined?(SOLR_DOCUMENT_ID)
+SOLR_DOCUMENT_ID = Solrizer::FieldNameMapper.mappings["id"] unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
 require 'ruby-fedora'

data/lib/active_fedora/base.rb

@@ -1,6 +1,7 @@
 require 'util/class_level_inheritable_attributes'
 require 'active_fedora/model'
 require 'active_fedora/semantic_node'
+require 'solrizer/field_name_mapper'
 require 'nokogiri'
 
 SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
@@ -30,10 +31,13 @@ module ActiveFedora
   # This class is really a facade for a basic Fedora::FedoraObject, which is stored internally.
   class Base
     include MediaShelfClassLevelInheritableAttributes
-    ms_inheritable_attributes  :ds_specs
+    ms_inheritable_attributes  :ds_specs, :class_named_datastreams_desc
     include Model
     include SemanticNode
-    include SolrMapper
+    include Solrizer::FieldNameMapper
+     
+    attr_accessor :named_datastreams_desc
+    
 
     has_relationship "collection_members", :has_collection_member
     
@@ -98,10 +102,26 @@ module ActiveFedora
     end
 
     #Deletes a Base object, also deletes the info indexed in Solr, and 
-    #the underlying inner_object.
+    #the underlying inner_object.  If this object is held in any relationships (ie inbound relationships
+    #outside of this object it will remove it from those items rels-ext as well
     def delete
+      inbound_relationships(:objects).each_pair do |predicate, objects|
+        objects.each do |obj|
+          if obj.respond_to?(:remove_relationship)
+            obj.remove_relationship(predicate,self)
+            obj.save
+          end 
+        end
+      end
+
       Fedora::Repository.instance.delete(@inner_object)
-      SolrService.instance.conn.delete(self.pid) if ENABLE_SOLR_UPDATES 
+      if ENABLE_SOLR_UPDATES
+        ActiveFedora::SolrService.instance.conn.delete(pid) 
+        if defined?( Solrizer::Solrizer ) 
+          solrizer = Solrizer::Solrizer.new
+          solrizer.solrize_delete(pid)
+        end
+      end
     end
 
 
@@ -246,7 +266,213 @@ module ActiveFedora
     def collection_members_remove()
       # will rely on SemanticNode.remove_relationship once it is implemented
     end
+    
+    #
+    # Named Datastreams management
+    #
+    def datastream_names
+      named_datastreams_desc.keys
+    end
+    
+    def add_named_file_datastream(name, file, opts={})
+      opts.merge!({:blob=>file,:controlGroup=>'M'})
+      add_named_datastream(name,opts)
+    end
 
+    # Creates a datastream with values 
+    def add_named_datastream(name,opts={})
+      
+      unless named_datastreams_desc.has_key?(name) && named_datastreams_desc[name].has_key?(:type) 
+        raise "Failed to add datastream. Named datastream #{name} not defined for object #{pid}." 
+      end
+      opts.merge!(named_datastreams_desc[name])
+        
+      label = opts.has_key?(:label) ? opts[:label] : ""
+
+      #only do these steps for managed datastreams
+      unless (opts.has_key?(:controlGroup)&&opts[:controlGroup]!="M")
+        if opts.has_key?(:file)
+          opts.merge!({:blob => opts[:file]}) 
+          opts.delete(:file)
+        end
+        
+        raise "You must define parameter blob for this managed datastream to load for #{pid}" unless opts.has_key?(:blob)
+        
+        #if no explicit label and is a file use original file name for label
+        if !opts.has_key?(:label)&&opts[:blob].respond_to?(:original_filename)
+          label = opts[:blob].original_filename
+        end
+        
+        if opts[:blob].respond_to?(:content_type)&&!opts[:blob].content_type.nil? && !opts.has_key?(:content_type)
+          opts.merge!({:content_type=>opts[:blob].content_type})
+        end
+     
+        raise "The blob must respond to content_type or the hash must have :content_type property set" unless opts.has_key?(:content_type)
+        
+        #throw error for mimeType mismatch
+        if named_datastreams_desc[name].has_key?(:mimeType) && !named_datastreams_desc[name][:mimeType].eql?(opts[:content_type])
+          raise "Content type mismatch for add datastream #{name} to #{pid}.  Expected: #{named_datastreams_desc[name][:mimeType]}, Actual: #{opts[:content_type]}"
+        end
+      else 
+        label = opts[:dsLocation] if (opts.has_key?(:dsLocation)) 
+      end
+      
+      opts.merge!(:dsLabel => label)
+      
+      #make sure both dsid and dsID populated if a dsid is supplied
+      opts.merge!(:dsid=>opts[:dsID]) if opts.has_key?(:dsID)
+      opts.merge!(:dsID=>opts[:dsid]) if opts.has_key?(:dsid)
+      
+      ds = create_datastream(named_datastreams_desc[name][:type],opts)
+      #Must be of type datastream
+      assert_kind_of 'datastream',  ds, ActiveFedora::Datastream
+      #make sure dsid is nil so that it uses the prefix for mapping purposes
+      #check dsid works for the prefix if it is set
+      if !ds.dsid.nil? && opts.has_key?(:prefix)
+        raise "dsid supplied does not conform to pattern #{opts[:prefix]}[number]" unless ds.dsid =~ /#{opts[:prefix]}[0-9]/
+      end
+      
+      add_datastream(ds,opts)
+    end
+
+    ########################################################################
+    ### TODO: Currently requires you to update file if a managed datastream
+    ##        but could change to allow metadata only updates as well
+    ########################################################################
+    def update_named_datastream(name, opts={})
+      #check that dsid provided matches existing datastream with that name
+      raise "You must define parameter dsid for datastream to update for #{pid}" unless opts.include?(:dsid)
+      raise "Datastream with name #{name} and dsid #{opts[:dsid]} does not exist for #{pid}" unless self.send("#{name}_ids").include?(opts[:dsid])
+      add_named_datastream(name,opts)
+    end
+    
+    def assert_kind_of(n, o,t)
+      raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
+    end
+    
+    def is_named_datastream?(name)
+      named_datastreams_desc.has_key?(name)
+    end
+
+    def named_datastreams
+      ds_values = {}
+      self.class.named_datastreams_desc.keys.each do |name|
+        ds_values.merge!({name=>self.send("#{name}")})
+      end
+      return ds_values
+    end
+    
+    def named_datastreams_attributes
+      ds_values = {}
+      self.class.named_datastreams_desc.keys.each do |name|
+        ds_array = self.send("#{name}")
+        result_hash = {}
+        ds_array.each do |ds|
+          result_hash[ds.dsid]=ds.attributes
+        end
+        ds_values.merge!({name=>result_hash})
+      end
+      return ds_values
+    end
+    
+    def named_datastreams_ids
+      dsids = {}
+      self.class.named_datastreams_desc.keys.each do |name|
+        dsid_array = self.send("#{name}_ids")
+        dsids[name] = dsid_array
+      end
+      return dsids
+    end 
+    
+    def datastreams_attributes
+      ds_values = {}
+      self.datastreams.each_pair do |dsid,ds|
+        ds_values.merge!({dsid=>ds.attributes})
+      end
+      return ds_values
+    end
+    
+    def named_datastreams_desc
+      @named_datastreams_desc ||= named_datastreams_desc_from_class
+    end
+    
+    def named_datastreams_desc_from_class
+      self.class.named_datastreams_desc
+    end
+    
+    def create_datastream(type,opts={})
+      type.to_s.split('::').inject(Kernel) {|scope, const_name| 
+      scope.const_get(const_name)}.new(opts)
+    end
+
+    def self.has_datastream(args)
+      unless args.has_key?(:name)
+        return false
+      end
+      unless args.has_key?(:prefix)
+        args.merge!({:prefix=>args[:name].to_s.upcase})
+      end
+      unless named_datastreams_desc.has_key?(args[:name]) 
+        named_datastreams_desc[args[:name]] = {} 
+      end
+          
+      args.merge!({:mimeType=>args[:mime_type]}) if args.has_key?(:mime_type)
+      
+      unless named_datastreams_desc[args[:name]].has_key?(:type) 
+        #default to type ActiveFedora::Datastream
+        args.merge!({:type => "ActiveFedora::Datastream"})
+      end
+      named_datastreams_desc[args[:name]]= args   
+      create_named_datastream_finders(args[:name],args[:prefix])
+      create_named_datastream_update_methods(args[:name])
+    end
+        
+    def self.create_named_datastream_update_methods(name)
+      append_file_method_name = "#{name.to_s.downcase}_file_append"
+      append_method_name = "#{name.to_s.downcase}_append"
+      #remove_method_name = "#{name.to_s.downcase}_remove"
+      self.send(:define_method,:"#{append_file_method_name}") do |*args| 
+        file,opts = *args
+        opts ||= {}
+        add_named_file_datastream(name,file,opts)
+      end
+      
+      self.send(:define_method,:"#{append_method_name}") do |*args| 
+        opts = *args
+        opts ||= {}
+        #call add_named_datastream instead of add_file_named_datastream in case not managed datastream
+        add_named_datastream(name,opts)
+      end
+    end 
+        
+    def self.create_named_datastream_finders(name, prefix)
+      class_eval <<-END
+      def #{name}(opts={})
+        id_array = []
+        keys = datastreams.keys
+        id_array = keys.select {|v| v =~ /#{prefix}\d*/}
+        if opts[:response_format] == :id_array
+          return id_array
+        else
+          named_ds = []
+          id_array.each do |name|
+            if datastreams.has_key?(name)
+              named_ds.push(datastreams[name])
+            end
+          end
+          return named_ds
+        end
+      end
+      def #{name}_ids
+        #{name}(:response_format => :id_array)
+      end
+      END
+    end
+        
+    # named datastreams desc are tracked as a hash of structure {name => args}}
+    def self.named_datastreams_desc
+      @class_named_datastreams_desc ||= {}
+    end
 
     # 
     # Relationships Management
@@ -255,21 +481,32 @@ module ActiveFedora
     # @returns Hash of relationships, as defined by SemanticNode
     # Rely on rels_ext datastream to track relationships array
     # Overrides accessor for relationships array used by SemanticNode.
-    def relationships
-      return rels_ext.relationships
+    # If outbound_only is false, inbound relationships will be included.
+    def relationships(outbound_only=true)
+      outbound_only ? rels_ext.relationships : rels_ext.relationships.merge(:inbound=>inbound_relationships)
     end
 
     # Add a Rels-Ext relationship to the Object.
     # @param predicate
     # @param object Either a string URI or an object that responds to .pid 
     def add_relationship(predicate, obj)
-      #predicate = ActiveFedora::RelsExtDatastream.predicate_lookup(predicate)
       r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>obj)
-      rels_ext.add_relationship(r)
+      unless relationship_exists?(r.subject, r.predicate, r.object)
+        rels_ext.add_relationship(r)
+        #need to call here to indicate update of named_relationships
+        @relationships_are_dirty = true
+        rels_ext.dirty = true
+      end
+    end
+    
+    def remove_relationship(predicate, obj)
+      r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>predicate, :object=>obj)
+      rels_ext.remove_relationship(r)
+      #need to call here to indicate update of named_relationships
+      @relationships_are_dirty = true
       rels_ext.dirty = true
     end
 
-
     def inner_object # :nodoc
       @inner_object
     end
@@ -411,15 +648,60 @@ module ActiveFedora
         # solr_doc = ds.to_solr(solr_doc) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) ||( ds.kind_of?(ActiveFedora::RelsExtDatastream) || ( ds.kind_of?(ActiveFedora::QualifiedDublinCoreDatastream) && !opts[:model_only] )
         solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream) && !opts[:model_only] )
       end
+      begin
+        #logger.info("PID: '#{pid}' solr_doc put into solr: #{solr_doc.inspect}")
+      rescue
+        logger.info("Error encountered trying to output solr_doc details for pid: #{pid}")
+      end
       return solr_doc
     end
+    
+    ###########################################################################################################
+    #
+    # This method is comparable to load_instance except it populates an object from Solr instead of Fedora.
+    # It is most useful for objects used in read-only displays in order to speed up loading time.  If only
+    # a pid is passed in it will attempt to load a solr document and then populate an ActiveFedora::Base object
+    # based on the solr doc including any metadata datastreams and relationships.
+    # 
+    # solr_doc is an optional parameter and if a value is passed it will not query solr again and just use the
+    # one passed to populate the object.
+    #
+    ###########################################################################################################
+    def self.load_instance_from_solr(pid,solr_doc=nil)
+      if solr_doc.nil?
+        result = find_by_solr(pid)
+        raise "Object #{pid} not found in solr" if result.nil?
+        solr_doc = result.hits.first
+        #double check pid and id in record match
+        raise "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
+      else
+       raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
+     end
+     
+      create_date = solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)].nil? ? solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date).to_s] : solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)]
+      modified_date = solr_doc[Solrizer::FieldNameMapper.solr_name(:system_create, :date)].nil? ? solr_doc[Solrizer::FieldNameMapper.solr_name(:system_modified, :date).to_s] : solr_doc[Solrizer::FieldNameMapper.solr_name(:system_modified, :date)]
+      obj = self.new({:pid=>solr_doc[SOLR_DOCUMENT_ID],:create_date=>create_date,:modified_date=>modified_date})
+      obj.new_object = false
+      #set by default to load any dependent relationship objects from solr as well
+      obj.load_from_solr = true
+      #need to call rels_ext once so it exists when iterating over datastreams
+      obj.rels_ext
+      obj.datastreams.each_value do |ds|
+        if ds.respond_to? (:from_solr)
+          ds.from_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream))
+        end
+      end
+      obj
+    end
 
     # Updates Solr index with self.
     def update_index
       if defined?( Solrizer::Solrizer ) 
+        #logger.info("Trying to solrize pid: #{pid}")
         solrizer = Solrizer::Solrizer.new
         solrizer.solrize( self )
       else
+        #logger.info("Trying to update solr for pid: #{pid}")
         SolrService.instance.conn.update(self.to_solr)
       end
     end
@@ -521,6 +803,10 @@ module ActiveFedora
       end
     end
     
+    def logger      
+      @logger ||= defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : Logger.new(STDOUT)
+    end
+    
     private
     def configure_defined_datastreams
       if self.class.ds_specs
@@ -565,6 +851,5 @@ module ActiveFedora
       return result
     end
 
-
   end
 end