blacklight 3.8.0 → 3.8.1

data/VERSION

@@ -1 +1 @@
-3.8.0
+3.8.1

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -95,6 +95,11 @@ module Blacklight::BlacklightHelperBehavior
     blacklight_config.index_fields
   end
 
+  def should_display_index_field? document, solr_field
+    document.has?(solr_field.field) ||
+      (document.has_highlight_field? solr_field.field if solr_field.highlight)
+  end
+
   def index_field_names
     index_fields.keys
   end
@@ -156,7 +161,7 @@ module Blacklight::BlacklightHelperBehavior
   
   # used in the catalog/_show/_default partial
   def document_show_fields
-    blacklight_config.show_fields.keys
+    blacklight_config.show_fields
   end
   
   # used in the catalog/_show/_default partial
@@ -177,6 +182,11 @@ module Blacklight::BlacklightHelperBehavior
     render_field_value value
   end
 
+  def should_display_show_field? document, solr_field
+    document.has?(solr_field.field) ||
+      (document.has_highlight_field? solr_field.field if solr_field.highlight)
+  end
+
   def render_field_value value=nil
     value = [value] unless value.is_a? Array
     value = value.collect { |x| x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x}

data/app/views/catalog/_index_default.html.erb

@@ -2,7 +2,7 @@
 <dl class="defList">
   
   <% index_fields.each do |solr_fname, field| -%>
-    <% if document.has? solr_fname %>
+    <% if should_display_index_field? document, field %>
 	    <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_label :field => solr_fname %></dt>
 	    <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_index_field_value :document => document, :field => solr_fname %></dd>
     <% end -%>

data/app/views/catalog/_show_default.html.erb

@@ -1,7 +1,7 @@
 <%# default partial to display solr document fields in catalog show view -%>
 <dl class="defList">
   <% document_show_fields.each do |solr_fname, field| -%>
-    <% if document.has? solr_fname %>
+    <% if should_display_show_field? document, field %>
 	    <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label :field => solr_fname %></dt>
 	    <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value :document => document, :field => solr_fname %></dd>
     <% end -%>

data/lib/blacklight/configuration.rb

@@ -6,20 +6,26 @@ module Blacklight
 
     # Set up Blacklight::Configuration.default_values to contain 
     # the basic, required Blacklight fields
-    class << self; attr_accessor :default_values; end
-    @default_values = {
-      :solr_request_handler => 'select',
-      :default_solr_params => {},
-      :document_solr_request_handler => nil,
-      :default_document_solr_params => {},
-      :show => OpenStructWithHashAccess.new(:html_title => SolrDocument.unique_key, :heading => SolrDocument.unique_key),
-      :index => OpenStructWithHashAccess.new(:show_link => SolrDocument.unique_key),
-      :spell_max => 5,
-      :max_per_page => 100,
-      :per_page => [10,20,50,100],
-      :add_facet_fields_to_solr_request => false
-    }
-
+    class << self
+      def default_values
+        @default_values ||= begin
+          unique_key = ((SolrDocument.unique_key if defined?(SolrDocument)) || 'id')
+          
+          {
+          :solr_request_handler => 'select',
+          :default_solr_params => {},
+          :document_solr_request_handler => nil,
+          :default_document_solr_params => {},
+          :show => OpenStructWithHashAccess.new(:html_title => unique_key, :heading => unique_key),
+          :index => OpenStructWithHashAccess.new(:show_link => unique_key),
+          :spell_max => 5,
+          :max_per_page => 100,
+          :per_page => [10,20,50,100],
+          :add_facet_fields_to_solr_request => false
+          }
+        end
+      end
+    end
 
     # XXX this isn't very pretty, but it works.
     require 'blacklight/configuration/fields'

data/lib/blacklight/solr_helper.rb

@@ -360,7 +360,7 @@ module Blacklight::SolrHelper
 
     solr_response = find(blacklight_config.solr_request_handler, self.solr_search_params(user_params).merge(extra_controller_params))  
     document_list = solr_response.docs.collect {|doc| SolrDocument.new(doc, solr_response)}  
-    Rails.logger.debug("Solr response: #{solr_response.inspect}")
+    Rails.logger.debug("Solr response: #{solr_response.inspect}") if defined?(::BLACKLIGHT_VERBOSE_LOGGING) and ::BLACKLIGHT_VERBOSE_LOGGING
     Rails.logger.debug("Solr fetch: #{self.class}#get_search_results (#{'%.1f' % ((Time.now.to_f - bench_start.to_f)*1000)}ms)")
     
     return [solr_response, document_list]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -508,7 +508,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3050377984529966753
+      hash: -1025939682679006516
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -517,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3050377984529966753
+      hash: -1025939682679006516
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23