active-fedora 2.3.1 → 2.3.3

data/CONSOLE_GETTING_STARTED.textile

@@ -112,7 +112,7 @@ To see a more complete implementation of importing and deleting Fedora objects,
 *When you're done playing around with importing and deleting, make sure that you leave a copy of hydrangea:fixture_mods_article1 in fedora so we can play with it.*
 
 
-h3. Define a Model for Your (Active)Fedora Objects
+h2. Define a Model for Your (Active)Fedora Objects
 
 Look at the SpecialThing model defined in lib/active_fedora/samples/special_thing.rb to see how you declare an ActiveFedora model.
 
@@ -133,7 +133,7 @@ This pid was retrieved from Fedora's getNextPid method.
 
 Your object will not show up in the actual Fedora repository until you save it using newthing.save, but let's hold off on saving it for now.
 
-h3. Fedora RELATIONSHIPS in ActiveFedora
+h2. Fedora RELATIONSHIPS in ActiveFedora
 
 ActiveFedora provides convenience methods for creating and editing Fedora RELS-EXT relationships.  It also auto-generates methods for searching these relationships with Solr. (see https://github.com/projecthydra/solrizer and https://github.com/projecthydra/solrizer-fedora)
 
@@ -168,7 +168,7 @@ newthing.inspirations
 
 This method is actually making a search request to Solr -- it is looking in Solr to see if the "newthing" object has any "inspirations" relationships.
 
-Now we'll create another Fedora object (using the default ActiveFedora object model) and we'll use ActiveFedora's add_relationship method to relate our new object to the SpecialThing objectl  We'll also save our new object in our Fedora repository.
+Now we'll create another Fedora object (using the default ActiveFedora object model) and we'll use ActiveFedora's add_relationship method to relate our new object to the SpecialThing object.  We'll also save our new object in our Fedora repository.
 
 <pre>
 newobj = ActiveFedora::Base.new
@@ -179,10 +179,10 @@ newobj.relationships
 newobj.save
 => ...
 newobj.pid
-=> "changeme:164" # this is the pid you want to put in the following URLs as a replacement for {PID}
+=> "changeme:164" # this is the pid you want to put in the following URLs as a replacement for (PID)
 </pre>
 
-You can see objects in Fedora by going to http://localhost:8983/fedora/objects/{PID} and you can see the relationships for an object by looking at the RELS-EXT datastream content:  http://localhost: 8983/fedora/objects/{PID}/datastreams/RELS-EXT/content
+You can see objects in Fedora by going to http://localhost:8983/fedora/objects/(PID) and you can see the relationships for an object by looking at the RELS-EXT datastream content:  http://localhost: 8983/fedora/objects/(PID)/datastreams/RELS-EXT/content
 
 Now let's see if the "newthing" object has an "inspiration" relationship with our "newobj"
 
@@ -200,9 +200,9 @@ Note that you didn't have to save the "newthing" object in order for this relati
 Only the ActiveFedora object making the assertion needs to be saved in order for the search to work.  In our example above, new_obj asserts :has_derivation (rather than the derivative asserting :is_derivation_of), so only new_obj had to be saved. 
 
 
-h3. Fedora DATASTREAMS & METADATA in ActiveFedora
+h2. Fedora DATASTREAMS & METADATA in ActiveFedora
 
-h4. Blobs (a.k.a. File Datastreams, a.k.a Managed Content Datastreams)
+h3. Blobs (a.k.a. File Datastreams, a.k.a Managed Content Datastreams)
 
 Here we create a simple Datastream (using the default Datastream model). 
 
@@ -220,7 +220,7 @@ newthing.save
 Now use your browser to find the file datastreams in Fedora ...
 
 
-h4. On auto-generating datastream ids
+h3. On auto-generating datastream ids
 
 If you don't specify a dsid, ActiveFedora will generate one for you.  In the example below, "DS1" is the dsID assigned to the new datastream
 
@@ -244,7 +244,7 @@ newthing.datastreams.keys
 newthing.save
 </pre>
 
-h2. Getting Existing Fedora Repository Objects 
+h2. Retrieving Existing Fedora Repository Objects 
 
 When you want your code to interact with existing digital objects in a Fedora repository, use the ActiveFedora load_instance method.
 
@@ -316,11 +316,9 @@ This query will return a Solr::Result containing all of the objects that have co
 
 h2. More About ActiveFedora Models
 
-ActiveFedora Models don't actually do much.  They mainly keep a list of datastream ids and associate them with classes that help you use the content from those datastreams.
+ActiveFedora Models for Fedora objects don't actually do much.  They mainly keep a list of datastream ids and associate them with classes that help you use the content from those datastreams.
 
-When you're ready to learn more about how to define ActiveFedora models and OM-based datastreams, examine the files in lib/active_fedora/samples.  Those will give you more background.  Here, we're seeing what happens when you use those Models and datastreams.
-
-For now, load an instance of the SpecialThing model and take a look at its datastreams.
+Let's load an instance of the SpecialThing model and take a look at its datastreams.
 
 <pre>
 st = SpecialThing.load_instance("hydrangea:fixture_mods_article1")
@@ -366,5 +364,7 @@ properties:
 
 Notice that properties and DC have been loaded as ActiveFedora::Datastream, RELS-EXT has been loaded as ActiveFedora::RelsExtDatastream, and the other three have been loaded as the classes specified in the Model.
 
-Now read about  "OM-based NokogiriDatastreams":https://github.com/mediashelf/active_fedora/blob/master/NOKOGIRI_DATASTREAMS.textile to see what the datastream definitions have done for you.
+h2.  Where to Find More Information
+
+You can examine the files in lib/active_fedora/samples to learn more about how to define ActiveFedora models and OM-based datastreams.  We also suggest you read about "OM-based NokogiriDatastreams":https://github.com/mediashelf/active_fedora/blob/master/NOKOGIRI_DATASTREAMS.textile to learn about manipulating XML contained in datastreams.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (2.3.1)
+    active-fedora (2.3.2)
       activeresource
       equivalent-xml
       facets
@@ -18,13 +18,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    activeresource (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
+    activeresource (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
     builder (3.0.0)
     columnize (0.3.2)
     daemons (1.1.3)
-    equivalent-xml (0.2.6)
+    equivalent-xml (0.2.7)
       nokogiri (>= 1.4.3)
     facets (2.9.1)
     git (1.2.5)
@@ -37,7 +37,7 @@ GEM
     mediashelf-loggable (0.4.2)
     mime-types (1.16)
     mocha (0.9.12)
-    multipart-post (1.1.0)
+    multipart-post (1.1.2)
     nokogiri (1.4.4)
     om (1.2.4)
       nokogiri (>= 1.4.2)

data/NOKOGIRI_DATASTREAMS.textile

@@ -1,5 +1,21 @@
 h1. Using OM-based NokogiriDatastreams
 
+This document is about working with (Active)Fedora datastreams with XML content.  Nokogiri is a ruby gem for working with xml, and OM (Opinionated Metadata) allows you to define a “terminology” to ease translation between XML and ruby objects.
+
+h3. Learning More about OM (Opinionated Metadata)
+
+For deeper exposure to what you can do with OM, see the "OM documentation":http://hudson.projecthydra.org/job/om/Documentation/ for "Getting Started":http://hudson.projecthydra.org/job/om/Documentation/file.GETTING_STARTED.html, "Querying Documents":http://hudson.projecthydra.org/job/om/Documentation/file.QUERYING_DOCUMENTS.html, and "Updating Documents":http://hudson.projecthydra.org/job/om/Documentation/file.UPDATING_DOCUMENTS.html.   There is also information in the "solrizer":http://github.com/projecthydra/solrizer documentation about Solrizing documents. 
+
+You can run most of the examples from those tutorials against the descMetadata datastream you've created here.
+
+<pre>
+doc = st.datastreams["descMetadata"]  # the datastream is the OM Document
+...
+doc.class
+=> Hydra::ModsArticleDatastream  # Hydra::ModsArticleDatastream is the Document Class
+terminology = doc.class.terminology # The terminology is attached to the Document Class
+</pre>
+
 h2. Setup
 
 This tutorial assumes that you've run script/console from the root of ActiveFedora and have imported the hydrangea:fixture_mods_article1 object.  If you haven't done that, see "CONSOLE_GETTING_STARTED":https://github.com/mediashelf/active_fedora/blob/master/CONSOLE_GETTING_STARTED.textile for instructions.
@@ -13,9 +29,9 @@ Look in these datastream definitions to see the OM Terminologies they define.  T
 * {Marpa::DcDatastream} ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/lib/active_fedora/samples/marpa-dc_datastream.rb )
 
 
-h2. The First Pass with OM
+h2. Using Existing OM Terminology
 
-First, load the Fedora object as an instance of the SpecialThing Model
+First, load the Fedora object as an instance of the SpecialThing ActiveFedora Model
 
 <pre>
 st = SpecialThing.load_instance("hydrangea:fixture_mods_article1")
@@ -64,21 +80,7 @@ mods_ds.find_by_terms(:person).length
 mods_ds.find_by_terms(:person).each {|n| puts n.to_xml}
 </pre>
 
-
-h2. Learning More about OM
-
-Hydra::ModsArticleDatastream has all of the behaviors of an OM::Document.  For deeper exposure to what you can do with OM, see the "OM documentation":http://hudson.projecthydra.org/job/om/Documentation/ for "Getting Started":http://hudson.projecthydra.org/job/om/Documentation/file.GETTING_STARTED.html, "Querying Documents":http://hudson.projecthydra.org/job/om/Documentation/file.QUERYING_DOCUMENTS.html, and "Updating Documents":http://hudson.projecthydra.org/job/om/Documentation/file.UPDATING_DOCUMENTS.html.   There is also information in the "solrizer":http://github.com/projecthydra/solrizer documentation about Solrizing documents. 
-
-You can run most of the examples from those tutorials against the descMetadata datastream you've created here.
-
-<pre>
-doc = st.datastreams["descMetadata"]  # the datastream is the OM Document
-...
-doc.class
-=> Hydra::ModsArticleDatastream  # Hydra::ModsArticleDatastream is the Document Class
-terminology = doc.class.terminology # The terminology is attached to the Document Class
-</pre>
-
+Hydra::ModsArticleDatastream has all of the behaviors of an OM::Document.  
 
 h1. Setting the XML in a NokogiriDatastream from a file
 

data/config/solr.yml

@@ -0,0 +1,15 @@
+development:
+  default:
+    url: http://localhost:8983/solr/development
+  full_text:
+    url: http://localhost:8983/solr/development
+test: 
+  default:
+    url: http://localhost:8983/solr/test
+  full_text:
+    url: http://localhost:8983/solr/test
+production:
+  default:
+    url: http://localhost:8080/solr/production 
+  full_text:
+    url: http://localhost:8080/solr/production

data/lib/active_fedora.rb

@@ -32,7 +32,7 @@ module ActiveFedora #:nodoc:
   include Loggable
   
   class << self
-    attr_accessor :solr_config, :fedora_config
+    attr_accessor :solr_config, :fedora_config, :config_env
   end
   
   # The configuration hash that gets used by RSolr.connect
@@ -40,13 +40,20 @@ module ActiveFedora #:nodoc:
   @fedora_config ||= {}
 
   # Initializes ActiveFedora's connection to Fedora and Solr based on the info in fedora.yml
-  # If RAILS_ENV is set, it will use that environment.  Defaults to "development".
+  # If Rails.env is set, it will use that environment.  Defaults to "development".
   # @param [String] config_path (optional) the path to fedora.yml
   #   If config_path is not provided and Rails.root is set, it will look in RAILS_ENV/config/fedora.yml.  Otherwise, it will look in your config/fedora.yml.  Failing that, it will use localhost urls.
   def self.init( config_path=nil )
     
-    config_env = defined?(RAILS_ENV) ? RAILS_ENV : "development"
-    
+    if defined?(Rails.env)
+      @config_env = Rails.env
+    elsif defined?(ENV['environment'])
+      @config_env = ENV['environment']
+    else 
+      @config_env = 'development'
+      logger.warn("No environment setting found: Using the default development environment.")
+    end
+        
     if config_path.nil? 
       if defined?(Rails.root)
         config_path = "#{Rails.root}/config/fedora.yml"
@@ -62,9 +69,9 @@ module ActiveFedora #:nodoc:
     
     logger.info("FEDORA: loading ActiveFedora config from #{File.expand_path(config_path)}")
     fedora_config = YAML::load(File.open(config_path))
-    raise "The #{config_env} environment settings were not found in the fedora.yml config.  If you already have a fedora.yml file defined, make sure it defines settings for the #{config_env} environment" unless fedora_config[config_env]
+    raise "The #{@config_env.to_s} environment settings were not found in the fedora.yml config.  If you already have a fedora.yml file defined, make sure it defines settings for the #{@config_env} environment" unless fedora_config[@config_env]
     
-    ActiveFedora.solr_config[:url] = fedora_config[config_env]['solr']['url']
+    ActiveFedora.solr_config[:url] = fedora_config[@config_env]['solr']['url']
     
     # Register Solr
     logger.info("FEDORA: initializing ActiveFedora::SolrService with solr_config: #{ActiveFedora.solr_config.inspect}")
@@ -72,7 +79,7 @@ module ActiveFedora #:nodoc:
     ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
     logger.info("FEDORA: initialized Solr with ActiveFedora.solr_config: #{ActiveFedora::SolrService.instance.inspect}")
         
-    ActiveFedora.fedora_config[:url] = fedora_config[config_env]['fedora']['url']
+    ActiveFedora.fedora_config[:url] = fedora_config[@config_env]['fedora']['url']
     logger.info("FEDORA: initializing Fedora with fedora_config: #{ActiveFedora.fedora_config.inspect}")
     
     Fedora::Repository.register(ActiveFedora.fedora_config[:url])

data/lib/active_fedora/base.rb

@@ -3,6 +3,7 @@ require 'active_fedora/model'
 require 'active_fedora/semantic_node'
 require "solrizer"
 require 'nokogiri'
+require "loggable"
 
 SOLR_DOCUMENT_ID = "id" unless (defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
@@ -35,7 +36,8 @@ module ActiveFedora
     include Model
     include SemanticNode
     include Solrizer::FieldNameMapper
-     
+    include Loggable
+    
     attr_accessor :named_datastreams_desc
     
 
@@ -84,7 +86,7 @@ module ActiveFedora
     #by any future instantiations.
     def self.has_metadata(args, &block)
       @ds_specs ||= Hash.new
-      @ds_specs[args[:name]]= [args[:type], block]
+      @ds_specs[args[:name]]= [args[:type], args.fetch(:label,""), block]
     end
 
     #Saves a Base object, and any dirty datastreams, then updates 
@@ -1045,10 +1047,6 @@ 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
@@ -1056,7 +1054,7 @@ module ActiveFedora
           if self.datastreams.has_key?(name)
             attributes = self.datastreams[name].attributes
           else
-            attributes = {:label=>""}
+            attributes = {:dsLabel=>ar[1]}
           end
           ds = ar.first.new(:dsid=>name)
           # If you called has_metadata with a block, pass the block into the Datastream class

data/lib/active_fedora/datastream.rb

@@ -47,6 +47,18 @@ module ActiveFedora
       self.attributes[:dsid] = dsid
     end
 
+    def size
+      if !self.attributes.fetch(:dsSize,nil)
+        if self.new_object?
+          self.attributes[:dsSize]=nil
+        else
+          attrs = XmlSimple.xml_in(Fedora::Repository.instance.fetch_custom(self.pid,"datastreams/#{self.dsid}"))
+          self.attributes[:dsSize]=attrs["dsSize"].first
+        end
+      end
+      self.attributes[:dsSize]
+    end
+
     #compatibility method for rails' url generators. This method will 
     #urlescape escape dots, which are apparently
     #invalid characters in a dsid.

data/lib/active_fedora/semantic_node.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   module SemanticNode 
     include MediaShelfClassLevelInheritableAttributes
-    ms_inheritable_attributes  :class_relationships, :internal_uri
+    ms_inheritable_attributes  :class_relationships, :internal_uri, :class_named_relationships_desc
     
     attr_accessor :internal_uri, :named_relationship_desc, :relationships_are_dirty, :load_from_solr
     
@@ -442,54 +442,7 @@ module ActiveFedora
       end
       xml.to_s
     end
-
-    # Returns a solr query for retrieving objects specified in a relationship.
-    # It enables the use of query_params defined within a relationship to attach a query filter
-    # on top of just the predicate being used.
-    # Instead of this method you can also use the helper method
-    # [relationship_name]_query, i.e. method "parts_query" for relationship "parts".
-    # @param [String] The name of the relationship defined in the model
-    # @return [String]
-    # @example
-    #   Class SampleAFObjRelationshipQueryParam < ActiveFedora::Base
-    #     #points to all parents linked via is_member_of
-    #     has_relationship "parents", :is_member_of
-    #     #returns only parents that have a level value set to "series"
-    #     has_relationship "series_parents", :is_member_of, :query_params=>{:q=>{"level_t"=>"series"}}
-    #   end
-    #   s = SampleAFObjRelationshipQueryParam.new
-    #   obj = ActiveFedora::Base.new
-    #   s.parents_append(obj)
-    #   s.series_parents_query 
-    #   #=> "(id:changeme\\:13020 AND level_t:series)" 
-    #   SampleAFObjRelationshipQueryParam.named_relationship_query("series_parents")
-    #   #=> "(id:changeme\\:13020 AND level_t:series)" 
-    def named_relationship_query(relationship_name)
-      query = ""
-      if self.class.is_bidirectional_relationship?(relationship_name)
-        id_array = []
-        predicate = outbound_named_relationship_predicates["#{relationship_name}_outbound"]
-        if !outbound_relationships[predicate].nil? 
-          outbound_relationships[predicate].each do |rel|
-            id_array << rel.gsub("info:fedora/", "")
-          end
-        end
-        query = self.class.bidirectional_named_relationship_query(pid,relationship_name,id_array)
-      elsif outbound_relationship_names.include?(relationship_name)
-        id_array = []
-        predicate = outbound_named_relationship_predicates[relationship_name]
-        if !outbound_relationships[predicate].nil? 
-          outbound_relationships[predicate].each do |rel|
-            id_array << rel.gsub("info:fedora/", "")
-          end
-        end
-        query = self.class.outbound_named_relationship_query(relationship_name,id_array)
-      elsif inbound_relationship_names.include?(relationship_name)
-        query = self.class.inbound_named_relationship_query(pid,relationship_name)
-      end
-      query
-    end
-
+    
     module ClassMethods
     
       # Allows for a relationship to be treated like any other attribute of a model class. You define
@@ -499,10 +452,7 @@ module ActiveFedora
       #  class AudioRecord < ActiveFedora::Base
       #
       #   has_relationship "oral_history", :has_part, :inbound=>true, :type=>OralHistory
-      #   # returns all similar audio
       #   has_relationship "similar_audio", :has_part, :type=>AudioRecord
-      #   #returns only similar audio with format wav
-      #   has_relationship "similar_audio_wav", :has_part, :query_params=>{:q=>"format_t"=>"wav"}
       #
       # The first two parameters are required:
       #   name: relationship name
@@ -511,7 +461,6 @@ module ActiveFedora
       #     possible parameters  
       #       :inbound => if true loads an external relationship via Solr (defaults to false)
       #       :type => The type of model to use when instantiated an object from the pid in this relationship (defaults to ActiveFedora::Base)
-      #       :query_params => Additional filters to be attached via a solr query (currently only :q implemented)
       #
       # If inbound is true it expects the relationship to be defined by another object's RELS-EXT
       # and to load that relationship from Solr.  Otherwise, if inbound is true the relationship is stored in
@@ -523,24 +472,22 @@ module ActiveFedora
       # For the oral_history relationship in the example above the following helper methods are created:
       #  oral_history: returns array of OralHistory objects that have this AudioRecord with predicate :has_part 
       #  oral_history_ids: Return array of pids for OralHistory objects that have this AudioRecord with predicate :has_part
-      #  oral_history_query: Return solr query that can be used to retrieve related objects as solr documents
       # 
       # For the outbound relationship "similar_audio" there are two additional methods to append and remove objects from that relationship
       # since it is managed internally:
       #  similar_audio: Return array of AudioRecord objects that have been added to similar_audio relationship
       #  similar_audio_ids:  Return array of AudioRecord object pids that have been added to similar_audio relationship
-      #  similar_audio_query: Return solr query that can be used to retrieve related objects as solr documents
       #  similar_audio_append: Add an AudioRecord object to the similar_audio relationship
       #  similar_audio_remove: Remove an AudioRecord from the similar_audio relationship
       def has_relationship(name, predicate, opts = {})
         opts = {:singular => nil, :inbound => false}.merge(opts)
         if opts[:inbound] == true
-          #raise "Duplicate use of predicate for named inbound relationship not allowed" if named_predicate_exists_with_different_name?(:inbound,name,predicate)
+          raise "Duplicate use of predicate for named inbound relationship not allowed" if named_predicate_exists_with_different_name?(:inbound,name,predicate)
           register_named_relationship(:inbound, name, predicate, opts)
           register_predicate(:inbound, predicate)
           create_inbound_relationship_finders(name, predicate, opts)
         else
-          #raise "Duplicate use of predicate for named outbound relationship not allowed" if named_predicate_exists_with_different_name?(:self,name,predicate)
+          raise "Duplicate use of predicate for named outbound relationship not allowed" if named_predicate_exists_with_different_name?(:self,name,predicate)
           register_named_relationship(:self, name, predicate, opts)
           register_predicate(:self, predicate)
           create_named_relationship_methods(name)
@@ -615,160 +562,6 @@ module ActiveFedora
         opts.merge!({:predicate=>predicate})
         named_relationships_desc[subject][name] = opts
       end
-
-      # Returns a solr query for retrieving objects specified in an outbound relationship.
-      # This method is mostly used by internal method calls.
-      # It enables the use of query_params defined within a relationship to attach a query filter
-      # on top of just the predicate being used.  Because it is static it 
-      # needs the pids defined within RELS-EXT for this relationship to be passed in.
-      # If you are calling this method directly to get the query you should use the 
-      # ActiveFedora::SemanticNode.named_relationship_query instead or use the helper method
-      # [relationship_name]_query, i.e. method "parts_query" for relationship "parts".  This
-      # method would only be called directly if you had something like an array of outbound pids
-      # already in something like a solr document for object that has these relationships.
-      # @param [String] The name of the relationship defined in the model
-      # @param [Array] An array of pids to include in the query
-      # @return [String]
-      # @example
-      #   Class SampleAFObjRelationshipQueryParam < ActiveFedora::Base
-      #     #points to all parents linked via is_member_of
-      #     has_relationship "parents", :is_member_of
-      #     #returns only parents that have a level value set to "series"
-      #     has_relationship "series_parents", :is_member_of, :query_params=>{:q=>{"level_t"=>"series"}}
-      #   end
-      #   s = SampleAFObjRelationshipQueryParam.new
-      #   obj = ActiveFedora::Base.new
-      #   s.series_parents_append(obj)
-      #   s.series_parents_query 
-      #   #=> "(id:changeme\\:13020 AND level_t:series)" 
-      #   SampleAFObjRelationshipQueryParam.outbound_named_relationship_query("series_parents",["id:changeme:13020"])
-      #   #=> "(id:changeme\\:13020 AND level_t:series)" 
-      def outbound_named_relationship_query(relationship_name,outbound_pids)
-        query = ActiveFedora::SolrService.construct_query_for_pids(outbound_pids)
-        subject = :self
-        if named_relationships_desc.has_key?(subject) && named_relationships_desc[subject].has_key?(relationship_name) && named_relationships_desc[subject][relationship_name].has_key?(:query_params)
-          query_params = format_query_params(named_relationships_desc[subject][relationship_name][:query_params])
-          if query_params[:q]
-            unless query.empty?
-              #substitute in the filter query for each pid so that it is applied to each in the query
-              query.sub!(/OR /,"AND #{query_params[:q]}) OR (")
-              #add opening parenthesis for first case
-              query = "(" + query 
-              #add AND filter case for last element as well since no 'OR' following it
-              query << " AND #{query_params[:q]})"
-            else
-              query = query_params[:q]
-            end
-          end
-        end
-        query
-      end
-
-      # Returns a solr query for retrieving objects specified in an inbound relationship.
-      # This method is mostly used by internal method calls.
-      # It enables the use of query_params defined within a relationship to attach a query filter
-      # on top of just the predicate being used.  Because it is static it 
-      # needs the pid of the object that has the inbound relationships passed in.
-      # If you are calling this method directly to get the query you should use the 
-      # ActiveFedora::SemanticNode.named_relationship_query instead or use the helper method
-      # [relationship_name]_query, i.e. method "parts_query" for relationship "parts".  This
-      # method would only be called directly if you were working only with Solr and already
-      # had the pid for the object in something like a solr document.
-      # @param [String] The pid for the object that has these inbound relationships
-      # @param [String] The name of the relationship defined in the model
-      # @return [String]
-      # @example
-      #   Class SampleAFObjRelationshipQueryParam < ActiveFedora::Base
-      #     #returns all parts
-      #     has_relationship "parts", :is_part_of, :inbound=>true
-      #     #returns only parts that have level to "series"
-      #     has_relationship "series_parts", :is_part_of, :inbound=>true, :query_params=>{:q=>{"level_t"=>"series"}}
-      #   end
-      #   s = SampleAFObjRelationshipQueryParam.new
-      #   s.pid 
-      #   #=> id:changeme:13020
-      #   s.series_parts_query
-      #   #=> "is_part_of_s:info\\:fedora/changeme\\:13021 AND level_t:series"
-      #   SampleAFObjRelationshipQueryParam.inbound_named_relationship_query(s.pid,"series_parts")
-      #   #=> "is_part_of_s:info\\:fedora/changeme\\:13021 AND level_t:series"
-      def inbound_named_relationship_query(pid,relationship_name)
-        query = ""
-        subject = :inbound
-        if named_relationships_desc.has_key?(subject) && named_relationships_desc[subject].has_key?(relationship_name)
-          predicate = named_relationships_desc[subject][relationship_name][:predicate]
-          internal_uri = "info:fedora/#{pid}"
-          escaped_uri = internal_uri.gsub(/(:)/, '\\:')
-          query = "#{predicate}_s:#{escaped_uri}" 
-          if named_relationships_desc.has_key?(subject) && named_relationships_desc[subject].has_key?(relationship_name) && named_relationships_desc[subject][relationship_name].has_key?(:query_params)
-            query_params = format_query_params(named_relationships_desc[subject][relationship_name][:query_params])
-            if query_params[:q]
-              query << " AND " unless query.empty?
-              query << query_params[:q]
-            end
-          end
-        end
-        query
-      end
-
-      # Returns a solr query for retrieving objects specified in a bidirectional relationship.
-      # This method is mostly used by internal method calls.
-      # It enables the use of query_params defined within a relationship to attach a query filter
-      # on top of just the predicate being used.  Because it is static it 
-      # needs the pids defined within RELS-EXT for the outbound relationship as well as the pid of the
-      # object for the inbound portion of the relationship.
-      # If you are calling this method directly to get the query you should use the 
-      # ActiveFedora::SemanticNode.named_relationship_query instead or use the helper method
-      # [relationship_name]_query, i.e. method "bi_parts_query" for relationship "bi_parts".  This
-      # method would only be called directly if you had something like an array of outbound pids
-      # already in something like a solr document for object that has these relationships.
-      # @param [String] The pid for the object that has these inbound relationships
-      # @param [String] The name of the relationship defined in the model
-      # @param [Array] An array of pids to include in the query
-      # @return [String]
-      # @example
-      #   Class SampleAFObjRelationshipQueryParam < ActiveFedora::Base
-      #     has_bidirectional_relationship "bi_series_parts", :has_part, :is_part_of, :query_params=>{:q=>{"level_t"=>"series"}}
-      #   end
-      #   s = SampleAFObjRelationshipQueryParam.new
-      #   obj = ActiveFedora::Base.new
-      #   s.bi_series_parts_append(obj)
-      #   s.pid
-      #   #=> "changeme:13025" 
-      #   obj.pid
-      #   #=> id:changeme:13026
-      #   s.bi_series_parts_query 
-      #   #=> "(id:changeme\\:13026 AND level_t:series) OR (is_part_of_s:info\\:fedora/changeme\\:13025 AND level_t:series)" 
-      #   SampleAFObjRelationshipQueryParam.bidirectional_named_relationship_query(s.pid,"series_parents",["id:changeme:13026"])
-      #   #=> "(id:changeme\\:13026 AND level_t:series) OR (is_part_of_s:info\\:fedora/changeme\\:13025 AND level_t:series)" 
-      def bidirectional_named_relationship_query(pid,relationship_name,outbound_pids)
-        outbound_named_relationship_query("#{relationship_name}_outbound",outbound_pids) + " OR (" + inbound_named_relationship_query(pid,"#{relationship_name}_inbound") + ")"
-      end
-
-      # This will transform and encode any query_params defined in a relationship method to properly escape special characters
-      # and format strings such as query string properly for a solr query
-      # @param [Hash] The has of expected query params (including at least :q)
-      # @return [String]
-      def format_query_params(query_params)
-        if query_params && query_params[:q]
-          add_query = ""
-          if query_params[:q].is_a? Hash
-            query_params[:q].keys.each_with_index do |key,index|
-              add_query << " AND " if index > 0
-              add_query << "#{key}:#{query_params[:q][key].gsub(/:/, '\\\\:')}"
-            end
-          elsif !query_params[:q].empty?
-            add_query = "#{query_params[:q]}"
-          end
-          query_params[:q] = add_query unless add_query.empty?
-          query_params
-        end
-      end
-
-      #Tests if the relationship name passed is in bidirectional
-      # @return [Boolean]
-      def is_bidirectional_relationship?(relationship_name)
-        named_relationships_desc[:self]["#{relationship_name}_outbound"] && named_relationships_desc[:inbound]["#{relationship_name}_inbound"] 
-      end
       
       # ** EXPERIMENTAL **
       #   
@@ -808,8 +601,8 @@ module ActiveFedora
         class_eval <<-END
         def #{name}(opts={})
           opts = {:rows=>25}.merge(opts)
-          query = self.class.inbound_named_relationship_query(self.pid,"#{name}")
-          solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
+          escaped_uri = self.internal_uri.gsub(/(:)/, '\\:')
+          solr_result = SolrService.instance.conn.query("#{predicate}_s:\#{escaped_uri}", :rows=>opts[:rows])
           if opts[:response_format] == :solr
             return solr_result
           else
@@ -832,18 +625,8 @@ module ActiveFedora
         def #{name}_from_solr
           #{name}(:response_format => :load_from_solr)
         end
-        def #{name}_solr_docs
-          #{name}(:response_format => :solr)
-        end
-        def #{name}_query
-          named_relationship_query("#{name}")
-        end
         END
       end
-
-      def relationship_has_query_params?(subject, relationship_name)
-        named_relationships_desc.has_key?(subject) && named_relationships_desc[subject].has_key?(relationship_name) && named_relationships_desc[subject][relationship_name].has_key?(:query_params)
-      end
     
       def create_outbound_relationship_finders(name, predicate, opts = {})
         class_eval <<-END
@@ -854,20 +637,13 @@ module ActiveFedora
               id_array << rel.gsub("info:fedora/", "")
             end
           end
-          
-          if opts[:response_format] == :id_array && !self.class.relationship_has_query_params?(:self,"#{name}")
+          if opts[:response_format] == :id_array
             return id_array
           else
-            query = self.class.outbound_named_relationship_query("#{name}",id_array)
+            query = ActiveFedora::SolrService.construct_query_for_pids(id_array)
             solr_result = SolrService.instance.conn.query(query)
             if opts[:response_format] == :solr
               return solr_result
-            elsif opts[:response_format] == :id_array
-              id_array = []
-              solr_result.hits.each do |hit|
-                id_array << hit[SOLR_DOCUMENT_ID]
-              end
-              return id_array
             elsif opts[:response_format] == :load_from_solr || self.load_from_solr
               return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
             else
@@ -881,15 +657,9 @@ module ActiveFedora
         def #{name}_from_solr
           #{name}(:response_format => :load_from_solr)
         end
-        def #{name}_solr_docs
-          #{name}(:response_format => :solr)
-        end
-        def #{name}_query
-          named_relationship_query("#{name}")
-        end
         END
       end
-
+      
       # Generates relationship finders for predicates that point in both directions
       # and registers predicate relationships for each direction.
       #
@@ -910,15 +680,12 @@ module ActiveFedora
         def #{name}(opts={})
           opts = {:rows=>25}.merge(opts)
           if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
-            outbound_id_array = []
-            predicate = outbound_named_relationship_predicates["#{name}_outbound"]
-            if !outbound_relationships[predicate].nil? 
-              outbound_relationships[predicate].each do |rel|
-                outbound_id_array << rel.gsub("info:fedora/", "")
-              end
-            end
-            #outbound_id_array = #{outbound_method_name}(:response_format=>:id_array)
-            query = self.class.bidirectional_named_relationship_query(self.pid,"#{name}",outbound_id_array)
+            escaped_uri = self.internal_uri.gsub(/(:)/, '\\:')
+            query = "#{inbound_predicate}_s:\#{escaped_uri}"
+            
+            outbound_id_array = #{outbound_method_name}(:response_format=>:id_array)
+            query = query + " OR " + ActiveFedora::SolrService.construct_query_for_pids(outbound_id_array)
+            
             solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
             
             if opts[:response_format] == :solr
@@ -939,12 +706,6 @@ module ActiveFedora
         def #{name}_from_solr
           #{name}(:response_format => :load_from_solr)
         end
-        def #{name}_solr_docs
-          #{name}(:response_format => :solr)
-        end
-        def #{name}_query
-          named_relationship_query("#{name}")
-        end
         END
       end