hydra-head 3.0.1 → 3.1.0.pre1

data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml

@@ -82,121 +82,51 @@
      </lst>
   </requestHandler>
 
-  <!-- Searching ("All Fields") -->
-    <requestHandler name="search" class="solr.SearchHandler" default="true">
-      <lst name="defaults">
-        <str name="defType">dismax</str>
-        <str name="echoParams">explicit</str>      
-        <str name="q.alt">*:*</str>
-        <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-        <!-- this qf and pf are used by default, if not otherwise specified by
-             client. The default blacklight_config will use these for the
-             "keywords" search. See the author_qf/author_pf, title_qf, etc 
-             below, which the default blacklight_config will specify for
-             those searches. You may also be interested in:
-             http://wiki.apache.org/solr/LocalParams
-        -->
-        <str name="qf">
-          id
-          title_t^25000
-          text
-          active_fedora_model_s
-          object_type_facet
-        </str>
-        <str name="pf">
-          id
-          title_t^250000
-          text^10
-          active_fedora_model_s
-          object_type_facet
-        </str>
-        <str name="author_qf">
-          author_unstem_search^200
-          author_addl_unstem_search^50
-          author_t^20
-          author_addl_t
-        </str>
-        <str name="author_pf">
-          author_unstem_search^2000
-          author_addl_unstem_search^500
-          author_t^200
-          author_addl_t^10
-        </str>
-        <str name="title_qf">
-          title_unstem_search^50000
-          subtitle_unstem_search^25000
-          title_addl_unstem_search^10000
-          title_t^5000
-          subtitle_t^2500
-          title_addl_t^100
-          title_added_entry_unstem_search^50
-          title_added_entry_t^10
-          title_series_unstem_search^5
-          title_series_t
-        </str>
-        <str name="title_pf">
-          title_unstem_search^500000
-          subtitle_unstem_search^250000
-          title_addl_unstem_search^100000
-          title_t^50000
-          subtitle_t^25000
-          title_addl_t^1000
-          title_added_entry_unstem_search^500
-          title_added_entry_t^100
-          title_series_t^50
-          title_series_unstem_search^10
-        </str>
-        <str name="subject_qf">
-          subject_topic_unstem_search^200
-          subject_unstem_search^125
-          subject_topic_facet^100
-          subject_t^50
-          subject_addl_unstem_search^10
-          subject_addl_t
-        </str>
-        <str name="subject_pf">
-          subject_topic_unstem_search^2000
-          subject_unstem_search^1250
-          subject_t^1000
-          subject_topic_facet^500
-          subject_addl_unstem_search^100
-          subject_addl_t^10
-        </str>
-
-
-        <int name="ps">3</int>
-        <float name="tie">0.01</float>
-
-        <!-- NOT using marc_display because it is large and will slow things down for search results -->
-        <str name="fl">
-          *,score
-        </str>
-
-        <str name="facet">true</str>
-        <str name="facet.mincount">1</str>
-        <str name="facet.limit">10</str>
-        <str name="facet.field">format</str>
-        <str name="facet.field">lc_1letter_facet</str>
-        <str name="facet.field">lc_alpha_facet</str>
-        <str name="facet.field">lc_b4cutter_facet</str>
-        <str name="facet.field">language_facet</str>
-        <str name="facet.field">pub_date</str>
-        <str name="facet.field">subject_era_facet</str>
-        <str name="facet.field">subject_geo_facet</str>
-        <str name="facet.field">subject_topic_facet</str>
+  <!-- For complete comments from the Solr project example solrconfig.xml:
+      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
+    See also:  
+      http://wiki.apache.org/solr/SolrConfigXml
+  -->
 
-        <str name="spellcheck">true</str>
-        <str name="spellcheck.dictionary">default</str>
-        <str name="spellcheck.onlyMorePopular">true</str>
-        <str name="spellcheck.extendedResults">true</str>
-        <str name="spellcheck.collate">false</str>
-        <str name="spellcheck.count">5</str>
-      </lst>
-      <arr name="last-components">
-        <str>spellcheck</str>
-      </arr>
-    </requestHandler>
-    
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <lst name="defaults">
+      <!-- Making defType lucene to exclude file assets -->
+      <str name="defType">lucene</str>
+      <!-- lucene params -->
+      <str name="df">has_model_s</str>
+      <str name="q.op">AND</str>
+      <!-- dismax params -->
+      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
+      <str name="q.alt">*:*</str>
+      <str name="qf_dismax">id^0.8 id_t^0.8 title_t^0.3 mods_t^0.2</str>
+      <str name="pf_dismax">id^0.9  id_t^0.9 title_t^0.5 mods_t^0.2</str>
+      <int name="ps">100</int>
+      <float name="tie">0.01</float>
+      <!-- general -->
+      <str name="facet">on</str>
+      <str name="facet.mincount">1</str>
+	    <str name="echoParams">explicit</str>
+      <str name="fl">
+        id,title_t,date_t,year_facet,month_facet,has_model_s,has_collection_member_s,is_part_of_s,system_create_dt,
+        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,
+        person_7_role_t,person_8_role_t,person_9_role_t,
+        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,
+        person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
+        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,
+        person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,
+        status_t,subject_t,depositor_t,
+				journal_title_info_t,journal_issue_publication_date_t,
+				journal_issue_pages_end_t,journal_issue_volume_t,journal_title_info_main_title_t,journal_issue_pages_start_t,
+				journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
+        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
+        person_7_institution_t,person_8_institution_t,person_9_institution_t,
+        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
+        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_main_title_t, mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
+        object_type_facet, department_facet, peer_reviewed_facet
+      </str>
+    </lst>
+  </requestHandler>
+  
   <requestHandler name="public_search" class="solr.SearchHandler" >
     <lst name="defaults">
       <!-- Making defType lucene to exclude file assets -->
@@ -207,8 +137,6 @@
       <!-- dismax params -->
       <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
       <str name="q.alt">*:*</str>
-      <str name="qf">id^0.8 id_t^0.8 format text^0.3 journal_issn_t</str>
-      <str name="pf">id^0.9  id_t^0.9 text^0.5 journal_issn_t</str>
       <str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
       <str name="pf_dismax">id^0.9  id_t^0.9 text^0.5</str>
       <int name="ps">100</int>
@@ -218,7 +146,17 @@
       <str name="facet.mincount">1</str>
 	    <str name="echoParams">explicit</str>
       <str name="fl">
-       *,score
+        id,text,title_t,date_t,year_facet,month_facet,medium_t,series_facet,box_facet,folder_facet,has_model_s,has_collection_member_s,system_create_dt,
+        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,person_7_role_t,person_8_role_t,person_9_role_t,
+        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
+        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,depositor_t,
+
+        journal_title_info_t, journal_title_info_main_title_t, journal_issue_publication_date_t, journal_issue_pages_start_t, journal_issue_pages_end_t, journal_issue_volume_t, journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
+        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
+        person_7_institution_t,person_8_institution_t,person_9_institution_t,
+        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
+        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_t,mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
+        object_type_facet, department_facet, peer_reviewed_facet
       </str>
     </lst>
   </requestHandler>

data/lib/hydra/access_controls_enforcement.rb

@@ -172,46 +172,13 @@ module Hydra::AccessControlsEnforcement
   # @param solr_parameters the current solr parameters
   # @param user_parameters the current user-subitted parameters
   def apply_gated_discovery(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    # Grant access to public content
-    permission_types = ["edit","discover","read"]
-    user_access_filters = []
-    
-    permission_types.each do |type|
-      user_access_filters << "#{type}_access_group_t:public"
-    end
-    
-    # Grant access based on user id & role
-    unless current_user.nil?
-      # for roles
-      RoleMapper.roles(current_user.login).each_with_index do |role, i|
-        permission_types.each do |type|
-          user_access_filters << "#{type}_access_group_t:#{role}"
-        end
-      end
-      # for individual person access
-      permission_types.each do |type|
-        user_access_filters << "#{type}_access_person_t:#{current_user.login}"        
-      end
-      if current_user.is_being_superuser?(session)
-        permission_types.each do |type|
-          user_access_filters << "#{type}_access_person_t:[* TO *]"        
-        end
-      end
-      
-      # Enforcing Embargo at Query time has been disabled.  
-      # If you want to do this, set up your own solr_search_params before_filter that injects the appropriate :fq constraints for a field that expresses your objects' embargo status.
-      #
-      # include docs in results if the embargo date is NOT in the future OR if the current user is depositor
-      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{current_user.login}"
-      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR (embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.login}) AND NOT (NOT depositor_t:#{current_user.login} AND embargo_release_date_dt:[NOW TO *])"
-      # solr_parameters[:fq] << embargo_query         
-    end
-    solr_parameters[:fq] << user_access_filters.join(" OR ")
-    logger.debug("Solr parameters: #{ solr_parameters.inspect }")
+    # solr_parameters[:q] ||= []
+    solr_parameters[:q] = build_lucene_query(params[:q])
+    # @extra_controller_params ||= {}
+    # @extra_controller_params.merge!(:q=>build_lucene_query(params[:q]))
+    logger.debug("Solr query: #{ solr_parameters[:q] }")
   end
   
-  
   # proxy for {enforce_index_permissions}
   def enforce_search_permissions
     enforce_index_permissions
@@ -221,19 +188,10 @@ module Hydra::AccessControlsEnforcement
   def enforce_read_permissions
     enforce_show_permissions
   end
-  
-  # This filters out objects that you want to exclude from search results.  By default it only excludes FileAssets
-  # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
-  def exclude_unwanted_models(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "-has_model_s:\"info:fedora/afmodel:FileAsset\""
-  end
 
   # Build the lucene query that performs gated discovery based on Hydra rightsMetadata information in Solr
   # @param [String] user_query the user's original query request that will be wrapped in access controls
   def build_lucene_query(user_query)
-    logger.warn("DEPRECATED: build_lucene_query has been deprecated.  Recommended convention is to use blacklight's dismax search requestHandler (not lucene) and filter queries with :fq solr parameters.  See Hydra::AccessControlsEnforcement#apply_gated_discovery and Hydra::AccessControlsEnforcement#exclude_unwanted_models")
     q = ""
     # start query of with user supplied query term
       q << "_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}#{user_query}\" AND " if user_query

data/lib/hydra/catalog.rb

@@ -24,7 +24,7 @@ module Hydra::Catalog
     
     # Controller filters
     # Also see the generator (or generated CatalogController) to see more before_filters in action
-    klass.before_filter :require_solr, :require_fedora, :check_scripts
+    klass.before_filter :require_solr, :check_scripts
     klass.before_filter :load_fedora_document, :only=>[:show,:edit]
     
     # View Helpers

data/lib/hydra/common_mods_index_methods.rb

@@ -32,7 +32,6 @@ module Hydra::CommonModsIndexMethods
   # An array of Solr::Field objects
   #
   def extract_person_organizations
-    # self.find_by_terms(:person,:affiliation).map { |org| Solr::Field.new({:mods_organization_facet=>org.text}) }
     orgs = {}
     self.find_by_terms(:person,:affiliation).each do |org| 
       ::Solrizer::Extractor.insert_solr_field_value(orgs, "mods_organization_facet", org.text) 

data/lib/hydra/file_assets_helper.rb

@@ -7,7 +7,6 @@ module Hydra::FileAssetsHelper
     if params.has_key?(:Filedata)
       @file_assets = []
       params[:Filedata].each do |file|
-        #@file_asset = create_asset_from_params
         @file_asset = create_asset_from_file(file)
         add_posted_blob_to_asset(@file_asset,file)
         @file_asset.save

data/lib/hydra/generic_content.rb

@@ -91,11 +91,12 @@ module Hydra::GenericContent
   
   # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in mods:physicaldescription/mods:extent 
   def add_file_datastream(file, opts={})
-    label = opts.has_key?(:label) ? opts[:label] : ""
-    mimeType = opts.has_key?(:mimeType) ? opts[:mimeType] : ""
-    ds = ActiveFedora::Datastream.new(:dsLabel => label, :controlGroup => 'M', :blob => file, :mimeType => mimeType)
-    opts.has_key?(:dsid) ? ds.dsid=(opts[:dsid]) : nil
-    add_datastream(ds)
+    # label = opts.has_key?(:label) ? opts[:label] : ""
+    # mimeType = opts.has_key?(:mimeType) ? opts[:mimeType] : ""
+    # ds = ActiveFedora::Datastream.new(:dsLabel => label, :controlGroup => 'M', :blob => file, :mimeType => mimeType)
+    # opts.has_key?(:dsid) ? ds.dsid=(opts[:dsid]) : nil
+    # add_datastream(ds)
+    super
     if file.respond_to?(:size)
       size = bits_to_human_readable(file.size)
     elsif file.kind_of?(File)
@@ -103,7 +104,7 @@ module Hydra::GenericContent
     else
       size = ""
     end
-    datastreams_in_memory["descMetadata"].update_indexed_attributes( [:physical_description, :extent] => size )
+    descMetadata.update_indexed_attributes( [:physical_description, :extent] => size )
   end
   
   def mime_type file_name

data/lib/hydra/model_methods.rb

@@ -5,8 +5,8 @@ module Hydra::ModelMethods
   # Most important behavior: if the asset has a rightsMetadata datastream, this method will add +depositor_id+ to its individual edit permissions.
   #
   def apply_depositor_metadata(depositor_id)
-    prop_ds = self.datastreams_in_memory["properties"]
-    rights_ds = self.datastreams_in_memory["rightsMetadata"]
+    prop_ds = self.datastreams["properties"]
+    rights_ds = self.datastreams["rightsMetadata"]
   
     if !prop_ds.nil? && prop_ds.respond_to?(:depositor_values)
       prop_ds.depositor_values = depositor_id unless prop_ds.nil?
@@ -19,7 +19,7 @@ module Hydra::ModelMethods
   # Set the collection type (e.g. hydrangea_article) for the asset
   #
   def set_collection_type(collection)
-    prop_ds = self.datastreams_in_memory["properties"]
+    prop_ds = self.datastreams["properties"]
     if !prop_ds.nil? && prop_ds.respond_to?(:collection_values)
       prop_ds.collection_values = collection
     end
@@ -63,14 +63,14 @@ module Hydra::ModelMethods
 
   # Call insert_contributor on the descMetadata datastream
   def insert_contributor(type, opts={})
-    ds = self.datastreams_in_memory["descMetadata"]
+    ds = self.datastreams["descMetadata"]
     node, index = ds.insert_contributor(type,opts)
     return node, index
   end
   
   # Call remove_contributor on the descMetadata datastream
   def remove_contributor(type, index)
-    ds = self.datastreams_in_memory["descMetadata"]
+    ds = self.datastreams["descMetadata"]
     result = ds.remove_contributor(type,index)
     return result
   end
@@ -88,7 +88,8 @@ module Hydra::ModelMethods
   def destroyable_child_assets
     return [] unless self.file_objects
     self.file_objects.each.inject([]) do |file_assets, fo|
-      if fo.relationships[:self].has_key?(:is_part_of) && fo.relationships[:self][:is_part_of].length == 1 && fo.relationships[:self][:is_part_of][0].match(/#{self.pid}$/)
+      parents = fo.ids_for_outbound(:is_part_of)
+      if parents.length == 1 && parents.first.match(/#{self.pid}$/)
         file_assets << fo
       end
       file_assets

data/lib/hydra/rights_metadata.rb

@@ -39,7 +39,7 @@ class RightsMetadata < ActiveFedora::NokogiriDatastream
       t.embargo_release_date(:proxy => [:machine, :date])
     }    
   end
-    
+
   # Generates an empty Mods Article (used when you call ModsArticle.new without passing in existing xml)
   def self.xml_template
     builder = Nokogiri::XML::Builder.new do |xml|
@@ -86,7 +86,6 @@ class RightsMetadata < ActiveFedora::NokogiriDatastream
   # permissions({:person=>"person123"})
   # => {"person123"=>"read"}
   def permissions(selector, new_access_level=nil)
-    
     type = selector.keys.first.to_sym
     actor = selector.values.first
     if new_access_level.nil?
@@ -178,6 +177,7 @@ class RightsMetadata < ActiveFedora::NokogiriDatastream
   private
   # Purge all access given group/person 
   def remove_all_permissions(selector)
+    return unless ng_xml
     type = selector.keys.first.to_sym
     actor = selector.values.first
     xpath = self.class.terminology.xpath_for(:access, type, actor)

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.1"
+  VERSION = "3.1.0.pre1"
 end
 

data/lib/mediashelf/active_fedora_helper.rb

@@ -42,16 +42,6 @@ module MediaShelf
 
     private
   
-    def require_fedora
-      if ActiveFedora::VERSION < "3.1.0"
-        
-        Fedora::Repository.register(ActiveFedora.fedora_config[:url],  session[:user])
-      else
-        ActiveSupport::Deprecation.warn("ActiveFedoraHelper.require_fedora has been deprecated and no longer has any effect.")
-      end
-      return true
-    end
-  
     def require_solr
       ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
     end

data/lib/railties/hydra-fixtures.rake

@@ -16,16 +16,16 @@ namespace :hydra do
       raise "You must specify a valid pid.  Example: rake hydra:refresh_fixture pid=demo:12"
     end
     begin
-      Hydra::FixtureLoader.new('test_support/fixtures').reload(ENV["pid"])
+      ActiveFedora::FixtureLoader.new('test_support/fixtures').reload(ENV["pid"])
     rescue Errno::ECONNREFUSED => e
       puts "Can't connect to Fedora! Are you sure jetty is running?"
-    rescue Fedora::ServerError => e
-        logger.error("Received a Fedora error while deleting #{pid}")
+    rescue Exception => e
+        logger.error("Received a Fedora error while loading #{pid}\n#{e}")
     end
   end
   
   desc "Delete the object identified by pid. Example: rake hydra:delete pid=demo:12"
-  task :delete => :environment do
+  task :delete => :init do
     # If a destination url has been provided, attampt to export from the fedora repository there.
     if ENV["destination"]
       Fedora::Repository.register(ENV["destination"])
@@ -35,15 +35,15 @@ namespace :hydra do
       raise "You must specify a valid pid.  Example: rake hydra:delete pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Deleting '#{pid}' from #{Fedora::Repository.instance.fedora_url}"
+      puts "Deleting '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
       begin
-        Hydra::FixtureLoader.delete(pid)
+        ActiveFedora::FixtureLoader.delete(pid)
       rescue Errno::ECONNREFUSED => e
         puts "Can't connect to Fedora! Are you sure jetty is running?"
-      rescue Fedora::ServerError => e
-          logger.error("Received a Fedora error while deleting #{pid}")
+      rescue Exception => e
+        logger.error("Received a Fedora error while deleting #{pid}\n#{e}")
       end
-      logger.info "Deleted '#{pid}' from #{Fedora::Repository.instance.fedora_url}"
+      logger.info "Deleted '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
     end
   end
   
@@ -100,16 +100,16 @@ namespace :hydra do
   end
   
   desc "Import the fixture located at the provided path. Example: rake hydra:import_fixture fixture=test_support/fixtures/demo_12.foxml.xml"
-  task :import_fixture => [:init, :environment] do
+  task :import_fixture => [:init] do
     
     # If a destination url has been provided, attampt to export from the fedora repository there.
     if ENV["destination"]
       Fedora::Repository.register(ENV["destination"])
     end
     if !ENV["fixture"].nil? 
-      body = Hydra::FixtureLoader.import_to_fedora(ENV["fixture"])
+      body = ActiveFedora::FixtureLoader.import_to_fedora(ENV["fixture"])
     elsif !ENV["pid"].nil?
-      body = Hydra::FixtureLoader.new('test_support/fixtures').import_and_index(ENV["pid"])
+      body = ActiveFedora::FixtureLoader.new('test_support/fixtures').import_and_index(ENV["pid"])
     else
       raise "You must specify a path to the fixture or provide its pid.  Example: rake hydra:import_fixture fixture=test_support/fixtures/demo_12.foxml.xml"
     end
@@ -118,12 +118,8 @@ namespace :hydra do
   end
   
   desc "Init Hydra configuration" 
-  task :init do
-    if !ENV["environment"].nil? 
-      Rails.env = ENV["environment"]
-    end
-    # If Fedora Repository connection is not already initialized, initialize it using ActiveFedora defaults
-    ActiveFedora.init unless Thread.current[:repo]  
+  task :init => [:environment] do
+    # We need to just start rails so that all the models are loaded
   end
 
   desc "Load hydra-head models"

data/lib/railties/hyhead_rspec.rake

@@ -57,21 +57,11 @@ begin
 
       desc "Run all specs"
       RSpec::Core::RakeTask.new(:run => spec_prereq) do |t|
-        t.rcov = true
         # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
         t.pattern = File.join(hyhead_spec, "/**/*_spec.rb")
         t.rspec_opts = "--colour"
 			end
 			
-      desc "Run all specs with rcov"
-      RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
-        t.rcov = true
-        # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
-        t.pattern = File.join(hyhead_spec, "/**/*_spec.rb")
-          t.rspec_opts = "--colour"
-        t.rcov_opts = '-o "' + HydraHead.root + '/coverage" --exclude /gems/,/Library/,/usr/,test_support,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-'
-      end
-      
       # Blacklight. Solr wrapper. for now just for blacklight:spec, plan to
       # provide it for all variants eventually.
       # if you would like to see solr startup messages on STDERR

data/solr_conf/conf/schema.xml

@@ -118,7 +118,5 @@ This copy of the solr schema is only used in the context of testing hydra-head.
  <defaultSearchField>text</defaultSearchField>
  <solrQueryParser defaultOperator="AND" />
  <copyField source="*_facet" dest="text" />
- <copyField source="*_t" dest="text" />
- <copyField source="*_s" dest="text" />
 
 </schema>